neoctl 0.2.41 → 0.2.43

package/dist/web/image-result-metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"image-result-metadata.js","sourceRoot":"","sources":["../../src/web/image-result-metadata.ts"],"names":[],"mappings":"AAYA,wGAAwG;AACxG,MAAM,UAAU,mBAAmB,CAAC,MAAe;IACjD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IACrF,MAAM,IAAI,GAAG,MAAiC,CAAC;IAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IAClD,MAAM,IAAI,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,MAAM,SAAS,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5H,MAAM,IAAI,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QAClH,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QAC1H,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,KAAK,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAgC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC5O,CAAC,CAAC;KACH,CAAC;AACJ,CAAC"}

package/dist/web/index.d.ts

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import type { TimingRecord } from "../core/query-timing.js";
+import { type ImageResultMetadata } from "./image-result-metadata.js";
 import { type IncomingMessage, type ServerResponse } from "node:http";
 import { QueryEngine } from "../core/query-engine.js";
 import { type AppPromptStore } from "../app/app-prompt.js";
@@ -82,6 +84,7 @@ export declare class SessionUsageTracker {
 }
 interface UiLineImage {
     src?: string;
+    originalSrc?: string;
     imageId?: string;
     label?: string;
     mimeType: string;
@@ -159,6 +162,7 @@ interface UiLine {
     toolPresentation?: ToolPresentation;
     parentToolName?: string;
     toolUseId?: string;
+    timing?: TimingRecord;
     parentToolUseId?: string;
     title?: string;
     bodyTitle?: string;
@@ -174,6 +178,7 @@ interface UiLine {
     live?: boolean;
     collapsible?: boolean;
     image?: UiLineImage;
+    imageResult?: ImageResultMetadata;
     compaction?: UiCompactionReport;
 }
 type WebActionFailure = {
@@ -185,6 +190,15 @@ type WebActionResult<T extends object = object> = ({
     ok: true;
 } & T) | WebActionFailure;
 interface UiStatus {
+    modelOutput?: {
+        kind: "text";
+    } | {
+        kind: "tool_call";
+        callId: string;
+        name?: string;
+    };
+    queryTiming?: TimingRecord;
+    toolTimings?: TimingRecord[];
     phase: string;
     detail?: string;
     currentTool?: {
@@ -235,7 +249,7 @@ export interface CreateWebRuntimeOptions {
     sessionPluginOverrides?: Readonly<Record<string, boolean>>;
     persistSessionPluginOverrides?: WebRuntimePluginSupport["persist"];
     resolveSessionPluginOverrides?: WebRuntimePluginSupport["resolve"];
-    /** Global tool defaults. Missing names default to enabled. */
+    /** Global tool overrides. Missing names use registry defaults (delegation tools are opt-in). */
     globalToolOverrides?: Readonly<Record<string, boolean>>;
     /** Per-session tool overrides. Missing names inherit their global default. */
     sessionToolOverrides?: Readonly<Record<string, boolean>>;
@@ -435,7 +449,7 @@ export declare class WebRepl {
                 steps: {
                     id: string;
                     title: string;
-                    status: "completed" | "running" | "failed";
+                    status: "running" | "completed" | "failed";
                 }[] | undefined;
             };
             pendingMessageCount: number;
@@ -563,7 +577,7 @@ export declare class WebRepl {
                 steps: {
                     id: string;
                     title: string;
-                    status: "completed" | "running" | "failed";
+                    status: "running" | "completed" | "failed";
                 }[] | undefined;
             };
             pendingMessageCount: number;
@@ -788,6 +802,7 @@ export declare class WebRepl {
     private backgroundTasks;
     private detachRunningForeground;
     private reattachRunningSession;
+    private timedStatus;
     private reduce;
     private finalizeLiveLine;
     private finalizeThinkingLine;

package/dist/web/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { imageResultMetadata } from "./image-result-metadata.js";
 import { subagentHeader, subagentStatusFacts } from "./status-semantics.js";
 import { handlePromptConfigRequest } from "./prompt-config-protocol.js";
 import http from "node:http";
@@ -17,7 +18,7 @@ import { readModelProviderConfig } from "../model/config.js";
 import { findModelMetadata, loadModelCatalog, reasoningEffortsForModel, resolveContextWindowTokens } from "../model/context-window.js";
 import { CommunicationLogger, LoggingModelGateway } from "../model/communication-logger.js";
 import { createModelGatewayFromConfig, createModelGatewayFromProcessEnv } from "../model/provider-factory.js";
-import { ToolRegistry } from "../tools/registry.js";
+import { ToolRegistry, isToolEnabledByDefault } from "../tools/registry.js";
 import { builtinToolPresentation, toolPresentationForSource } from "../tools/tool-catalog.js";
 import { editTool, writeTool } from "../tools/builtins/edit-tool.js";
 import { createExecTool, createWriteStdinTool } from "../tools/builtins/exec-tool.js";
@@ -287,7 +288,7 @@ function normalizeToolOverrides(value, catalog) {
 }
 function applyToolOverrides(registry, catalog, globalOverrides, sessionOverrides) {
     for (const tool of catalog)
-        registry.setEnabled(tool.name, sessionOverrides[tool.name] ?? globalOverrides[tool.name] ?? true);
+        registry.setEnabled(tool.name, sessionOverrides[tool.name] ?? globalOverrides[tool.name] ?? isToolEnabledByDefault(tool.name));
 }
 /** Called only at a safe turn boundary or while idle, never during tool execution. */
 export function refreshGlobalToolOverrides(runtime) {
@@ -544,7 +545,7 @@ export class WebRepl {
         }
         return {
             lines: this.lines.map(line => line.toolError ? { ...line, toolError: this.runtime.engine.redactDisplayValue?.(line.toolError) ?? line.toolError } : line),
-            status: this.status,
+            status: this.timedStatus(),
             busy: this.busy,
             queuedInput: this.queuedInput,
             backgroundTaskCount: backgroundTasks.length,
@@ -596,7 +597,7 @@ export class WebRepl {
         return {
             items: support.catalog.map((tool) => ({
                 ...tool,
-                configuredEnabled: support.globalOverrides[tool.name] ?? true,
+                configuredEnabled: support.globalOverrides[tool.name] ?? isToolEnabledByDefault(tool.name),
             })),
         };
     }
@@ -614,7 +615,7 @@ export class WebRepl {
             busy: this.busy,
             items: support.catalog.map((tool) => {
                 const override = support.sessionOverrides[tool.name];
-                const globallyEnabled = support.globalOverrides[tool.name] ?? true;
+                const globallyEnabled = support.globalOverrides[tool.name] ?? isToolEnabledByDefault(tool.name);
                 const available = tool.source !== "plugin" || Boolean(tool.pluginId && activePluginIds.has(tool.pluginId));
                 return {
                     ...tool,
@@ -1405,6 +1406,14 @@ export class WebRepl {
         this.setBusy(true);
         this.setStatus({ ...this.status, phase: "running", detail: "working" });
     }
+    timedStatus() {
+        const records = this.runtime.engine.getTimingRecords?.() ?? [];
+        if (records.length === 0)
+            return this.status;
+        const queryTiming = records.filter(record => record.kind === "query").at(-1);
+        return { ...this.status, queryTiming,
+            toolTimings: records.filter(record => record.kind === "tool" && record.runId === queryTiming?.runId) };
+    }
     reduce(event) {
         this.status = reduceStatus(this.status, event);
         if (event.type === "usage")
@@ -1565,6 +1574,18 @@ export class WebRepl {
     }
     handleEvent(event) {
         this.reduce(event);
+        if (event.type === "timing.updated") {
+            if (event.timing.kind === "tool") {
+                const line = this.lines.find(item => item.timing?.id === event.timing.id)
+                    ?? this.lines.find(item => item.id === this.liveToolLineIds.get(event.timing.toolUseId));
+                if (line) {
+                    this.lines = this.lines.map(item => item.id === line.id ? { ...item, timing: event.timing } : item);
+                    this.queueDeltaOperation({ type: "line.patch", id: line.id, patch: { timing: event.timing } });
+                }
+            }
+            this.queueDeltaStatus();
+            return;
+        }
         if (event.type === "message" && this.matchesPendingUserImageEcho(event.message)) {
             const messageId = this.pendingUserImageEchoMessageId;
             this.pendingUserImageEchoIds = undefined;
@@ -1573,7 +1594,7 @@ export class WebRepl {
             this.broadcastSync();
             return;
         }
-        if (event.type === "tool_call.delta") {
+        if (event.type === "tool_call.started" || event.type === "tool_call.delta") {
             this.queueDeltaStatus();
             return;
         }
@@ -1818,7 +1839,7 @@ export class WebRepl {
         this.activeAbortController = abortController;
         this.interruptArmed = false;
         this.setBusy(true);
-        this.setStatus({ ...this.status, phase: "running", detail: "working", usage: undefined, streamedOutputTokens: 0, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined });
+        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, {
@@ -1832,7 +1853,7 @@ export class WebRepl {
                 if (this.runtime.engine !== engine)
                     continue;
                 if (this.suppressReattachedStreaming.has(engine)) {
-                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage") {
+                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage" || event.type === "timing.updated") {
                         if (event.type === "message" || event.type === "terminal" || event.type === "error")
                             this.suppressReattachedStreaming.delete(engine);
                         this.handleEvent(event);
@@ -2002,7 +2023,7 @@ export class WebRepl {
             protocolVersion: 2,
             sessionId: this.runtime.engine.snapshot().session?.sessionId,
             operations,
-            status: this.status,
+            status: this.timedStatus(),
         };
         for (const subscriber of this.subscribers)
             this.send(subscriber, "delta", payload);
@@ -2376,6 +2397,14 @@ function restoredHistoryLines(runtime) {
             historyToolLineIndexes.set(line.toolUseId, lines.length - 1);
         return lines.length;
     };
+    const toolTimings = new Map();
+    for (const record of runtime.engine.getTimingRecords?.() ?? []) {
+        if (record.kind !== "tool" || !record.toolUseId)
+            continue;
+        const matches = toolTimings.get(record.toolUseId) ?? [];
+        matches.push(record);
+        toolTimings.set(record.toolUseId, matches);
+    }
     const entries = runtime.engine.getDisplayEntries();
     let lastCompactionIndex = -1;
     for (let index = entries.length - 1; index >= 0; index -= 1) {
@@ -2396,6 +2425,12 @@ function restoredHistoryLines(runtime) {
         const report = entry.report ?? legacyCompactionReport(entry.reason);
         append(compactionLine(report, entry.createdAt, entryIndex === lastCompactionIndex));
     }
+    // Legacy histories can reuse call IDs. Ambiguous associations stay unknown.
+    for (const line of lines) {
+        const matches = line.toolUseId ? toolTimings.get(line.toolUseId) : undefined;
+        if (matches?.length === 1)
+            line.timing = matches[0];
+    }
     return lines;
 }
 function initialStatus(runtime, metrics = runtime.initialMetrics) {
@@ -2543,7 +2578,7 @@ function toolStreamStepStatus(phase) {
 }
 function reduceStatus(status, event) {
     if (event.type === "state")
-        return { ...status, phase: event.phase, detail: event.detail, 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, 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")
@@ -2551,21 +2586,23 @@ function reduceStatus(status, event) {
     if (event.type === "usage")
         return { ...status, usage: event.usage, inputTokenUpdatedAt: event.usage.inputTokens !== undefined ? Date.now() : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.usage.outputTokens !== undefined ? Date.now() : status.outputTokenUpdatedAt, activityTick: status.activityTick + 1 };
     if (event.type === "assistant.delta")
-        return { ...status, phase: "calling_model", streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, phase: "calling_model", modelOutput: { kind: "text" }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "thinking.delta")
-        return { ...status, phase: "thinking", streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, phase: "thinking", modelOutput: undefined, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+    if (event.type === "tool_call.started")
+        return { ...status, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name }, activityTick: status.activityTick + 1 };
     if (event.type === "tool_call.delta")
-        return { ...status, phase: "calling_model", streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.argumentsDelta), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name ?? (status.modelOutput?.kind === "tool_call" && status.modelOutput.callId === event.callId ? status.modelOutput.name : undefined) }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.argumentsDelta), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "retrying")
-        return { ...status, phase: "calling_model", detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
+        return { ...status, phase: "calling_model", modelOutput: undefined, detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
     if (event.type === "tool.started")
-        return { ...status, phase: "running_tools", currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: Date.now() }, activityTick: status.activityTick + 1 };
+        return { ...status, phase: "running_tools", modelOutput: undefined, currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: Date.now() }, activityTick: status.activityTick + 1 };
     if (event.type === "tool.progress")
         return { ...status, phase: "running_tools", detail: event.progress.message || status.detail, currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: status.currentTool?.id === event.toolUse.id ? status.currentTool.startedAt : Date.now() }, activityTick: status.activityTick + 1 };
     if (event.type === "tool.result.available" || event.type === "tool.finished" || event.type === "tool.batch.completed")
         return { ...status, currentTool: "toolUse" in event && status.currentTool?.id === event.toolUse.id ? undefined : status.currentTool, activityTick: status.activityTick + 1 };
     if (event.type === "terminal")
-        return { ...status, phase: "stopped", detail: event.reason, currentTool: undefined, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined, activityTick: status.activityTick + 1 };
+        return { ...status, phase: "stopped", modelOutput: undefined, detail: event.reason, currentTool: undefined, inputTokenUpdatedAt: undefined, outputTokenUpdatedAt: undefined, retryCooldownUntil: undefined, activityTick: status.activityTick + 1 };
     if (event.type === "message" || event.type === "error")
         return { ...status, activityTick: status.activityTick + 1 };
     return status;
@@ -2948,6 +2985,7 @@ function imageLineForBlock(role, block, messageId, blockIndex) {
         text: block.label ?? `[image ${block.mimeType}]`,
         image: {
             src: resolution.available ? (block.imageId ? `/api/images/by-id/${encodeURIComponent(block.imageId)}` : `/api/images/${encodeURIComponent(messageId)}/${blockIndex}`) : undefined,
+            originalSrc: resolution.available ? (block.imageId ? `/api/images/by-id/${encodeURIComponent(block.imageId)}` : `/api/images/${encodeURIComponent(messageId)}/${blockIndex}`) : undefined,
             imageId: block.imageId,
             label: block.label,
             mimeType: block.mimeType,
@@ -3090,6 +3128,7 @@ function formatToolResultLine(toolName, output, ok, presentToolResult) {
         title: presentation?.title ?? toolTitle(toolName, "finished"),
         bodyTitle: presentation?.bodyTitle ?? formatted.bodyTitle,
         titleStatus: ok ? "success" : "failure",
+        imageResult: toolName === "image_create" ? imageResultMetadata(output) : undefined,
         text: presentation?.text ?? formatted.text,
         toolDisplay: resources?.length ? undefined : buildToolResultDisplay(toolName, output, ok),
         format: formatted.format,
@@ -3593,7 +3632,19 @@ function formatImageGenerationToolResult(output, ok) {
     const lines = [`${mode === "edit" ? "edited" : "generated"} ${returnedImages ?? 0} image${returnedImages === 1 ? "" : "s"}`];
     const details = [provider, model, size, quality && quality !== "auto" ? quality : undefined, format].filter((value) => Boolean(value));
     if (details.length > 0)
-        lines.push(details.join(" · "));
+        lines.push(`${output.requested ? "requested: " : ""}${details.join(" · ")}`);
+    if (isRecord(output.actual)) {
+        lines.push(`upstream-reported quality: ${String(output.actual.quality ?? "unreported")}`);
+        if (Array.isArray(output.images))
+            for (const image of output.images.filter(isRecord)) {
+                if (typeof image.width === "number" && typeof image.height === "number")
+                    lines.push(`actual image: ${image.width}x${image.height} · ${String(image.mimeType ?? "")}`);
+            }
+    }
+    if (Array.isArray(output.warnings))
+        for (const warning of output.warnings.filter(isRecord)) {
+            lines.push(`warning [${String(warning.code ?? "IMAGE_WARNING")}]: ${String(warning.message ?? "")}`);
+        }
     if (sourceImages !== undefined)
         lines.push(`source images: ${sourceImages}`);
     const duration = imageGenerationDuration(output);