Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// fake Codex app-server stand in for the host; no model, registry or Goal is used.
import assert from "node:assert/strict";
import { spawn, spawnSync } from "node:child_process";
import { mkdtemp, mkdir, rename, rm } from "node:fs/promises";
import { mkdtemp, mkdir, rename, rm, readFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join, resolve } from "node:path";
import { resolveTestPython } from "../../../../scripts/test-python.mjs";
Expand All @@ -18,11 +18,15 @@ const workspace = join(root, "notes");
await mkdir(workspace);
await mkdir(join(root, "home"));
const codex = join(root, "codex");
const packetLog = join(root, "native-packets.jsonl");
const written = spawnSync(python, ["-c", [
"import pathlib, runpy, sys",
"source = runpy.run_path('examples/loopx-chat-runtime-smoke.py')['FAKE_CODEX']",
"source = source.replace('active_turn = None', 'if sys.argv[1:] == [\"debug\", \"models\"]:\\n print(json.dumps({\\'models\\': [{\\'slug\\': \\'trial-native-model\\', \\'display_name\\': \\'Trial native model\\', \\'supported_reasoning_levels\\': [{\\'effort\\': \\'low\\'}, {\\'effort\\': \\'high\\'}]}, {\\'slug\\': \\'rejected-model\\', \\'display_name\\': \\'Rejected model\\', \\'supported_reasoning_levels\\': [{\\'effort\\': \\'high\\'}]}]}))\\n sys.exit(0)\\nactive_turn = None', 1)",
"source = source.replace(' method = request.get(\"method\")', f' with open({sys.argv[2]!r}, \"a\") as output:\\n output.write(json.dumps(request) + \"\\\\n\")\\n method = request.get(\"method\")')",
"source = source.replace(' result = {\"thread\": {\"id\": \"durable-thread\"}}', ' result = {\"thread\": {\"id\": \"durable-thread\"}, \"model\": \"rejected-readback\" if request[\"params\"].get(\"model\") == \"rejected-model\" else request[\"params\"].get(\"model\", \"old-model\"), \"reasoningEffort\": request[\"params\"].get(\"config\", {}).get(\"model_reasoning_effort\", \"xhigh\")}')",
"path = pathlib.Path(sys.argv[1]); path.write_text(source); path.chmod(0o700)",
].join("\n"), codex], { cwd: repoRoot, encoding: "utf8" });
].join("\n"), codex, packetLog], { cwd: repoRoot, encoding: "utf8" });
assert.equal(written.status, 0, written.stderr);

