@cjhyy/code-shell-core 0.7.0-beta.1 → 0.7.1

package/dist/tool-system/registry.js

@@ -2,7 +2,7 @@
  * Unified tool registry — built-in tools + MCP tools.
  */
 import { ConfigError, ToolNotFoundError, ToolExecutionError, ToolTimeoutError, } from "../exceptions.js";
-import { BUILTIN_TOOLS } from "./builtin/index.js";
+import { BUILTIN_TOOLS, toToolExecutionResult } from "./builtin/index.js";
 import { validateToolMetadata } from "./validate-tool-metadata.js";
 /**
  * Default execution timeout for any tool that does not declare its own
@@ -42,7 +42,7 @@ export class ToolRegistry {
         validateToolMetadata(tool);
         this.tools.set(tool.name, tool);
         if (executor) {
-            this.builtinExecutors.set(tool.name, executor);
+            this.builtinExecutors.set(tool.name, async (args, ctx) => toToolExecutionResult(await executor(args, ctx)));
         }
     }
     unregisterTool(name) {
@@ -54,6 +54,7 @@ export class ToolRegistry {
             name: t.name,
             description: t.description,
             inputSchema: t.inputSchema,
+            sensitiveResult: t.sensitiveResult,
         }));
     }
     getTool(name) {
@@ -88,61 +89,78 @@ export class ToolRegistry {
         }
         // Create a child AbortController that aborts on timeout OR parent abort
         const childController = new AbortController();
+        let timedOut = false;
         const timerId = timeout > 0
-            ? setTimeout(() => childController.abort(new ToolTimeoutError(name, timeout)), timeout)
+            ? setTimeout(() => {
+                timedOut = true;
+                childController.abort(new ToolTimeoutError(name, timeout));
+            }, timeout)
             : undefined;
         // Cascade parent abort to child
         const onParentAbort = () => childController.abort(parentSignal?.reason);
         parentSignal?.addEventListener("abort", onParentAbort, { once: true });
+        if (parentSignal?.aborted)
+            onParentAbort();
         // Inject the abort signal into args so tools (like Agent) can use it
         const argsWithSignal = { ...args, __signal: childController.signal };
         // Build per-call ctx: caller's ctx (if any) + this call's signal
         const ctx = options?.ctx
             ? { ...options.ctx, signal: childController.signal }
             : undefined;
-        try {
-            const result = await Promise.race([
-                executor(argsWithSignal, ctx),
-                new Promise((_, reject) => {
-                    childController.signal.addEventListener("abort", () => {
-                        const reason = childController.signal.reason;
-                        reject(reason instanceof ToolTimeoutError ? reason : new Error("Tool aborted"));
-                    }, { once: true });
-                }),
-            ]);
+        let onChildAbort;
+        const aborted = new Promise((_, reject) => {
+            onChildAbort = () => {
+                const reason = childController.signal.reason;
+                reject(reason instanceof Error
+                    ? reason
+                    : Object.assign(new Error("Tool aborted"), { name: "AbortError" }));
+            };
+            childController.signal.addEventListener("abort", onChildAbort, { once: true });
+            if (childController.signal.aborted)
+                onChildAbort();
+        });
+        const cleanup = () => {
             clearTimeout(timerId);
             parentSignal?.removeEventListener("abort", onParentAbort);
-            // executor 可返回纯字符串,或 { contentBlocks, result? }(view_image
-            // 用后者回传图片块)。归一化成 ToolResult:有 contentBlocks 就带上,
-            // result 始终保留一份文本镜像供 transcript / 摘要使用。
-            if (typeof result === "string") {
-                return { id, toolName: name, result };
+            if (onChildAbort)
+                childController.signal.removeEventListener("abort", onChildAbort);
+        };
+        try {
+            const rawResult = await Promise.race([executor(argsWithSignal, ctx), aborted]);
+            const result = toToolExecutionResult(rawResult);
+            if (childController.signal.aborted) {
+                throw childController.signal.reason instanceof Error
+                    ? childController.signal.reason
+                    : Object.assign(new Error("Tool aborted"), { name: "AbortError" });
+            }
+            cleanup();
+            if (!result.ok) {
+                return {
+                    id,
+                    toolName: name,
+                    error: result.error,
+                    isError: true,
+                    sandbox: result.sandbox,
+                };
             }
-            // 结构化返回:图片块(view_image)或沙箱标记(Bash 等)。两者互斥,
-            // 各取所有,缺的字段为 undefined。
-            const contentBlocks = "contentBlocks" in result ? result.contentBlocks : undefined;
-            const sandbox = "sandbox" in result ? result.sandbox : undefined;
-            const sensitive = "sensitive" in result ? result.sensitive : undefined;
-            const displayResult = "displayResult" in result ? result.displayResult : undefined;
-            const transcriptResult = "transcriptResult" in result ? result.transcriptResult : undefined;
             return {
                 id,
                 toolName: name,
-                result: result.result ?? (contentBlocks ? "(image)" : ""),
-                contentBlocks,
-                sandbox,
-                sensitive,
-                displayResult,
-                transcriptResult,
+                result: result.result ?? (result.contentBlocks ? "(image)" : ""),
+                contentBlocks: result.contentBlocks,
+                sandbox: result.sandbox,
+                sensitive: result.sensitive,
+                displayResult: result.displayResult,
+                transcriptResult: result.transcriptResult,
+                isError: false,
             };
         }
         catch (err) {
-            clearTimeout(timerId);
-            parentSignal?.removeEventListener("abort", onParentAbort);
+            cleanup();
             // Always return error as ToolResult, never throw
             let errorMsg;
             const isAbort = err?.name === "AbortError" || parentSignal?.aborted === true;
-            if (err instanceof ToolTimeoutError) {
+            if (timedOut || err instanceof ToolTimeoutError) {
                 errorMsg = `Tool timed out after ${timeout}ms: ${name}`;
             }
             else if (isAbort) {

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 /**
  * Core type definitions for the code-shell orchestration framework.
  */
