@cjhyy/code-shell-core 0.9.3 → 0.9.5

package/dist/panel-apps/manifest.d.ts

@@ -57,37 +57,37 @@ export declare const PanelAppAgentContribution: z.ZodEffects<z.ZodObject<{
     }>, "many">>;
     skills: z.ZodDefault<z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">>;
 }, "strict", z.ZodTypeAny, {
-    skills: string[];
     tools: {
         name: string;
         description: string;
         inputSchema: Record<string, unknown>;
         readOnly: boolean;
     }[];
+    skills: string[];
 }, {
-    skills?: string[] | undefined;
     tools?: {
         name: string;
         description: string;
         inputSchema: Record<string, unknown>;
         readOnly?: boolean | undefined;
     }[] | undefined;
+    skills?: string[] | undefined;
 }>, {
-    skills: string[];
     tools: {
         name: string;
         description: string;
         inputSchema: Record<string, unknown>;
         readOnly: boolean;
     }[];
+    skills: string[];
 }, {
-    skills?: string[] | undefined;
     tools?: {
         name: string;
         description: string;
         inputSchema: Record<string, unknown>;
         readOnly?: boolean | undefined;
     }[] | undefined;
+    skills?: string[] | undefined;
 }>;
 /**
  * Schema v2 keeps one installable Panel App identity while allowing it to
@@ -178,37 +178,37 @@ export declare const PanelAppManifest: z.ZodEffects<z.ZodDiscriminatedUnion<"sch
         }>, "many">>;
         skills: z.ZodDefault<z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">>;
     }, "strict", z.ZodTypeAny, {
-        skills: string[];
         tools: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly: boolean;
         }[];
+        skills: string[];
     }, {
-        skills?: string[] | undefined;
         tools?: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly?: boolean | undefined;
         }[] | undefined;
+        skills?: string[] | undefined;
     }>, {
-        skills: string[];
         tools: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly: boolean;
         }[];
+        skills: string[];
     }, {
-        skills?: string[] | undefined;
         tools?: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly?: boolean | undefined;
         }[] | undefined;
+        skills?: string[] | undefined;
     }>>;
     id: z.ZodString;
     version: z.ZodString;
@@ -247,13 +247,13 @@ export declare const PanelAppManifest: z.ZodEffects<z.ZodDiscriminatedUnion<"sch
     placement: "right-dock";
     singleton: boolean;
     agent?: {
-        skills: string[];
         tools: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly: boolean;
         }[];
+        skills: string[];
     } | undefined;
     description?: string | undefined;
 }, {
@@ -267,13 +267,13 @@ export declare const PanelAppManifest: z.ZodEffects<z.ZodDiscriminatedUnion<"sch
     };
     schemaVersion: 2;
     agent?: {
-        skills?: string[] | undefined;
         tools?: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly?: boolean | undefined;
         }[] | undefined;
+        skills?: string[] | undefined;
     } | undefined;
     description?: string | undefined;
     permissions?: ("context.session" | "context.workspace" | "storage" | "external.open" | "agent.submitPrompt" | "agent.task" | "workspace.info" | "workspace.read" | "workspace.write" | "notifications.send" | "audio.transcribe" | "credentials.cookies" | "automations.manage" | "process")[] | undefined;
@@ -310,13 +310,13 @@ export declare const PanelAppManifest: z.ZodEffects<z.ZodDiscriminatedUnion<"sch
     placement: "right-dock";
     singleton: boolean;
     agent?: {
-        skills: string[];
         tools: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly: boolean;
         }[];
+        skills: string[];
     } | undefined;
     description?: string | undefined;
 }, {
@@ -345,13 +345,13 @@ export declare const PanelAppManifest: z.ZodEffects<z.ZodDiscriminatedUnion<"sch
     };
     schemaVersion: 2;
     agent?: {
-        skills?: string[] | undefined;
         tools?: {
             name: string;
             description: string;
             inputSchema: Record<string, unknown>;
             readOnly?: boolean | undefined;
         }[] | undefined;
+        skills?: string[] | undefined;
     } | undefined;
     description?: string | undefined;
     permissions?: ("context.session" | "context.workspace" | "storage" | "external.open" | "agent.submitPrompt" | "agent.task" | "workspace.info" | "workspace.read" | "workspace.write" | "notifications.send" | "audio.transcribe" | "credentials.cookies" | "automations.manage" | "process")[] | undefined;

package/dist/profile/types.d.ts

@@ -125,6 +125,11 @@ export declare const WorkspaceProfileRequirementsSchema: z.ZodObject<{
         hint?: string | undefined;
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
+    tools: {
+        bin: string;
+        minVersion?: string | undefined;
+        hint?: string | undefined;
+    }[];
     skills: {
         source: "github";
         scope: "project";
@@ -132,12 +137,12 @@ export declare const WorkspaceProfileRequirementsSchema: z.ZodObject<{
         fullDepth: boolean;
         skills?: string[] | undefined;
     }[];
-    tools: {
+}, {
+    tools?: {
         bin: string;
         minVersion?: string | undefined;
         hint?: string | undefined;
-    }[];
-}, {
+    }[] | undefined;
     skills?: {
         source: "github";
         repo: string;
@@ -145,11 +150,6 @@ export declare const WorkspaceProfileRequirementsSchema: z.ZodObject<{
         skills?: string[] | undefined;
         fullDepth?: boolean | undefined;
     }[] | undefined;
-    tools?: {
-        bin: string;
-        minVersion?: string | undefined;
-        hint?: string | undefined;
-    }[] | undefined;
 }>;
 export type SkillRequirement = z.infer<typeof skillRequirementSchema>;
 export type ToolRequirement = z.infer<typeof toolRequirementSchema>;
@@ -206,6 +206,11 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             hint?: string | undefined;
         }>, "many">>;
     }, "strip", z.ZodTypeAny, {
+        tools: {
+            bin: string;
+            minVersion?: string | undefined;
+            hint?: string | undefined;
+        }[];
         skills: {
             source: "github";
             scope: "project";
@@ -213,12 +218,12 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             fullDepth: boolean;
             skills?: string[] | undefined;
         }[];
-        tools: {
+    }, {
+        tools?: {
             bin: string;
             minVersion?: string | undefined;
             hint?: string | undefined;
-        }[];
-    }, {
+        }[] | undefined;
         skills?: {
             source: "github";
             repo: string;
@@ -226,11 +231,6 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             skills?: string[] | undefined;
             fullDepth?: boolean | undefined;
         }[] | undefined;
-        tools?: {
-            bin: string;
-            minVersion?: string | undefined;
-            hint?: string | undefined;
-        }[] | undefined;
     }>>;
     /**
      * true → 独占工作面：激活时把**未声明**的 skill/plugin/mcp/agent 显式关掉，
@@ -264,6 +264,11 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
     version?: string | undefined;
     description?: string | undefined;
     requires?: {
+        tools: {
+            bin: string;
+            minVersion?: string | undefined;
+            hint?: string | undefined;
+        }[];
         skills: {
             source: "github";
             scope: "project";
@@ -271,11 +276,6 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             fullDepth: boolean;
             skills?: string[] | undefined;
         }[];
-        tools: {
-            bin: string;
-            minVersion?: string | undefined;
-            hint?: string | undefined;
-        }[];
     } | undefined;
     mainInstruction?: string | undefined;
 }, {
@@ -289,6 +289,11 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
     plugins?: string[] | undefined;
     agents?: string[] | undefined;
     requires?: {
+        tools?: {
+            bin: string;
+            minVersion?: string | undefined;
+            hint?: string | undefined;
+        }[] | undefined;
         skills?: {
             source: "github";
             repo: string;
@@ -296,11 +301,6 @@ export declare const WorkspaceProfileSchema: z.ZodObject<{
             skills?: string[] | undefined;
             fullDepth?: boolean | undefined;
         }[] | undefined;
-        tools?: {
-            bin: string;
-            minVersion?: string | undefined;
-            hint?: string | undefined;
-        }[] | undefined;
     } | undefined;
     exclusiveCapabilities?: boolean | undefined;
     mainInstruction?: string | undefined;

package/dist/session/session-manager.js

@@ -237,13 +237,42 @@ function normalizedSessionKind(kind) {
 export function codeShellHome() {
     return process.env.CODE_SHELL_HOME || join(homedir(), ".code-shell");
 }
+/** True when this process is a test runner. `bun test` sets NODE_ENV itself. */
+function isTestRunner() {
+    return process.env.NODE_ENV === "test" || process.env.BUN_TEST === "1";
+}
+/** The real per-user home, ignoring any CODE_SHELL_HOME override. */
+function defaultHome() {
+    return join(homedir(), ".code-shell");
+}
 /**
  * Canonical root for every persisted CodeShell session. An explicit `home`
  * (a `~/.code-shell`-equivalent data root) overrides the default resolution;
  * absent → `codeShellHome()` exactly as before.
  */
 export function sessionsRoot(home) {
-    return join(home ?? codeShellHome(), "sessions");
+    const resolvedHome = home ?? codeShellHome();
+    // Fail closed rather than write fixture sessions into the developer's real
+    // store. The bunfig preload only applies when Bun resolves a bunfig.toml:
+    // `bun test <file>` from a subdirectory, or an IDE/CI runner with its own
+    // cwd, finds none and silently fell through to ~/.code-shell — which is how
+    // ~700 `test-model` sessions ended up in the real store and the sidebar.
+    //
+    // Guarded here rather than in codeShellHome() because the home is also the
+    // legitimate root for settings/projects/trust that many tests read by
+    // design; only the SESSIONS root is the one tests corrupt.
+    if (isTestRunner() && resolvedHome === defaultHome()) {
+        // Prefer the preload's sandbox. Many test files delete CODE_SHELL_HOME in
+        // cleanup, and bun shares one process across files, so isolation would
+        // otherwise vanish for every later suite.
+        const sandbox = process.env.CODE_SHELL_TEST_HOME;
+        if (sandbox)
+            return join(sandbox, "sessions");
+        throw new SessionError("Refusing to use the real ~/.code-shell/sessions from a test. Set CODE_SHELL_HOME " +
+            "to a temp dir (packages/core/test-setup.ts does this via the bunfig preload) " +
+            "or pass an explicit storageDir.");
+    }
+    return join(resolvedHome, "sessions");
 }
 function isSessionWorkspace(value) {
     if (!value || typeof value !== "object")

package/dist/tool-system/context.d.ts

@@ -215,13 +215,18 @@ export interface ExternalFileChangesRecord {
     changedFiles: string[];
     originClientMessageId?: string;
 }
-export type ToolRunYieldReason = "background_notification";
-/** Run-scoped handoff from a trusted tool to the owning turn loop. */
+export type ToolRunYieldReason = "background_notification" | "reply_committed";
+/**
+ * Run-scoped handoff from a trusted tool to the owning turn loop. Distinct
+ * reasons accumulate independently: one batch may both commit a host reply
+ * and launch background work, and the loop decides boundary precedence.
+ */
 export interface ToolRunYieldController {
     request(reason: ToolRunYieldReason): void;
     /** Inspect without clearing so the loop can prioritize an accepted steer. */
-    peek?(): ToolRunYieldReason | undefined;
-    consume(): ToolRunYieldReason | undefined;
+    peek(reason: ToolRunYieldReason): boolean;
+    /** Clear one pending reason; true if it was pending. */
+    consume(reason: ToolRunYieldReason): boolean;
 }
 export interface ToolContext {
     /** Active working directory for this Engine. */

package/dist/tool-system/external-tool-exposure.js

@@ -62,8 +62,9 @@ export const FIRST_PHASE_EXPOSURE_RATIONALE = [
     },
     // ── Delegation and state-machine exceptions ──────────────────────
     // Agent and the two plan-state tools remain structurally excluded. DriveAgent
-    // is the reviewed exception because the external host forces it into a
-    // foreground, one-level handoff with an observable result.
+    // is the reviewed exception because the child does not inherit the host
+    // bridge and background work is allowed only when the host guarantees an
+    // observable completion handoff.
     {
         tool: "Agent",
         kind: "self-contained",
@@ -78,19 +79,19 @@ export const FIRST_PHASE_EXPOSURE_RATIONALE = [
         kind: "self-contained",
         status: "exposed",
         reason: "Delegates one bounded task to an installed Codex/Claude CLI. External " +
-            "sessions force foreground execution and disable automatic background " +
-            "handoff, so the parent turn receives the result instead of losing a wake-up " +
-            "inside the native Engine queue. The child CLI does not inherit this host " +
-            "bridge, which bounds nesting at one level; the outer call still requires " +
-            "the normal DriveAgent approval.",
+            "sessions may detach it only when the Desktop host promises to drain the " +
+            "completion queue and inject a continuation into the same Session; other " +
+            "hosts fail closed and require foreground execution. The child CLI does not " +
+            "inherit this host bridge, which bounds nesting at one level; the outer call " +
+            "still requires the normal DriveAgent approval.",
     },
     {
         tool: "DriveAgentJobs",
         kind: "self-contained",
         status: "exposed",
-        reason: "Lets the runtime inspect or cancel retained DriveAgent jobs. New external " +
-            "delegations run in the foreground, but retained jobs from the same Session " +
-            "still need an observable cleanup surface.",
+        reason: "Lets the runtime inspect or cancel retained DriveAgent jobs, including " +
+            "Desktop-backed background delegations whose completion is delivered through " +
+            "the owning Session.",
     },
     {
         tool: "EnterPlanMode",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-core",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Core engine for code-shell — agent orchestration, tool execution, hooks, protocol. UI-agnostic.",
   "type": "module",
   "main": "./dist/index.js",
@@ -38,6 +38,7 @@
   ],
   "scripts": {
     "build": "bun run clean && tsc -p tsconfig.json && bun run copy-assets",
+    "test": "bun test --timeout 30000 src",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "copy-assets": "node ../../scripts/copy-assets.mjs dist/prompt/sections src/prompt/sections/*.md && node ../../scripts/copy-assets.mjs dist/data src/data/*.json",
     "dev": "bun run copy-assets && tsc -p tsconfig.json --watch --preserveWatchOutput",