let serverError = "";
Expand Down Expand Up @@ -116,7 +120,61 @@ try {
assert.equal(await page.getByRole("button", { name: "发送", exact: true }).isDisabled(), true,
"A revoked grant keeps history and blocks new messages");
await capture(page, "ordinary-workspace-grant-rejection.png");
console.log("workspace scope browser smoke ok");
// Recover the same grant, then use the production HTTP/store/native path.
// The provider is deterministic: no model or live workspace is involved.
await rename(`${workspace}.moved`, workspace);
await page.reload({waitUntil: "networkidle"});
const composer = page.getByLabel("发送消息");
await composer.waitFor();
assert.equal(await page.locator(".personal-channel-header .personal-chat-model-menu").count(), 0);
const menu = page.locator(".personal-channel-composer .personal-chat-model-menu");
const actions = page.getByLabel("添加附件与快捷操作", {exact: true});
await composer.fill("保留草稿,先核对配置。");
const beforeActions = sessionRequests.length;
await actions.click();
await page.getByRole("button", {name: "添加图片", exact: true}).waitFor();
await page.keyboard.press("Escape");
assert.equal(await actions.evaluate(node => node === document.activeElement), true);
assert.equal(await composer.inputValue(), "保留草稿,先核对配置。");
assert.equal(sessionRequests.length, beforeActions, "Menu open/dismiss is read-only");
await menu.locator("summary").click();
await page.getByRole("combobox", {name: "选择模型", exact: true}).click();
await page.getByRole("option", {name: "Trial native model", exact: true}).click();
await page.getByRole("combobox", {name: "选择思考深度", exact: true}).click();
await page.getByRole("option", {name: "high", exact: true}).click();
await page.keyboard.press("Escape");
await composer.press("Enter");
await menu.locator(".personal-model-current").filter({hasText: "trial-native-model"}).waitFor();
assert.equal(sessionRequests.at(-1).agent_model_id, "trial-native-model");
assert.equal(sessionRequests.at(-1).agent_reasoning_effort, "high");
const packets = (await readFile(packetLog, "utf8")).trim().split("\n").map(line => JSON.parse(line));
assert.ok(packets.some(row => row.method === "thread/start" && row.params.model === "trial-native-model"
&& row.params.config.model_reasoning_effort === "high"));
await page.locator(".personal-message-pending").waitFor({state: "hidden"});
const completedPackets = (await readFile(packetLog, "utf8")).trim().split("\n").map(line => JSON.parse(line));
assert.ok(completedPackets.some(row => row.method === "turn/start" && row.params.effort === "high"));
// This configuration owner still creates a new Session; layout must not
// claim the separately requested same-Session configuration is implemented.
await menu.locator("summary").click();
await page.getByText("新对话配置", {exact: true}).waitFor();
await page.getByRole("combobox", {name: "选择模型", exact: true}).click();
await page.getByRole("option", {name: "Rejected model", exact: true}).click();
await page.keyboard.press("Escape");
await composer.fill("配置被拒绝时保留这条消息。");
const rejection = page.waitForResponse(response => new URL(response.url()).pathname === "/api/chat/sessions" && response.status() === 424);
await composer.press("Enter");
assert.equal((await rejection).status(), 424);
await page.waitForFunction(() => document.querySelector("textarea")?.value === "配置被拒绝时保留这条消息。");
await page.locator(".personal-message-pending").waitFor({state: "hidden"});
assert.equal(await composer.inputValue(), "配置被拒绝时保留这条消息。");
assert.equal(await menu.locator(".personal-model-current").innerText(), "trial-native-model",
"A rejected selection cannot replace actual model readback");
const refusedPackets = (await readFile(packetLog, "utf8")).trim().split("\n").map(line => JSON.parse(line));
assert.equal(refusedPackets.filter(row => row.method === "turn/start").length,
completedPackets.filter(row => row.method === "turn/start").length,
"Rejected Session configuration cannot dispatch or replay the message");
await capture(page, "composer-configuration-rejected.png");
console.log("workspace scope browser smoke ok; composer actions, actual native model/effort and rejection retained");
} finally {
await browser?.close();
await stopServer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useWorkspaceI18n } from "./i18n";
import type { ManagerChannelBinding, ManagerRuntimeSessionReadback } from "../../data/chat";
import type { WorkspaceAgentOption, WorkspaceGoal, WorkspaceGoalTab } from "./personal-workspace-model";
import { WorkspaceSelect } from "./workspace-select";
import { ChatModelMenu } from "./chat-model-menu";
import type {ReactNode} from "react";

