Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions capsules/assistant/browser/agent-harness.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
5 changes: 1 addition & 4 deletions capsules/assistant/browser/assistant-modes.css
Original file line number Diff line number Diff line change
@@ -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; }
Expand Down
69 changes: 47 additions & 22 deletions capsules/assistant/browser/assistant-modes.js
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -134,37 +152,44 @@ 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();
if ((turn?.turnId && !["completed", "failed", "stopped", "settlement_unknown", "interrupted"].includes(turn.state)) || visibleController()?.snapshot().modeSwitchDisabled) {
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."; }
});
}
2 changes: 1 addition & 1 deletion capsules/assistant/browser/assistant.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 10 additions & 6 deletions capsules/assistant/browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
</div>
</div>
<div class="agent-harness-nav-cluster">
<!-- Mode segment stays hidden until Build is a typed capability (assistant-modes.js). -->
<div class="agent-harness-segment" role="group" aria-label="Assistant mode" data-assistant-mode-segment hidden>
<button type="button" class="agent-harness-segment-btn is-active" data-assistant-mode="chat" aria-pressed="true">Chat</button>
<button type="button" class="agent-harness-segment-btn" data-assistant-mode="build" aria-pressed="false">Build</button>
</div>
<button id="agent-harness-new-chat" class="agent-harness-new-chat" type="button" title="Start a new chat">
<span aria-hidden="true">+</span>
<span>New chat</span>
Expand All @@ -78,6 +83,11 @@
<span>Home</span>
</button>
<nav class="agent-harness-nav" aria-label="Agent destinations">
<!-- Shown only while an image or video offer is advertised (assistant-modes.js). -->
<button type="button" class="agent-harness-nav-row" data-assistant-mode="studio" aria-pressed="false" hidden>
<span class="agent-harness-nav-mark" data-nav-icon="studio" aria-hidden="true"></span>
<span>Studio</span>
</button>
<button type="button" class="agent-harness-nav-row" data-sidebar-nav="configure">
<span class="agent-harness-nav-mark" data-nav-icon="configure" aria-hidden="true"></span>
<span>Settings</span>
Expand Down Expand Up @@ -193,12 +203,6 @@ <h2 id="agent-harness-title" class="agent-harness-title">New chat</h2>
<span class="agent-harness-icon-search" aria-hidden="true"></span>
</button>
</div>
<nav class="assistant-modes" aria-label="Assistant mode">
<button type="button" data-assistant-mode="chat" aria-pressed="true">Chat</button>
<button type="button" data-assistant-mode="build" aria-pressed="false">Build</button>
<button type="button" data-assistant-mode="studio" aria-pressed="false">Studio</button>
<button type="button" id="assistant-copy-conversation">Copy conversation</button>
</nav>
<p id="assistant-workspace-notice" role="status" hidden></p>
<section id="assistant-studio" aria-label="Studio" hidden>
<h2>Studio</h2>
Expand Down
18 changes: 18 additions & 0 deletions capsules/home-gui/browser/elastos-logo-ink.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions capsules/home-gui/browser/shell-window-geometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -637,9 +637,8 @@ function snapTargetForPointer(clientX, clientY) {
if (nearBottom && nearRight) {
return { state: "se", bounds: snappedWindowBounds("se") };
}
if (nearTop) {
return { state: "maximize", bounds: snappedWindowBounds("maximize") };
}
// Top edge alone is not a target: maximize is the traffic-light button's job,
// so dragging a window upward never locks it into a full-screen-like state.
if (nearLeft) {
return { state: "left", bounds: snappedWindowBounds("left") };
}
Expand Down
Loading
Loading