From d6fb946334c600c81fd250f6fcfd2d0117578832 Mon Sep 17 00:00:00 2001 From: SashaMIT Date: Sun, 13 Sep 2026 13:44:48 +0800 Subject: [PATCH 1/4] assistant: mode controls move to the sidebar and show only when backed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Chat / Build / Studio bar above the transcript (plus Copy conversation) is removed. The same data-assistant-mode buttons now live in the Sash sidebar: Chat|Build as the URUX segmented control, Studio as a nav row between Home and Settings. Anders' typed controller, workspace fields and string gates are unchanged. UI ≠ authority: a mode control is visible only when the Runtime backs it. Build is a saved label today (no run reads it), so the segment stays hidden behind MODE_CAPABILITY. Studio appears once offers_list advertises an image.generate or video.generate offer (eligibleStudioOffers, exported from assistant.js). A session saved in a mode the Home no longer backs opens as chat unless it still owns an active Studio run. Because the segment is hidden, the Studio row toggles back to chat. Copy conversation is dropped; per-message and code-block copy in the transcript remain. Gates: convergence smoke asserts honest absence on the text-only fixture; shell smoke bans the bar, the copy button, and requires capability gating. Co-authored-by: Cursor --- capsules/assistant/browser/agent-harness.css | 40 +++++++++++ .../assistant/browser/assistant-modes.css | 5 +- capsules/assistant/browser/assistant-modes.js | 69 +++++++++++++------ capsules/assistant/browser/assistant.js | 2 +- capsules/assistant/browser/index.html | 16 +++-- .../assistant-convergence-browser-smoke.mjs | 11 +-- scripts/home-agent-shell-smoke.mjs | 3 + 7 files changed, 109 insertions(+), 37 deletions(-) diff --git a/capsules/assistant/browser/agent-harness.css b/capsules/assistant/browser/agent-harness.css index 20e6be40a..50d5f0179 100644 --- a/capsules/assistant/browser/agent-harness.css +++ b/capsules/assistant/browser/agent-harness.css @@ -693,6 +693,42 @@ body.agent-harness-sidebar-collapsed #agent-harness-search-open-main { min-height: 32px; } +/* Chat | Build mode segment (URUX sidebar control). */ +.agent-harness-segment { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 2px; + flex: 0 0 auto; + margin: 0 0 6px; + padding: 3px; + border-radius: 10px; + background: color-mix(in srgb, var(--text) 7%, transparent); +} + +.agent-harness-segment[hidden] { + display: none; +} + +.agent-harness-segment-btn { + appearance: none; + min-height: 28px; + margin: 0; + padding: 0 8px; + border: 0; + border-radius: 8px; + background: transparent; + color: color-mix(in srgb, var(--text) 62%, transparent); + font: inherit; + font-size: 12px; + font-weight: 600; + cursor: pointer; +} + +.agent-harness-segment-btn.is-active { + background: color-mix(in srgb, var(--text) 12%, transparent); + color: var(--text); +} + .agent-harness-nav-row { appearance: none; display: flex; @@ -719,6 +755,10 @@ body.agent-harness-sidebar-collapsed #agent-harness-search-open-main { cursor: pointer; } +.agent-harness-nav-row[hidden] { + display: none; +} + .agent-harness-nav-row:hover { background: color-mix(in srgb, var(--text) 8%, transparent); color: var(--harness-sidebar-fg-active); diff --git a/capsules/assistant/browser/assistant-modes.css b/capsules/assistant/browser/assistant-modes.css index 5a973bf0a..8bb0d5b7f 100644 --- a/capsules/assistant/browser/assistant-modes.css +++ b/capsules/assistant/browser/assistant-modes.css @@ -1,7 +1,4 @@ -.assistant-modes { display:flex; align-items:center; gap:6px; padding:12px 20px; flex-wrap:wrap; } -.assistant-modes button, #assistant-studio button, #assistant-studio select { color:var(--text); background:var(--panel); border:1px solid var(--hairline); border-radius:9px; padding:8px 14px; font:inherit; } -.assistant-modes button[aria-pressed="true"] { background:var(--brand); color:#151515; } -#assistant-copy-conversation { margin-left:auto; } +#assistant-studio button, #assistant-studio select { color:var(--text); background:var(--panel); border:1px solid var(--hairline); border-radius:9px; padding:8px 14px; font:inherit; } #assistant-workspace-notice { margin:4px 20px; padding:10px; border:1px solid var(--hairline); border-radius:8px; cursor:pointer; } #assistant-studio { padding:20px; overflow:auto; max-height:calc(100vh - 150px); } #assistant-studio label { display:block; margin:16px 0 8px; } diff --git a/capsules/assistant/browser/assistant-modes.js b/capsules/assistant/browser/assistant-modes.js index 8c92ec2e5..2277c6ff6 100644 --- a/capsules/assistant/browser/assistant-modes.js +++ b/capsules/assistant/browser/assistant-modes.js @@ -1,13 +1,20 @@ -import { createAssistantApp } from "./assistant.js"; +import { createAssistantApp, eligibleStudioOffers } from "./assistant.js"; import { getAgentWorkspaceSnapshot, setAssistantMode } from "./agent-harness.js"; import { setAssistantWorkspaceField, getAssistantSession, ensureAssistantStudioSession, setAssistantSessionStudio, captureActiveSessionState, applyAssistantModeDraft } from "./agent-workspace.js"; import { getHomeGuiLaunchToken, persistAgentWorkspaceNow, flushAgentWorkspace, bindWorkspaceMergeGuard } from "./harness-host.js"; import { getLiveTurnCanonical } from "./agent-stream.js"; -import { createHomeClipboardClient } from "/apps/home/home-clipboard-client.js?v=home-20260726a"; +import { fetchModelOffers } from "./agent-live.js"; + +/* UI ≠ authority: a mode control is shown only when the Runtime backs it. + Build is a saved label today (no run reads it), so its segment stays hidden; + Studio appears once an image or video offer is advertised. */ +const MODE_CAPABILITY = { chat: true, build: false }; export async function bindAssistantModes(saved = {}) { const panel = document.querySelector("#assistant-studio"); const notice = document.querySelector("#assistant-workspace-notice"); + const segment = document.querySelector("[data-assistant-mode-segment]"); + const studioRow = document.querySelector('button[data-assistant-mode="studio"]'); const offer = document.querySelector("#studio-offer"); const draft = document.querySelector("#studio-draft"); const status = document.querySelector("#studio-status"); @@ -23,12 +30,23 @@ export async function bindAssistantModes(saved = {}) { status.after(check); const controllers = new Map(); let visibleSessionId = saved.activeSessionId || null; - const clipboard = createHomeClipboardClient({ - targetId: "assistant", homeToken: getHomeGuiLaunchToken(), - homeOrigin: new URL(location.href).searchParams.get("home_origin") || "null", - targetWindow: window.top, sourceWindow: window, - }); - clipboard.start(); + let studioAvailable = false; + + function modeAvailable(mode) { + return mode === "studio" ? studioAvailable : Boolean(MODE_CAPABILITY[mode]); + } + function syncModeControls() { + segment.hidden = !MODE_CAPABILITY.build; + studioRow.hidden = !studioAvailable; + } + async function refreshStudioAvailability() { + try { + studioAvailable = eligibleStudioOffers(await fetchModelOffers()).length > 0; + } catch { + studioAvailable = false; + } + syncModeControls(); + } function render(view) { if (draft.value !== view.studioDraft) draft.value = view.studioDraft; @@ -134,15 +152,30 @@ export async function bindAssistantModes(saved = {}) { applyAssistantModeDraft(mode); document.body.dataset.assistantMode = mode; panel.hidden = mode !== "studio"; - for (const item of document.querySelectorAll("button[data-assistant-mode]")) item.setAttribute("aria-pressed", String(item.dataset.assistantMode === mode)); + for (const item of document.querySelectorAll("button[data-assistant-mode]")) { + const pressed = item.dataset.assistantMode === mode; + item.setAttribute("aria-pressed", String(pressed)); + item.classList.toggle("is-active", pressed); + } setAssistantMode(mode); setAssistantWorkspaceField("activeMode", mode); } + // A session saved in a mode this Home no longer backs opens as chat, never as an unreachable room. + function showAvailableMode(mode) { + const wanted = ["chat", "build", "studio"].includes(mode) ? mode : "chat"; + const hasStudioRun = wanted === "studio" && getAssistantSession()?.studio?.activeRun && !getAssistantSession().studio.activeRun.terminal; + showMode(modeAvailable(wanted) || hasStudioRun ? wanted : "chat"); + } window.addEventListener("assistant:session-selected", event => { visibleSessionId = event.detail?.sessionId ?? getAssistantSession()?.id ?? null; - showMode(event.detail?.mode); + showAvailableMode(event.detail?.mode); + }); + const savedMode = saved.activeMode || saved.sessionMode || "chat"; + showAvailableMode(savedMode); + // Offers arrive after boot; a saved Studio session reopens once its offer is confirmed. + void refreshStudioAvailability().then(() => { + if (savedMode === "studio" && studioAvailable && document.body.dataset.assistantMode === "chat") showMode("studio"); }); - showMode(saved.activeMode || saved.sessionMode || "chat"); for (const button of document.querySelectorAll("button[data-assistant-mode]")) { button.addEventListener("click", () => { const turn = getLiveTurnCanonical(); @@ -150,21 +183,13 @@ export async function bindAssistantModes(saved = {}) { notice.hidden = false; notice.textContent = "Finish or stop the current run before changing mode."; return; } captureActiveSessionState(); - showMode(button.dataset.assistantMode); + // The Studio row is the only visible mode control while the Chat|Build segment is hidden, so it toggles. + const leavingStudio = button.dataset.assistantMode === "studio" && document.body.dataset.assistantMode === "studio"; + showMode(leavingStudio ? "chat" : button.dataset.assistantMode); }); } window.addEventListener("assistant:workspace-save", event => { notice.hidden = !event.detail.error; notice.textContent = event.detail.error || ""; }); notice.addEventListener("click", () => persistAgentWorkspaceNow()); - document.querySelector("#assistant-copy-conversation").addEventListener("click", async () => { - const session = getAssistantSession(); - const conversation = (session?.messages || []).map(message => `## ${message.role}\n\n${message.text ?? message.content ?? ""}`); - for (const run of session?.studio?.studioHistory || []) conversation.push(`## Studio\n\n${run.prompt || ""}\n\n${run.output?.resource_id || run.status || "Outcome unknown"}`); - try { - if (!conversation.length) return; - await clipboard.writeText(conversation.join("\n\n"), {purpose: "transcript.markdown"}); - notice.hidden = false; notice.textContent = "Conversation copied."; - } catch { notice.hidden = false; notice.textContent = "Could not copy the conversation."; } - }); } diff --git a/capsules/assistant/browser/assistant.js b/capsules/assistant/browser/assistant.js index 30909f490..298c8f3cc 100644 --- a/capsules/assistant/browser/assistant.js +++ b/capsules/assistant/browser/assistant.js @@ -148,7 +148,7 @@ function eligibleTextOffers(payload) { ); } -function eligibleStudioOffers(payload) { +export function eligibleStudioOffers(payload) { const offers = Array.isArray(payload?.offers) ? payload.offers : Array.isArray(payload?.data?.offers) diff --git a/capsules/assistant/browser/index.html b/capsules/assistant/browser/index.html index 7c70d5fe9..ad6c02fb6 100644 --- a/capsules/assistant/browser/index.html +++ b/capsules/assistant/browser/index.html @@ -64,6 +64,11 @@
+ +
-