export function ChannelHeader({
Expand All @@ -23,23 +22,17 @@ export function ChannelHeader({
allWorkOpen,
onOpenManagerChat,
onOpenManagerSettings,
onOpenConversationSettings,
onOpenWorkspace,
onRefresh,
onRequestGoalLifecycle,
onOpenNavigation,
onSelectGoalTab,
onSelectAgent,
onSelectAgentModel,
onSelectAgentReasoningEffort,
onReturnManagerHome,
refreshState,
readOnlySourceLabel,
resumeReviewed,
selectedAgentId,
selectedAgentModelId,
selectedAgentModelReadback,
selectedAgentReasoningEffort,
selectedGoal,
selectedGoalTab,
scopeUnavailable = false,
Expand Down Expand Up @@ -70,25 +63,19 @@ export function ChannelHeader({
allWorkOpen?: boolean;
onOpenManagerChat?: () => void;
onOpenManagerSettings?: () => void;
onOpenConversationSettings?: () => void;
onOpenWorkspace?: () => void;
onRefresh?: () => void;
/** Absent when the selected source does not authorize Goal lifecycle changes. */
onRequestGoalLifecycle?: (operation: "stop" | "resume") => void;
onOpenNavigation?: () => void;
onSelectGoalTab: (tab: WorkspaceGoalTab) => void;
onSelectAgent: (agentId: string) => void;
onSelectAgentModel?: (modelId: string) => void;
onSelectAgentReasoningEffort?: (effort: string) => void;
onReturnManagerHome?: () => void;
refreshState?: "idle" | "loading" | "done" | "error";
readOnlySourceLabel?: string;
/** Resume opens the owner's reviewed preview instead of a local confirmation. */
resumeReviewed?: boolean;
selectedAgentId: string;
selectedAgentModelId?: string;
selectedAgentModelReadback?: import("../../data/chat").ChatSessionSummary;
selectedAgentReasoningEffort?: string;
selectedGoal: WorkspaceGoal | null;
selectedGoalTab: WorkspaceGoalTab;
/** A requested Goal scope failed; do not present the steward as its fallback. */
Expand Down Expand Up @@ -169,34 +156,13 @@ export function ChannelHeader({
const runtimeControl = scopeUnavailable || agentWorkActive ? null : readOnlySourceLabel ? (
<span className="personal-read-only-source" title={t("header.readOnlySourceDescription", { source: readOnlySourceLabel })}><Eye size={15} />{selectedGoal?.title === readOnlySourceLabel ? null : readOnlySourceLabel}<small>{t("common.readOnly")}</small></span>
) : selectedGoal && !composerVisible ? null : <>
{ordinaryConversation ? <WorkspaceSelect
ariaLabel={t("header.selectChatRuntime")}
className="personal-agent-select"
icon={<Bot size={16} />}
onChange={onSelectAgent}
options={[
...(statusOnly ? [{ value: "", label: locale === "zh-CN" ? "选择执行器" : "Choose executor", disabled: true }] : []),
...agents.filter((agent) => agent.agentId !== "status-only").map((agent) => ({
disabled: !agent.available,
label: `${agent.label}${agent.available ? "" : ` · ${t("header.agentUnavailable")}`}`,
value: agent.agentId,
}))]}
prefixLabel={selectedGoal ? (locale === "zh-CN" ? "执行器" : "Executor") : t("header.chatRuntime")}
value={statusOnly ? "" : selectedAgentId}
/> : null}
{agents.some((agent) => agent.agentId === "status-only") ? <button type="button" className="personal-icon-button personal-status-mode"
aria-pressed={statusOnly} aria-label={`${t("header.statusOnlyAgent")} · ${t("header.statusOnlyDescription")}`} title={`${t("header.statusOnlyAgent")} · ${t("header.statusOnlyDescription")}`}
onClick={() => statusOnly ? onSelectAgent(!ordinaryConversation && managerChannelBinding
? managerChannelBinding.executor_endpoint
: agents.find((agent) => agent.agentId !== "status-only" && agent.available)?.agentId ?? "status-only") : onSelectAgent("status-only")}>
<Eye size={16} />{statusOnly ? t("header.statusOnlyAgent") : null}
</button> : null}
{/* The steward's machine binding owns its model; Goal defaults cannot label it. */}
{!statusOnly && ordinaryConversation ? <ChatModelMenu key={`${selectedGoal?.goalId ?? workspaceGrantLabel ?? "steward"}:${selectedAgentId}`}
agentId={selectedAgentId} goalId={selectedGoal?.goalId} ordinary={ordinaryConversation}
model={selectedAgentModelId} effort={selectedAgentReasoningEffort} readback={selectedAgentModelReadback}
onModel={onSelectAgentModel} onEffort={onSelectAgentReasoningEffort}
onOpenDefaults={selectedGoal ? onOpenConversationSettings : undefined}/> : null}
</>;

const executionChipClass = managerExecutionUnavailable
Expand Down Expand Up @@ -229,8 +195,6 @@ export function ChannelHeader({
const sourceRuntimeControl = !originalConversationTitle || scopeUnavailable || agentWorkActive || readOnlySourceLabel
? runtimeControl : <>
<span className="personal-read-only-source"><Bot size={15} />{selectedAgentId}</span>
<ChatModelMenu agentId={selectedAgentId} ordinary={false} readback={selectedAgentModelReadback}
model={selectedAgentModelId} effort={selectedAgentReasoningEffort} />
</>;

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export function ChatModelMenu({ agentId, goalId, ordinary, model = "", effort, r
return () => controller.abort();
}, [open, ordinary, agentId, goalId, model, retry, zh]);
useEffect(() => {
if (!open) return;
const close = (event: PointerEvent | KeyboardEvent) => {
if (!root.current?.open) return;
if (event instanceof KeyboardEvent) {
if (event.key !== "Escape" || event.defaultPrevented) return;
root.current?.querySelector("summary")?.focus();
Expand All @@ -42,7 +42,7 @@ export function ChatModelMenu({ agentId, goalId, ordinary, model = "", effort, r
document.addEventListener("pointerdown", close);
document.addEventListener("keydown", close);
return () => { document.removeEventListener("pointerdown", close); document.removeEventListener("keydown", close); };
}, [open]);
}, []);
const controls = chatModelControls(discovery, model, effort, readback);
const observed = controls.observedModel ?? (zh ? "模型设置" : "Model settings");
const observedSettings = controls.observedModel ? [controls.observedEffort,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { Bot, Plus } from "lucide-react";
import { useEffect, useRef, type ReactNode } from "react";
import type { ChatSessionSummary } from "../../data/chat";
import type { WorkspaceAgentOption } from "./personal-workspace-model";
import { ChatModelMenu } from "./chat-model-menu";
import { useWorkspaceI18n } from "./i18n";
import { WorkspaceSelect } from "./workspace-select";

/** Existing send controls keep their Session/configuration owners. */
export function ComposerRuntimeControls({ agents, agentId, goalId, original, model, effort, readback, onAgent, onModel, onEffort, onDefaults }: {
agents: WorkspaceAgentOption[]; agentId: string; goalId?: string; original: boolean;
model?: string; effort?: string; readback?: ChatSessionSummary;
onAgent: (id: string) => void; onModel?: (id: string) => void;
onEffort?: (effort: string) => void; onDefaults?: () => void;
}) {
const { locale, t } = useWorkspaceI18n();
const statusOnly = agentId === "status-only";
return <div className="personal-composer-runtime">
{original ? <span className="personal-composer-executor"><Bot size={15} aria-hidden />{agentId}</span>
: <WorkspaceSelect ariaLabel={t("header.selectChatRuntime")} className="personal-composer-executor"
icon={<Bot size={15} />} onChange={onAgent} value={statusOnly ? "" : agentId}
options={[
...(statusOnly ? [{value: "", label: locale === "zh-CN" ? "选择执行器" : "Choose executor", disabled: true}] : []),
...agents.filter(agent => agent.agentId !== "status-only").map(agent => ({value: agent.agentId,
label: `${agent.label}${agent.available ? "" : ` · ${t("header.agentUnavailable")}`}`, disabled: !agent.available})),
]} />}
{!statusOnly ? <ChatModelMenu agentId={agentId} goalId={goalId} ordinary={!original}
model={model} effort={effort} readback={readback} onModel={onModel} onEffort={onEffort}
onOpenDefaults={onDefaults} /> : null}
</div>;
}

/** One optional action entry; opening and dismissing it never sends a message. */
export function ComposerActions({ children }: { children: ReactNode }) {
const { locale } = useWorkspaceI18n();
const root = useRef<HTMLDetailsElement>(null);
useEffect(() => {
const close = (event: PointerEvent | KeyboardEvent) => {
if (!root.current?.open) return;
if (event instanceof KeyboardEvent) {
if (event.key !== "Escape" || event.defaultPrevented) return;
event.preventDefault();
root.current?.querySelector("summary")?.focus();
} else if (root.current?.contains(event.target as Node)) return;
if (root.current) root.current.open = false;
};
document.addEventListener("pointerdown", close);
document.addEventListener("keydown", close);
return () => { document.removeEventListener("pointerdown", close); document.removeEventListener("keydown", close); };
}, []);
return <details className="personal-composer-tools personal-composer-actions" ref={root}>
<summary aria-label={locale === "zh-CN" ? "添加附件与快捷操作" : "Attachments and actions"}><Plus size={18} aria-hidden /></summary>
<div className="personal-composer-actions-panel" onClick={event => {
if ((event.target as Element).closest("button:not(:disabled)") && root.current) root.current.open = false;
}}>{children}</div>
</details>;
}
Loading
Loading