-import type { GoalConfig } from "./engine/goal.js";
+import type { GoalConfig, GoalTerminal } from "./engine/goal.js";
 export interface ContentBlock {
     type: "text" | "tool_use" | "tool_result" | "image" | "reasoning";
     text?: string;
@@ -33,6 +33,8 @@ export interface ToolDefinition {
     name: string;
     description: string;
     inputSchema: Record<string, unknown>;
+    /** Omit this tool's result body from retained Goal-judge evidence. */
+    sensitiveResult?: boolean;
 }
 export interface ToolCall {
     id: string;
@@ -114,6 +116,8 @@ export interface RegisteredTool {
     permissionDefault: PermissionDecision;
     isConcurrencySafe?: boolean;
     isReadOnly?: boolean;
+    /** Declaratively marks result bodies as sensitive for retained Goal evidence. */
+    sensitiveResult?: boolean;
     /**
      * Declarative file-path safety metadata. ToolExecutor enforces this before
      * dispatching the tool, so file access cannot depend on each tool handler
@@ -133,7 +137,7 @@ export interface RegisteredTool {
      */
     timeoutMs?: number;
 }
-export type TranscriptEventType = "message" | "tool_use" | "tool_result" | "summary" | "content_replace" | "file_history" | "plan_operation" | "session_meta" | "subagent" | "turn_boundary" | "goal_progress" | "turn_stopped" | "error";
+export type TranscriptEventType = "message" | "tool_use" | "tool_result" | "summary" | "content_replace" | "file_history" | "plan_operation" | "session_meta" | "subagent" | "external_file_changes" | "turn_boundary" | "goal_progress" | "turn_stopped" | "error";
 export interface TranscriptEvent {
     id: string;
     type: TranscriptEventType;
@@ -171,6 +175,15 @@ export interface ContextUsageAnchor {
     provider?: string;
     model?: string;
 }
+/** Provenance for a user-visible session fork. Optional on legacy sessions. */
+export interface SessionForkLineage {
+    sessionId: string;
+    mode: "full" | "summary";
+    fromEventId?: string;
+    throughEventId?: string;
+    sourceEventCount: number;
+    createdAt: number;
+}
 export interface SessionState {
     sessionId: string;
     cwd: string;
@@ -215,6 +228,8 @@ export interface SessionState {
      * "key present && null" to tell a new top-level session apart from legacy.
      */
     parentSessionId?: string | null;
+    /** User-fork lineage; deliberately separate from sub-agent ownership. */
+    forkedFrom?: SessionForkLineage;
     /**
      * Which host/context created this session. Desktop disk-rebuild shows only
      * `desktop` + `automation`. Absent on legacy sessions.
@@ -242,6 +257,12 @@ export interface SessionState {
      * baselines reset (matching CC). See engine.run goal-resolution.
      */
     activeGoal?: GoalConfig;
+    /**
+     * Last force-terminated goal instance. Kept separately from activeGoal so an
+     * old whole-state writer cannot make that same exhausted goal armable again.
+     * Optional for backward compatibility with pre-tombstone state.json files.
+     */
+    goalTerminal?: GoalTerminal;
 }
 export interface TokenUsage {
     promptTokens: number;
@@ -506,7 +527,7 @@ export type StreamEvent = {
     agentId: string;
     name?: string;
     description: string;
-    status: "completed" | "failed";
+    status: "completed" | "failed" | "cancelled";
     /**
      * What kind of background work this was. Lets UIs localize the
      * completion toast (e.g. a shell shows "命令完成" not the raw English
@@ -518,8 +539,16 @@ export type StreamEvent = {
     command?: string;
     /** Final assistant text (status === "completed" only). */
     finalText?: string;
-    /** Error message (status === "failed" only). */
+    /** Error message (status === "failed" or "cancelled" only). */
     error?: string;
+    /** External Claude/Codex session id, when workKind === "cc". */
+    ccSessionId?: string;
+    /** Files attributed to an external DriveAgent transcript. */
+    changedFiles?: string[];
+    /** Working directory used to canonicalize relative/absolute path aliases. */
+    cwd?: string;
+    /** Client id of the real user turn that launched this background work. */
+    originClientMessageId?: string;
     /** When the bg agent finished (Date.now() value). */
     enqueuedAt: number;
 };
@@ -652,9 +681,10 @@ export interface MCPServerConfig {
      */
     envHeaders?: Record<string, string>;
     /**
-     * (HTTP) id of a stored credential (CredentialStore) to use as the Bearer
-     * token. Resolved at connect time via a resolver passed to buildHttpHeaders;
-     * the secret is never stored in the MCP config. Wins over bearerTokenEnvVar.
+     * (HTTP) id of a stored credential (token/link/oauth) to use as Bearer auth.
+     * OAuth credentials inject their current access token. Resolved at connect
+     * time via CredentialStore; the secret is never stored in MCP config. Wins
+     * over bearerTokenEnvVar.
      */
     credentialRef?: string;
     /**
@@ -677,6 +707,7 @@ export interface MCPServerConfig {
 export interface MCPServerOverride {
     env?: Record<string, string>;
     envVars?: string[];
+    /** (HTTP) id of a stored token/link/oauth credential used as Bearer auth. */
     credentialRef?: string;
     bearerTokenEnvVar?: string;
     envHeaders?: Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-core",
-  "version": "0.7.0-beta.1",
+  "version": "0.7.1",
   "description": "Core engine for code-shell — agent orchestration, tool execution, hooks, protocol. UI-agnostic.",
   "type": "module",
   "main": "./dist/index.js",