Skip to content
Python

Merge main into feature/permission-modes

Rohit C Prasad87b4eebc153f
diff --cc surfaces/gui/src/App.tsx
index 06f35b7d,0a7cb212..62a35380
--- a/surfaces/gui/src/App.tsx
+++ b/surfaces/gui/src/App.tsx
@@@ -1930,7 -1895,7 +1930,8 @@@ export function App()
onApprove={approve}
running={running}
onRetry={retry}
+ onOpenConnectors={() => setSurface("integrations")}
+ onAllowAnyway={allowAnyway}
onUndoMemory={(id, previous) => void undoMemorySave(id, previous)}
// §33 ref #3: sub-threshold streamed text renders INSIDE the live turn
// group (header when collapsed, quiet line when expanded) — never as a
diff --cc surfaces/gui/src/components/Transcript.tsx
index 6cf45a0d,0b347357..5f2551b9
--- a/surfaces/gui/src/components/Transcript.tsx
+++ b/surfaces/gui/src/components/Transcript.tsx
@@@ -405,7 -362,49 +407,50 @@@ export function retryAnchor(items: Item
return -1;
}
- export function Transcript({ items, running, streamingText, onRetry, onUndoMemory, onAllowAnyway }: Props) {
+ // One quiet line for a dead MCP server (owner ruling 2026-08-21): the summary names the
+ // server; the raw error (stderr excerpts, tracebacks) hides behind a Details disclosure;
+ // "Open Connectors" is the fix/remove path. Never a wall of blue text in the transcript.
+ function McpNotice({
+ item,
+ onOpenConnectors,
+ }: {
+ item: Extract<Item, { kind: "notice" }>;
+ onOpenConnectors?: () => void;
+ }) {
+ const [open, setOpen] = useState(false);
+ return (
+ <div className="mcp-notice" data-testid="mcp-notice">
+ <div className="mcp-notice-line">
+ <span aria-hidden>⚠</span>
+ <span className="min-w-0 truncate">{item.text}</span>
+ <button
+ className="mcp-notice-act"
+ data-testid="mcp-notice-details"
+ onClick={() => setOpen((v) => !v)}
+ >
+ Details {open ? "⌃" : "⌄"}
+ </button>
+ {onOpenConnectors && (
+ <button
+ className="mcp-notice-act"
+ data-testid="mcp-notice-connectors"
+ onClick={onOpenConnectors}
+ >
+ Open Connectors
+ </button>
+ )}
+ </div>
+ {open && (
+ <pre className="mcp-notice-detail" data-testid="mcp-notice-detail">
+ {item.detail}
+ </pre>
+ )}
+ </div>
+ );
+ }
+
-export function Transcript({ items, running, streamingText, onRetry, onOpenConnectors, onUndoMemory }: Props) {
++
++export function Transcript({ items, running, streamingText, onRetry, onOpenConnectors, onUndoMemory, onAllowAnyway }: Props) {
// §33 grouping: a turn = the maximal run of assistant/tool/resolved-approval items between
// breakers (user, connector, notices, plan/dir requests…). Trailing assistant texts are the
// ANSWER and render as bubbles after the group; interior assistant texts are narration and
@@@ -531,21 -529,10 +576,25 @@@
</div>
);
case "notice":
+ if (item.server && item.detail)
+ return (
+ <McpNotice key={bi} item={item} onOpenConnectors={onOpenConnectors} />
+ );
+ // A titled notice is prose (the Auto-Approve banner), not a status line.
+ if (item.title) {
+ return (
+ <div
+ className={"notice notice-block " + (item.tone === "warn" ? "warn" : "")}
+ key={bi}
+ data-testid="mode-notice"
+ >
+ <div className="notice-title">{item.title}</div>
+ {item.text.split("\n\n").map((para, i) => (
+ <p key={i}>{para}</p>
+ ))}
+ </div>
+ );
+ }
return (
<div className={"notice " + (item.tone === "warn" ? "warn" : "")} key={bi}>
{item.text}
diff --cc surfaces/gui/src/styles.css
index f47b7ee7,9e96993a..db0f5fce
--- a/surfaces/gui/src/styles.css
+++ b/surfaces/gui/src/styles.css
@@@ -439,17 -498,10 +509,17 @@@ body
.approval .btn.quiet-deny { border: 0; background: none; color: var(--faint); }
.approval .btn.quiet-deny:hover { color: var(--danger); }
.approval-rest {
- margin-top: 7px; font-family: var(--mono); font-size: 11.5px; color: var(--faint);
+ margin-top: 7px; font-family: var(--mono); font-size: 12px; color: var(--faint);
display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden;
}
- .approval-reason { margin-top: 8px; font-size: 12.5px; color: var(--muted); }
-.approval-reason { margin-top: 8px; font-size: 13px; color: var(--muted); }
++.approval-reason { margin-top: 8px; font-size: var(--fs-ui); color: var(--muted); }
+/* OPE-114 §1: this action would run a file the agent itself just made. Warmer than the
+ reason line because it is the fact the command text cannot tell you. */
+.approval-provenance {
+ margin-top: 8px; display: flex; align-items: baseline; gap: 6px;
- font-size: 12.5px; color: var(--warn-ink);
++ font-size: var(--fs-ui); color: var(--warn-ink);
+}
- .approval-provenance code { font-family: var(--mono); font-size: 11.5px; }
++.approval-provenance code { font-family: var(--mono); font-size: var(--fs-mono); }
/* Standing-approval consent lines (§25): reads = quiet disclosure, writes = the grants. */
.approval-grants {
margin-top: 11px; border: 1px solid var(--line); border-radius: 8px; background: var(--paper);
diff --cc surfaces/gui/src/types.ts
index d438555b,34c6080f..ff8410e9
--- a/surfaces/gui/src/types.ts
+++ b/surfaces/gui/src/types.ts
@@@ -206,10 -188,16 +206,20 @@@ export type Item
questions?: GroupedQuestion[];
resolved?: string;
}
- // `title` switches the one-line status notice to a block: a heading plus
- // blank-line-separated paragraphs, left-aligned. Used for the Auto-Approve banner,
- // which is prose rather than a status line.
- | { kind: "notice"; tone: "info" | "warn"; text: string; retriable?: boolean; title?: string }
+ | {
+ kind: "notice";
+ tone: "info" | "warn";
+ text: string;
+ retriable?: boolean;
++ // `title` switches the one-line status notice to a block: a heading plus
++ // blank-line-separated paragraphs, left-aligned. Used for the Auto-Approve
++ // banner, which is prose rather than a status line.
++ title?: string;
+ // mcp_error notices: the failing server's name + the full error, rendered as one
+ // quiet line with the detail behind a disclosure and an Open-Connectors action.
+ server?: string;
+ detail?: string;
+ }
// MEMORY-SPEC §5.1: the save notice, inline in the conversation where the user is
// already looking (a corner toast vanished before it could be read or undone —
// owner-hit 2026-07-28). Stays put. `previous` is set when an existing memory was