neoctl 0.2.44 → 0.2.46

package/dist/web/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import { DemoMode, DEMO_MARKER, DEMO_PROMPT } from "./demo-mode.js";
+import { DemoTools } from "./demo-tools.js";
+import { createTextMessage } from "../types/messages.js";
 import { imageResultMetadata } from "./image-result-metadata.js";
 import { subagentHeader, subagentStatusFacts } from "./status-semantics.js";
 import { handlePromptConfigRequest } from "./prompt-config-protocol.js";
@@ -26,6 +29,7 @@ import { ExecProcessManager } from "../tools/builtins/exec-process-manager.js";
 import { listDirectoryTool, readFileTool } from "../tools/builtins/filesystem-tools.js";
 import { grepTool } from "../tools/builtins/grep-tool.js";
 import { searchTool } from "../tools/builtins/search-tool.js";
+import { createFrameworkFeedbackTool, FrameworkFeedbackStore } from "../tools/builtins/framework-feedback-tool.js";
 import { planTool } from "../tools/builtins/plan-tool.js";
 import { createOpenAIImageGenerationTool } from "../tools/builtins/image-generation-tool.js";
 import { createLoadImageTool } from "../tools/builtins/image-loader-tool.js";
@@ -165,6 +169,8 @@ export async function createWebRuntime(options = {}) {
     if (modelConfig?.provider === "openai")
         registerTool(createOpenAIImageGenerationTool(), { source: "builtin" });
     registerTool(planTool, { source: "builtin" });
+    const frameworkFeedback = new FrameworkFeedbackStore(options.frameworkFeedbackDir);
+    registerTool(createFrameworkFeedbackTool(frameworkFeedback), { source: "builtin" });
     for (const tool of options.externalTools ?? [])
         registerTool(tool, { source: "external" });
     for (const plugin of pluginCatalog) {
@@ -232,6 +238,7 @@ export async function createWebRuntime(options = {}) {
     activateSession({ engine, taskStore });
     const initialMetrics = await engine.contextMetrics();
     runtime = {
+        frameworkFeedback,
         engine,
         appPromptStore,
         communicationLogger,
@@ -526,6 +533,24 @@ function webRuntimeScopeKey(scope) {
 }
 export class WebRepl {
     runtime;
+    demoOptions;
+    pendingContinuation;
+    runControl() {
+        const execution = this.runtime.engine.getExecutionState?.();
+        const resumable = (execution?.status === "paused" || execution?.status === "interrupted")
+            && (!this.activeAbortController || this.activeAbortController.signal.aborted);
+        const waiting = this.pendingContinuation?.engine === this.runtime.engine;
+        return {
+            state: waiting ? "resuming" : resumable ? execution.status : this.busy ? "running" : "idle",
+            canPause: !waiting && !resumable && !this.stoppingRun && !this.immediateSend && Boolean(this.activeAbortController),
+            canResume: resumable && !waiting && !this.immediateSend,
+            reason: execution?.reason,
+            timer: execution?.elapsedMs === undefined ? undefined : {
+                elapsedMs: execution.elapsedMs,
+                running: execution.status === "running" && !waiting,
+            },
+        };
+    }
     agentContentReader = createAgentContentDetailResolver();
     subscribers = new Set();
     eventSequence = 0;
@@ -544,6 +569,7 @@ export class WebRepl {
     lines;
     status;
     busy = false;
+    compactingSession;
     queuedInput;
     queuedAttachments;
     foregroundRun;
@@ -556,8 +582,91 @@ export class WebRepl {
     runtimeContextPublishQueue = Promise.resolve();
     backgroundSessionRuns = new Map();
     suppressReattachedStreaming = new Set();
-    constructor(runtime) {
+    demoSessions = new WeakMap();
+    demoStatus = new WeakMap();
+    demoMessageQueues = new WeakMap();
+    demoStarting = false;
+    isDemo(engine = this.runtime.engine) {
+        const session = engine.snapshot().session;
+        const key = `${session?.sessionId}:${session?.firstWindowId}`;
+        const cached = this.demoStatus.get(engine);
+        if (cached?.key === key)
+            return cached.active || this.demoSessions.has(engine);
+        if (cached)
+            this.demoSessions.delete(engine);
+        const active = engine.getDisplayEntries().some(entry => entry.type === "message" && entry.message.metadata?.demoMode === DEMO_MARKER);
+        this.demoStatus.set(engine, { key, active });
+        if (active)
+            this.demoSessions.set(engine, null);
+        return active;
+    }
+    async startDemo(expectedSessionId) {
+        const engine = this.runtime.engine;
+        if (!expectedSessionId || expectedSessionId !== engine.snapshot().session?.sessionId)
+            return actionFailure("SESSION_MISMATCH", "会话已切换");
+        if (this.demoStarting || this.isDemo() || this.busy || this.foregroundRun || this.stoppingRun || this.queuedInput !== undefined
+            || this.backgroundTaskCount || engine.getDisplayEntries().length || this.lines.some(line => line.kind !== "system")) {
+            return actionFailure("DEMO_REQUIRES_EMPTY_SESSION", "仅空闲的空会话可以进入演示模式");
+        }
+        // Reserve synchronously before any await: double clicks and concurrent submits cannot start a second run.
+        this.demoStarting = true;
+        this.busy = true;
+        let demo;
+        try {
+            demo = new DemoMode(new DemoTools(this.runtime.tools, this.runtime.taskStore, this.runtime.execProcessManager), this.demoOptions.wait);
+            this.demoSessions.set(engine, demo);
+            const marker = createTextMessage("system", "");
+            marker.isMeta = true;
+            marker.metadata = { demoMode: DEMO_MARKER };
+            await engine.recordDisplayMessage(marker);
+            await demo.backend.prepare(engine.snapshot().session.sessionDir);
+            demo.controller.signal.throwIfAborted();
+            engine.setSimulation(demo);
+            this.startRun(DEMO_PROMPT);
+            return { ok: true };
+        }
+        catch (error) {
+            demo?.stop();
+            this.busy = false;
+            this.broadcastSync();
+            return actionFailure("DEMO_START_FAILED", error instanceof Error ? error.message : String(error));
+        }
+        finally {
+            this.demoStarting = false;
+        }
+    }
+    async recordDemoInput(text, attachments) {
+        const engine = this.runtime.engine;
+        if (!text.trim() && attachments.length === 0)
+            return { ok: true };
+        const previous = this.demoMessageQueues.get(engine) ?? Promise.resolve();
+        const pending = previous.catch(() => undefined).then(async () => {
+            const payload = buildWebPromptPayload(text, attachments);
+            const message = createTextMessage("user", payload.text);
+            if (payload.blocks)
+                message.blocks = payload.blocks;
+            const stored = await engine.recordDisplayMessage(message);
+            if (this.runtime.engine === engine) {
+                renderMessage(stored, line => this.append(line));
+                this.broadcastSync();
+            }
+        });
+        this.demoMessageQueues.set(engine, pending);
+        try {
+            await pending;
+            return { ok: true };
+        }
+        catch (error) {
+            return { ok: false, error: error instanceof Error ? error.message : String(error) };
+        }
+        finally {
+            if (this.demoMessageQueues.get(engine) === pending)
+                this.demoMessageQueues.delete(engine);
+        }
+    }
+    constructor(runtime, demoOptions = {}) {
         this.runtime = runtime;
+        this.demoOptions = demoOptions;
         const lineId = { current: 0 };
         this.lines = initialLines(runtime, lineId);
         this.lineId = lineId.current;
@@ -640,7 +749,9 @@ export class WebRepl {
         return {
             lines: this.lines.map(line => line.toolError ? { ...line, toolError: this.runtime.engine.redactDisplayValue?.(line.toolError) ?? line.toolError } : line),
             status: this.timedStatus(),
-            busy: this.busy,
+            busy: this.runControl().canResume ? false : this.busy,
+            runControl: this.runControl(),
+            demoMode: this.isDemo(),
             queuedInput: this.queuedInput,
             backgroundTaskCount: backgroundTasks.length,
             backgroundTasks,
@@ -894,6 +1005,12 @@ export class WebRepl {
         this.publishRuntimeContext();
     }
     async submit(text, attachments = []) {
+        if (this.runControl().canResume && (!text.trimStart().startsWith("/") || !text.trim()))
+            return this.continueRun(text, attachments);
+        if (this.pendingContinuation)
+            return { ok: false, error: "续接请求已接收，请勿重复发送" };
+        if (this.isDemo())
+            return this.recordDemoInput(text, attachments);
         if (this.stoppingRun || this.immediateSend)
             return { ok: false, error: "正在停止上一轮请求，请稍后发送" };
         const trimmed = text.trim();
@@ -916,6 +1033,14 @@ export class WebRepl {
         return { ok: true };
     }
     async submitImmediately(text, attachments = []) {
+        if (this.runControl().canResume) {
+            const result = this.continueRun(text, attachments);
+            return result.ok ? { ok: true, interrupted: false } : result;
+        }
+        if (this.isDemo()) {
+            const result = await this.recordDemoInput(text, attachments);
+            return result.ok ? { ok: true, interrupted: false } : result;
+        }
         if (this.immediateSend)
             return { ok: false, error: "正在发送，请勿重复提交" };
         if (this.stoppingRun)
@@ -948,8 +1073,8 @@ export class WebRepl {
         this.queuedInput = mergeWebQueuedInput(this.queuedInput, text);
         this.queuedAttachments = [...(this.queuedAttachments ?? []), ...attachments].slice(0, 20);
     }
-    startRun(text, attachments = []) {
-        const run = this.handleCommandOrPrompt(text, attachments).catch((error) => {
+    startRun(text, attachments = [], continuationOnly = false) {
+        const run = this.handleCommandOrPrompt(text, attachments, continuationOnly).catch((error) => {
             this.append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
             this.setBusy(false);
             this.setStatus({ ...this.status, phase: "ready", detail: undefined });
@@ -1186,9 +1311,25 @@ export class WebRepl {
     }
     async compactSession() {
         const engine = this.runtime.engine;
+        if (this.isDemo())
+            return actionFailure("DEMO_SCRIPTED", "演示会话由后台安排压缩");
+        if (this.compactingSession === engine)
+            return actionFailure("COMPACTION_IN_PROGRESS", "Context compaction is already running");
+        const showProgress = !this.busy;
+        const runToken = this.foregroundRunToken;
+        let finishForeground;
+        const foreground = showProgress ? new Promise(resolve => { finishForeground = resolve; }) : undefined;
+        if (foreground)
+            this.foregroundRun = foreground;
+        if (showProgress) {
+            this.compactingSession = engine;
+            this.busy = true;
+            this.setStatus({ ...this.status, phase: "compacting", detail: "manualcompact: generating context summary", activityTick: this.status.activityTick + 1 });
+        }
         try {
+            // An idle click executes now through the settings barrier, not the chat/input queue.
             const result = await engine.updateSessionSettings({ compact: true });
-            if (this.runtime.engine === engine) {
+            if (this.runtime.engine === engine && this.foregroundRunToken === runToken) {
                 if (result.compaction?.report)
                     this.appendCompaction(result.compaction.report);
                 if (!result.deferred)
@@ -1200,6 +1341,24 @@ export class WebRepl {
         catch (error) {
             return actionFailure("COMPACTION_FAILED", error instanceof Error ? error.message : String(error));
         }
+        finally {
+            if (this.compactingSession === engine)
+                this.compactingSession = undefined;
+            if (this.foregroundRun === foreground)
+                this.foregroundRun = undefined;
+            finishForeground?.();
+            if (showProgress && this.runtime.engine === engine && this.foregroundRunToken === runToken) {
+                this.busy = false;
+                this.setStatus({ ...this.status, phase: "ready", detail: undefined, activityTick: this.status.activityTick + 1 });
+                const queued = this.queuedInput;
+                const attachments = this.queuedAttachments ?? [];
+                if (queued !== undefined) {
+                    this.queuedInput = undefined;
+                    this.queuedAttachments = undefined;
+                    this.startRun(queued, attachments);
+                }
+            }
+        }
     }
     loginForm(providerValue) {
         const provider = parseLoginProvider(providerValue);
@@ -1244,9 +1403,72 @@ export class WebRepl {
         this.setStatus({ ...this.status, metrics, activityTick: this.status.activityTick + 1 });
         this.publishRuntimeContext();
     }
+    async listFrameworkFeedback(page, pageSize) {
+        if (!this.runtime.frameworkFeedback)
+            throw new Error("Framework feedback storage unavailable");
+        return this.runtime.frameworkFeedback.list(page, pageSize);
+    }
+    async deleteFrameworkFeedback(id) {
+        if (typeof id !== "string" || !/^\d{13}-[a-f0-9-]{36}$/.test(id))
+            return actionFailure("INVALID_REQUEST", "建议编号无效");
+        try {
+            if (!this.runtime.frameworkFeedback)
+                throw new Error("unavailable");
+            return { ok: true, deleted: await this.runtime.frameworkFeedback.delete(id) };
+        }
+        catch {
+            return actionFailure("FEEDBACK_DELETE_FAILED", "删除失败，请重试");
+        }
+    }
+    pauseRun() {
+        if (this.runControl().canResume)
+            return { ok: true };
+        if (!this.runControl().canPause)
+            return actionFailure("INVALID_REQUEST", "当前没有可暂停的会话执行");
+        this.runtime.engine.markExecutionPaused();
+        const queuedText = this.queuedInput;
+        const queuedAttachments = this.queuedAttachments;
+        // Do not await cooperative cancellation: the UI must stop immediately.
+        void this.stopForegroundRun("用户暂停了会话").catch(() => this.broadcastSync());
+        this.queuedInput = queuedText;
+        this.queuedAttachments = queuedAttachments;
+        this.status = { ...this.status, phase: "ready", detail: "paused", currentTool: undefined, retryCooldownUntil: undefined };
+        this.broadcastSync();
+        return { ok: true };
+    }
+    continueRun(text = "", attachments = []) {
+        if (!this.runControl().canResume)
+            return actionFailure("INVALID_REQUEST", "没有可恢复的执行，或续接请求已经提交");
+        const useQueue = !text.trim() && attachments.length === 0 && this.queuedInput !== undefined;
+        const request = { engine: this.runtime.engine,
+            text: text || (useQueue ? this.queuedInput : ""),
+            attachments: useQueue ? this.queuedAttachments ?? [] : attachments };
+        this.queuedInput = undefined;
+        this.queuedAttachments = undefined;
+        this.pendingContinuation = request;
+        this.broadcastSync();
+        // Accept immediately, but never overlap two queries on the same mutable engine.
+        void (async () => {
+            try {
+                await this.stoppingRun;
+                await this.foregroundRun;
+                if (this.pendingContinuation !== request || this.runtime.engine !== request.engine)
+                    return;
+                this.pendingContinuation = undefined;
+                this.startRun(request.text, request.attachments, !request.text.trim() && request.attachments.length === 0);
+            }
+            finally {
+                if (this.pendingContinuation === request)
+                    this.pendingContinuation = undefined;
+                this.broadcastSync();
+            }
+        })().catch(error => this.append({ kind: "error", text: error instanceof Error ? error.message : String(error) }));
+        return { ok: true };
+    }
     async interrupt() {
         if (this.immediateSend)
             await this.immediateSend;
+        this.demoSessions.get(this.runtime.engine)?.stop();
         const interrupted = await this.stopForegroundRun("Interrupted from neo web");
         return { ok: true, interrupted };
     }
@@ -1451,6 +1673,14 @@ export class WebRepl {
             .sort((left, right) => createdAtTime(right.createdAt) - createdAtTime(left.createdAt));
     }
     async detachRunningForeground(reason) {
+        if (this.pendingContinuation || this.stoppingRun)
+            throw new Error("上一轮请求正在取消，请稍后切换会话");
+        if (this.demoStarting)
+            throw new Error("演示模式正在启动");
+        if (this.isDemo() && this.busy) {
+            this.demoSessions.get(this.runtime.engine)?.stop();
+            return this.stopForegroundRun(reason);
+        }
         if (!this.busy)
             return false;
         const snapshot = this.runtime.engine.snapshot().session;
@@ -1818,7 +2048,7 @@ export class WebRepl {
             .map((block) => block.imageId);
         return imageIds.length === pending.length && imageIds.every((imageId, index) => imageId === pending[index]);
     }
-    async handleCommandOrPrompt(text, attachments = []) {
+    async handleCommandOrPrompt(text, attachments = [], continuationOnly = false) {
         const command = parseReplCommand(text);
         if (command.type === "exit") {
             this.append(systemLine("neo web server is still running. Close this tab or stop the server process with Ctrl+C."));
@@ -1918,7 +2148,8 @@ export class WebRepl {
         }
         const promptPayload = buildWebPromptPayload(command.text, attachments);
         const optimisticMessageId = `web-user-${this.lineId + 1}`;
-        this.append({ kind: "user", text: promptPayload.displayText, messageId: optimisticMessageId });
+        if (!continuationOnly)
+            this.append({ kind: "user", text: promptPayload.displayText, messageId: optimisticMessageId });
         const optimisticImageIds = (promptPayload.blocks ?? [])
             .filter((block) => block.type === "image" && typeof block.imageId === "string")
             .map((block) => block.imageId);
@@ -1932,12 +2163,14 @@ export class WebRepl {
         this.setStatus({ ...this.status, phase: "running", detail: "working", modelOutput: undefined, usage: undefined, streamedOutputTokens: 0, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined });
         const engine = this.runtime.engine;
         try {
-            for await (const event of engine.sendUserText(promptPayload.text, {
+            const options = {
                 abortSignal: abortController.signal,
                 blocks: promptPayload.blocks,
                 displayText: promptPayload.displayText,
                 stopAfterTurn: () => this.queuedInput !== undefined,
-            })) {
+            };
+            const stream = continuationOnly ? engine.continueExecution(options) : engine.sendUserText(promptPayload.text, options);
+            for await (const event of stream) {
                 if (this.foregroundRunToken !== runToken)
                     continue;
                 if (this.runtime.engine !== engine)
@@ -1960,6 +2193,7 @@ export class WebRepl {
             }
         }
         finally {
+            this.demoSessions.get(engine)?.backend.stop();
             if (this.foregroundRunToken !== runToken)
                 return;
             if (this.runtime.engine !== engine)
@@ -1970,6 +2204,11 @@ export class WebRepl {
             this.finalizeForegroundView();
             this.pendingUserImageEchoIds = undefined;
             this.pendingUserImageEchoMessageId = undefined;
+            if (engine.getExecutionState?.()?.status === "interrupted") {
+                this.setBusy(false);
+                this.setStatus({ ...this.status, phase: "ready", detail: "interrupted", retryCooldownUntil: undefined });
+                return;
+            }
             const queuedText = this.queuedInput;
             const queuedAttach = this.queuedAttachments;
             this.queuedInput = undefined;
@@ -2263,6 +2502,19 @@ export async function handleWebRequest(req, res, router) {
                 ? await workspaceRepl.deleteWorkspaceDirectory(body.path)
                 : actionFailure("CWD_NOT_CONFIGURED", "workspace navigation is not configured"));
         }
+        if (req.method === "POST" && url.pathname === "/api/framework-feedback/delete") {
+            const body = await readJsonBody(req);
+            return sendJson(res, await repl.deleteFrameworkFeedback(body?.id));
+        }
+        if (req.method === "GET" && url.pathname === "/api/framework-feedback") {
+            res.setHeader("Cache-Control", "no-store");
+            try {
+                return sendJson(res, await repl.listFrameworkFeedback(Number(url.searchParams.get("page") ?? 1), Number(url.searchParams.get("pageSize") ?? 10)));
+            }
+            catch {
+                return sendJson(res, { ok: false, error: "建议加载失败" }, 500);
+            }
+        }
         if (req.method === "GET" && url.pathname === "/api/tools")
             return sendJson(res, repl.globalTools());
         if (req.method === "POST" && url.pathname === "/api/tools/global") {
@@ -2321,6 +2573,8 @@ export async function handleWebRequest(req, res, router) {
             const body = await readJsonBody(req);
             return sendJson(res, await repl.setSessionModel(body.model, body.reasoning));
         }
+        if (req.method === "POST" && url.pathname === "/api/demo")
+            return sendJson(res, await repl.startDemo(url.searchParams.get("sessionId") ?? ""));
         if (req.method === "POST" && url.pathname === "/api/compact")
             return sendJson(res, await repl.compactSession());
         if (req.method === "POST" && url.pathname === "/api/fast-mode") {
@@ -2339,6 +2593,10 @@ export async function handleWebRequest(req, res, router) {
             const body = await readJsonBody(req);
             return sendJson(res, await repl.submitImmediately(String(body.text ?? ""), sanitizeWebAttachments(body.attachments)));
         }
+        if (req.method === "POST" && url.pathname === "/api/run/pause")
+            return sendJson(res, repl.pauseRun());
+        if (req.method === "POST" && url.pathname === "/api/run/continue")
+            return sendJson(res, repl.continueRun());
         if (req.method === "POST" && url.pathname === "/api/interrupt")
             return sendJson(res, await repl.interrupt());
         if (req.method === "POST" && url.pathname === "/api/queue/cancel")
@@ -3150,6 +3408,8 @@ function compactionLine(report, createdAt = new Date().toISOString(), current =
     return {
         kind: "meta",
         title: "Context compaction",
+        presentationLevel: "primary",
+        collapsible: false,
         text: formatCompactionReportSummary(report),
         format: "plain",
         compaction: { ...report, createdAt, current },