neoctl 0.2.49 → 0.2.51

package/dist/types/events.d.ts

@@ -60,6 +60,9 @@ export type AgentEvent = {
 } | {
     type: "context.metrics";
     metrics: ContextMetrics;
+} | {
+    type: "context.compaction.delta";
+    text: string;
 } | {
     type: "context.compacted";
     compaction: CompactionReport;

package/dist/web/index.d.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { type SessionPageOptions } from "../session/session-pagination.js";
 import { type ToolInputChange } from "../model/tool-input-stream.js";
 import { type ToolActivity } from "./tool-activity.js";
 import type { TimingRecord } from "../core/query-timing.js";
@@ -210,6 +211,7 @@ type WebActionResult<T extends object = object> = ({
     ok: true;
 } & T) | WebActionFailure;
 interface UiStatus {
+    compactionText?: string;
     modelOutput?: {
         kind: "text";
     } | {
@@ -372,6 +374,7 @@ export declare class WebRuntimeRouter {
     constructor(options?: WebRuntimeRouterOptions);
     get(scope?: WebRuntimeScope): Promise<WebRepl>;
     snapshot(scope?: WebRuntimeScope, includeCatalog?: boolean): Promise<ReturnType<WebRepl["snapshot"]>>;
+    runningSessionIds(): Promise<string[]>;
     reloadModelConfig(): Promise<void>;
     reloadGlobalTools(overrides: Record<string, boolean>): Promise<void>;
     activeScopes(): string[];
@@ -467,6 +470,11 @@ export declare class WebRepl {
         sessionId: string;
         runId: string;
     } | undefined;
+    runningSessionIds(): string[];
+    queuedImage(imageId: string): {
+        body: Buffer;
+        mimeType: string;
+    } | undefined;
     snapshot(includeCatalog?: boolean): {
         lines: UiLine[];
         status: UiStatus;
@@ -483,6 +491,17 @@ export declare class WebRepl {
         };
         demoMode: boolean;
         queuedInput: string | undefined;
+        queuedAttachments: ({
+            kind: "image";
+            imageId: string;
+            previewUrl: string;
+            name?: undefined;
+        } | {
+            kind: "file";
+            name: string;
+            imageId?: undefined;
+            previewUrl?: undefined;
+        })[];
         backgroundTaskCount: number;
         backgroundTasks: ({
             kind: "agent";
@@ -800,9 +819,17 @@ export declare class WebRepl {
     }>;
     private enqueueInput;
     private startRun;
-    listSessions(): Promise<{
+    listSessions(options?: SessionPageOptions): Promise<{
+        runningSessionIds: string[];
         sessions: import("../index.js").SessionSummary[];
+        total: number;
+        totalCount: number;
+        page: number;
+        pageSize: number;
+        totalPages: number;
+    } | {
         runningSessionIds: string[];
+        sessions: import("../index.js").SessionSummary[];
     }>;
     resumeSession(sessionId: string): Promise<WebActionResult>;
     newSession(): Promise<WebActionResult>;

package/dist/web/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { paginateSessions, sessionPageOptions } from "../session/session-pagination.js";
 import { applyToolInputChanges } from "../model/tool-input-stream.js";
 import { toolActivity } from "./tool-activity.js";
 import { toolObservationResult } from "./tool-observation-result.js";
@@ -498,6 +499,11 @@ export class WebRuntimeRouter {
     async snapshot(scope = {}, includeCatalog = true) {
         return (await this.get(scope)).snapshot(includeCatalog);
     }
+    async runningSessionIds() {
+        // Inspect only existing runtime instances: never restore sessions or read transcripts.
+        const entries = await Promise.allSettled([...this.repls.values()]);
+        return [...new Set(entries.flatMap(entry => entry.status === "fulfilled" ? entry.value.runningSessionIds() : []))];
+    }
     async reloadModelConfig() {
         const repls = await Promise.all([...this.repls.values()]);
         await Promise.all(repls.map(repl => repl.reloadModelConfig()));
@@ -749,6 +755,14 @@ export class WebRepl {
         // Cursor addresses stored bytes, not the possibly additionally redacted response length.
         return page.ok ? this.runtime.engine.redactDisplayValue({ sessionId, runId, ...page.value }) : undefined;
     }
+    runningSessionIds() {
+        const id = this.runtime.engine.snapshot().session?.sessionId;
+        return [...new Set([...this.backgroundSessionRuns.keys(), ...(this.busy && !this.runControl().canResume && id ? [id] : [])])];
+    }
+    queuedImage(imageId) {
+        const attachment = this.queuedAttachments?.find(item => item.kind === "image" && item.imageId === imageId);
+        return attachment?.kind === "image" ? imagePayloadForBlock({ type: "image", ...attachment }) : undefined;
+    }
     snapshot(includeCatalog = false) {
         const backgroundTasks = this.backgroundTasks();
         const engineSnapshot = this.runtime.engine.snapshot();
@@ -765,12 +779,16 @@ export class WebRepl {
             runControl: this.runControl(),
             demoMode: this.isDemo(),
             queuedInput: this.queuedInput,
+            // Preview metadata only. Base64 image contents must not inflate every status snapshot.
+            queuedAttachments: (this.queuedAttachments ?? []).map(item => item.kind === "image"
+                ? { kind: "image", imageId: item.imageId, previewUrl: `/api/queue/images/${encodeURIComponent(item.imageId)}` }
+                : { kind: "file", name: item.name }),
             backgroundTaskCount: backgroundTasks.length,
             backgroundTasks,
             terminalTaskHistory: this.terminalTaskHistory(),
             agentTaskHistory: sessionAgentTasks(this.runtime).filter((task) => this.runtime.taskStore.isTerminal(task)).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt)).map((task) => this.agentTaskSnapshot(task)),
             backgroundSessionRunCount: this.backgroundSessionRuns.size,
-            runningSessionIds: [...this.backgroundSessionRuns.keys()],
+            runningSessionIds: this.runningSessionIds(),
             session: engineSnapshot.session,
             modelSettings: { model: engineSnapshot.model, reasoning: engineSnapshot.reasoning },
             pendingSessionSettings,
@@ -1097,10 +1115,10 @@ export class WebRepl {
                 this.foregroundRun = undefined;
         }).catch(() => undefined);
     }
-    async listSessions() {
+    async listSessions(options) {
         const sessions = await this.runtime.engine.listSessions(Number.POSITIVE_INFINITY);
-        const runningSessionIds = [...this.backgroundSessionRuns.keys()];
-        return { sessions, runningSessionIds };
+        const runningSessionIds = this.runningSessionIds();
+        return { ...(options ? paginateSessions(sessions, options) : { sessions }), runningSessionIds };
     }
     async resumeSession(sessionId) {
         if (!sessionId)
@@ -1347,11 +1365,15 @@ export class WebRepl {
         if (showProgress) {
             this.compactingSession = engine;
             this.busy = true;
-            this.setStatus({ ...this.status, phase: "compacting", detail: "manualcompact: generating context summary", activityTick: this.status.activityTick + 1 });
+            this.setStatus({ ...this.status, phase: "compacting", compactionText: "", 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 }, { abortSignal: controller?.signal });
+            const result = await engine.updateSessionSettings({ compact: true }, { abortSignal: controller?.signal, onCompactionDelta: text => {
+                    if (showProgress && this.runtime.engine === engine && this.foregroundRunToken === runToken && !controller?.signal.aborted) {
+                        this.handleEvent({ type: "context.compaction.delta", text });
+                    }
+                } });
             if (this.runtime.engine === engine && this.foregroundRunToken === runToken) {
                 if (result.compaction?.report)
                     this.appendCompaction(result.compaction.report);
@@ -1545,6 +1567,8 @@ export class WebRepl {
         this.broadcastSync();
     }
     setStatus(next) {
+        if (next.phase !== "compacting")
+            next = { ...next, compactionText: undefined };
         const waiting = next.phase === "calling_model" && !next.modelOutput;
         const wasWaiting = this.status.phase === "calling_model" && !this.status.modelOutput;
         next = { ...next, responseWaitStartedAt: waiting
@@ -2002,6 +2026,10 @@ export class WebRepl {
                 this.liveToolLineIds.set(event.toolUse.id, this.append(patch));
             return;
         }
+        if (event.type === "context.compaction.delta") {
+            this.queueDeltaStatus();
+            return;
+        }
         if (event.type === "tool_call.delta") {
             this.queueDeltaStatus();
             return;
@@ -2336,10 +2364,13 @@ export class WebRepl {
         this.activeAbortController = abortController;
         this.interruptArmed = false;
         this.setBusy(true);
-        this.setStatus({ ...this.status, phase: "compacting", detail: type === "compact" ? "manual compact" : "pure compact", activityTick: this.status.activityTick + 1 });
+        this.setStatus({ ...this.status, phase: "compacting", compactionText: "", detail: type === "compact" ? "manual compact" : "pure compact", activityTick: this.status.activityTick + 1 });
         try {
             const result = type === "compact"
-                ? await this.runtime.engine.compact({ abortSignal: abortController.signal })
+                ? await this.runtime.engine.compact({ abortSignal: abortController.signal, onCompactionDelta: text => {
+                        if (this.foregroundRunToken === runToken && !abortController.signal.aborted)
+                            this.handleEvent({ type: "context.compaction.delta", text });
+                    } })
                 : await this.runtime.engine.pureCompact({ abortSignal: abortController.signal });
             if (this.foregroundRunToken !== runToken)
                 return;
@@ -2556,6 +2587,8 @@ export async function handleWebRequest(req, res, router) {
         if (["/api/tool-call-detail", "/api/terminal-output", "/api/agent-content"].includes(url.pathname) && !allowToolDetailRequest(req.headers.origin, req.headers.host, req.headers["sec-fetch-site"])) {
             return sendJson(res, { error: "详情访问被拒绝" }, 403);
         }
+        if (req.method === "GET" && url.pathname === "/api/sessions/running")
+            return sendJson(res, { runningSessionIds: await router.runningSessionIds() });
         const scope = webRuntimeScopeFromUrl(url);
         const repl = await router.get(scope);
         if (req.method === "GET" && url.pathname === "/events")
@@ -2585,6 +2618,11 @@ export async function handleWebRequest(req, res, router) {
             const page = repl.terminalOutput(url.searchParams.get("sessionId") ?? "", url.searchParams.get("runId") ?? "", url.searchParams.get("stream") ?? "stdout", Number(url.searchParams.get("offset") ?? 0), Number(url.searchParams.get("limitBytes") ?? 65536), url.searchParams.get("tail") === "true");
             return page ? sendJson(res, page) : sendJson(res, { error: "终端输出不可获取或无权访问" }, 404);
         }
+        const queuedImageMatch = /^\/api\/queue\/images\/(image_[0-9a-f-]{36})$/iu.exec(url.pathname);
+        if (req.method === "GET" && queuedImageMatch) {
+            const image = repl.queuedImage(queuedImageMatch[1]);
+            return image ? sendImage(res, image, req) : sendJson(res, { error: "图片不可用" }, 404);
+        }
         if (req.method === "GET" && url.pathname === "/api/state")
             return sendJson(res, repl.snapshot(true));
         if (req.method === "GET" && url.pathname === "/api/runtime-context")
@@ -2755,7 +2793,7 @@ export async function handleWebRequest(req, res, router) {
         if (req.method === "POST" && url.pathname === "/api/queue/send-now")
             return sendJson(res, await repl.sendQueuedNow());
         if (req.method === "GET" && url.pathname === "/api/sessions")
-            return sendJson(res, await repl.listSessions());
+            return sendJson(res, await repl.listSessions(sessionPageOptions(url.searchParams)));
         if (req.method === "POST" && url.pathname === "/api/sessions/resume") {
             const body = await readJsonBody(req);
             return sendJson(res, await repl.resumeSession(String(body.sessionId ?? "")));
@@ -3115,8 +3153,10 @@ function toolStreamStepStatus(phase) {
     return "running";
 }
 function reduceStatus(status, event) {
+    if (event.type === "context.compaction.delta")
+        return { ...status, phase: "compacting", compactionText: (status.compactionText || "") + event.text, activityTick: status.activityTick + 1 };
     if (event.type === "state")
-        return { ...status, phase: event.phase, detail: event.detail, modelOutput: undefined, currentTool: event.phase === "running_tools" ? status.currentTool : undefined, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
+        return { ...status, phase: event.phase, detail: event.detail, compactionText: event.phase === "compacting" && status.phase === "compacting" ? status.compactionText : undefined, modelOutput: undefined, currentTool: event.phase === "running_tools" ? status.currentTool : undefined, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
     if (event.type === "context.compacted")
         return { ...status, phase: "compacting", detail: formatCompactionReportSummary(event.compaction), activityTick: status.activityTick + 1 };
     if (event.type === "context.metrics")