@cjhyy/code-shell-capability-coding 0.8.13 → 0.8.20

package/dist/cc-orchestrator/external-agent-driver.d.ts

@@ -10,6 +10,9 @@ export interface AgentRunResult {
 export declare function runWithLines(adapter: AgentAdapter, lines: string[], exitCode: number | null): AgentRunResult;
 export interface DriverRunOpts extends Omit<BuildArgsOpts, "permissionMode"> {
     permissionMode?: PermissionMode;
+    /** Called once as soon as the external CLI reports its durable session/thread
+     *  id. This normally happens near process startup, well before the turn exits. */
+    onSessionId?: (sessionId: string) => void;
 }
 export declare function detectCodexImageInput(command: string, cwd: string, signal?: AbortSignal): Promise<boolean>;
 /** Spawn ONE headless agent run, collect stream-json to exit, return result.

package/dist/cc-orchestrator/external-agent-driver.js

@@ -233,6 +233,20 @@ export function runAgentOnce(adapter, opts, signal) {
                 detached: false,
                 stdio: [viaStdin ? "pipe" : "ignore", "pipe", "pipe"],
             });
+            let reportedSessionId = "";
+            const reportSessionId = (candidate) => {
+                if (reportedSessionId || typeof candidate !== "string" || !candidate.trim())
+                    return;
+                reportedSessionId = candidate.trim();
+                try {
+                    opts.onSessionId?.(reportedSessionId);
+                }
+                catch {
+                    // Session observation is best-effort metadata. A UI/persistence
+                    // listener must never be able to fail the external agent run.
+                }
+            };
+            reportSessionId(opts.resumeSessionId);
             let settled = false;
             let abortRequested = false;
             let termination;
@@ -254,7 +268,18 @@ export function runAgentOnce(adapter, opts, signal) {
             const lines = [];
             if (child.stdout) {
                 const rl = createInterface({ input: child.stdout });
-                rl.on("line", (line) => lines.push(line));
+                rl.on("line", (line) => {
+                    lines.push(line);
+                    if (!reportedSessionId) {
+                        try {
+                            reportSessionId(adapter.parseResult([line]).sessionId);
+                        }
+                        catch {
+                            // Keep collecting output. The complete parse at exit remains the
+                            // source of truth and will surface malformed output normally.
+                        }
+                    }
+                });
             }
             child.on("error", (err) => {
                 if (settled)
@@ -276,7 +301,9 @@ export function runAgentOnce(adapter, opts, signal) {
                 settled = true;
                 cleanup();
                 void (termination ?? Promise.resolve()).then(() => {
-                    resolve(runWithLines(adapter, lines, code));
+                    const result = runWithLines(adapter, lines, code);
+                    reportSessionId(result.sessionId);
+                    resolve(result);
                 });
             });
         })().catch(reject);

package/dist/external-runtimes/turn-input.d.ts

@@ -9,5 +9,7 @@ export interface ExternalRuntimeTurnInput {
     text: string;
     clientMessageId?: string;
     attachments?: readonly ExternalRuntimeAttachment[];
+    /** Host-injected continuation (for example, a background-job completion). */
+    injected?: boolean;
 }
 export declare function textWithAttachmentReferences(input: ExternalRuntimeTurnInput): string;

package/dist/tools/drive-agent.d.ts

@@ -18,6 +18,7 @@ type Runner = (opts: {
     permissionMode?: PermMode;
     signal?: AbortSignal;
     imagePaths?: string[];
+    onSessionId?: (sessionId: string) => void;
 }) => Promise<AgentRunResult>;
 type SessionStore = {
     get(cli: DriveCli, sessionId: string): ExternalAgentSessionBinding | undefined;
@@ -46,6 +47,7 @@ type LegacyRunner = (opts: {
     cwd: string;
     permissionMode?: PermMode;
     signal?: AbortSignal;
+    onSessionId?: (sessionId: string) => void;
 }) => Promise<AgentRunResult>;
 export declare function makeDriveClaudeCodeTool(runner?: LegacyRunner, options?: DriveAgentToolOptions): (args: Record<string, unknown>, ctx?: ToolContext) => Promise<string>;
 export declare const driveClaudeCodeTool: (args: Record<string, unknown>, ctx?: ToolContext) => Promise<string>;

package/dist/tools/drive-agent.js

@@ -124,6 +124,7 @@ const defaultRunner = (opts) => {
         cwd: opts.cwd,
         permissionMode: opts.permissionMode ?? "default",
         imagePaths: opts.imagePaths,
+        onSessionId: opts.onSessionId,
     }, opts.signal);
 };
 function newDriveJobId() {
@@ -167,8 +168,7 @@ function hasRunningDriveWriter(workspaceCwd, workspaceRoot) {
         return true;
     }
     for (const lease of foregroundDriveLeases.values()) {
-        if (lease.effectiveWorkspaceRoot === workspaceRoot ||
-            lease.workspaceRoot === workspaceRoot) {
+        if (lease.effectiveWorkspaceRoot === workspaceRoot || lease.workspaceRoot === workspaceRoot) {
             return true;
         }
     }
@@ -325,7 +325,8 @@ function formatDriveJobListLine(job) {
         `${job.jobId}`,
         `status=${job.status}`,
         `cli=${cli}`,
-        `session=${job.sessionId}`,
+        `ownerSession=${job.sessionId}`,
+        `externalSessionId=${job.ccSessionId ?? "pending"}`,
         `launchCwd=${launchCwd}`,
         ...(job.worktreePath ? [`worktree=${job.worktreePath}`] : []),
         ...(job.worktreeBranch ? [`branch=${job.worktreeBranch}`] : []),
@@ -648,7 +649,11 @@ function trackBackgroundRun(params) {
         return { error: "Error: DriveAgent owner session closed before the job could start." };
     }
     try {
-        run = params.start();
+        run = params.start((externalSessionId) => {
+            if (!isValidSessionId(externalSessionId))
+                return;
+            backgroundJobRegistry.recordArtifacts(jobId, { ccSessionId: externalSessionId });
+        });
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -713,10 +718,19 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {
                 ? "default"
                 : "bypassPermissions";
         const isWritableRun = permissionMode !== "default";
-        // External runtimes do not participate in the native Engine's wake-up loop.
-        // A detached result would be queued for an Engine that is not driving this
-        // turn, so keep delegation attached to the parent runtime.
-        const background = isExternalRuntimeContext(ctx) ? false : args.background !== false;
+        const externalRuntime = isExternalRuntimeContext(ctx);
+        const background = args.background !== false;
+        // A detached external-runtime job is safe only when its host explicitly
+        // promises to drain notificationQueue and inject the result into a later
+        // runtime turn. Silently changing background:true into a foreground wait is
+        // incorrect: Codex's yieldable exec wrapper can return control to the model
+        // while the nested MCP call remains pending, producing concurrent work that
+        // looks as though it came from the delegated agent.
+        if (externalRuntime && background && ctx?.externalRuntimeBackgroundDelivery !== true) {
+            return (`Error: background ${cli === "codex" ? "Codex" : "Claude Code"} delegation is not ` +
+                "supported by this external-runtime host because it cannot deliver the completion. " +
+                "Retry with background:false.");
+        }
         const cliName = cli === "codex" ? "Codex" : "Claude Code";
         if (background && !isValidSessionId(ctx?.sessionId)) {
             return `Error: cannot start a background ${cliName} job without a session — its result notification would be dropped. Retry with background:false, or ensure the tool runs inside a session.`;
@@ -867,7 +881,7 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {
             permissionMode,
             imagePaths,
         };
-        const foregroundHandoffMs = isExternalRuntimeContext(ctx)
+        const foregroundHandoffMs = externalRuntime
             ? Number.POSITIVE_INFINITY
             : (options.foregroundHandoffMs ?? DRIVE_AGENT_FOREGROUND_HANDOFF_MS);
         if (background) {
@@ -888,7 +902,11 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {
                 isolation,
                 worktree: managedWorktree,
                 promptSummary,
-                start: () => startRun(runner, { ...runOptsBase, signal: abortController.signal }),
+                start: (onSessionId) => startRun(runner, {
+                    ...runOptsBase,
+                    signal: abortController.signal,
+                    onSessionId,
+                }),
                 abort: () => abortController.abort(),
                 sessionStore,
                 writable: isWritableRun,
@@ -904,6 +922,11 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {
             return [
                 resumeNote,
                 `已在后台启动 ${cliName}（jobId ${tracked.jobId}）。完成后会通知你结果，无需轮询。`,
+                ...(externalRuntime
+                    ? [
+                        "除非用户明确要求并行工作，否则不要在本地重复执行已委派的任务；请结束当前回复，等待完成通知触发续接。",
+                    ]
+                    : []),
                 worktreeStartNote(managedWorktree),
             ]
                 .filter(Boolean)
@@ -921,7 +944,16 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {
             return appendLifecycleNote(lease.error, lifecycle);
         }
         const foregroundAbort = makeAbortController(callerSignal, true);
-        const run = startRun(runner, { ...runOptsBase, signal: foregroundAbort.signal });
+        let liveExternalSessionId;
+        let backgroundSessionIdSink;
+        const run = startRun(runner, {
+            ...runOptsBase,
+            signal: foregroundAbort.signal,
+            onSessionId: (sessionId) => {
+                liveExternalSessionId = sessionId;
+                backgroundSessionIdSink?.(sessionId);
+            },
+        });
         let result;
         try {
             result = await waitForForegroundOrHandoff(run, foregroundHandoffMs);
@@ -947,7 +979,12 @@ export function makeDriveAgentTool(runner = defaultRunner, fixedCli, options = {
                 isolation,
                 worktree: managedWorktree,
                 promptSummary,
-                start: () => run,
+                start: (onSessionId) => {
+                    backgroundSessionIdSink = onSessionId;
+                    if (liveExternalSessionId)
+                        onSessionId(liveExternalSessionId);
+                    return run;
+                },
                 abort: () => foregroundAbort.abort(),
                 sessionStore,
                 writable: isWritableRun,
@@ -1100,7 +1137,8 @@ function inspectDriveAgentJob(jobId) {
         `jobId: ${job.jobId}`,
         `status: ${job.status}`,
         `cli: ${job.cli ?? "unknown"}`,
-        `session: ${job.sessionId}`,
+        `ownerSession: ${job.sessionId}`,
+        `externalSessionId: ${job.ccSessionId ?? "pending"}`,
         `launchCwd: ${job.launchCwd ?? job.cwd ?? "(unknown cwd)"}`,
         `startedAt: ${new Date(job.startedAt).toISOString()}`,
         `duration: ${jobDurationSeconds(job)}`,
@@ -1121,8 +1159,6 @@ function inspectDriveAgentJob(jobId) {
         lines.push(`worktreeLifecycle: ${job.worktreeLifecycle}`);
     if (job.finishedAt !== undefined)
         lines.push(`finishedAt: ${new Date(job.finishedAt).toISOString()}`);
-    if (job.ccSessionId)
-        lines.push(`ccSessionId: ${job.ccSessionId}`);
     if (job.changedFiles && job.changedFiles.length > 0) {
         lines.push("changedFiles:", ...job.changedFiles.map((file) => `- ${file}`));
     }
@@ -1275,7 +1311,7 @@ export const driveClaudeCodeToolDef = {
 };
 export function makeDriveClaudeCodeTool(runner, options) {
     const generic = runner
-        ? ({ prompt, resumeSessionId, model, cwd, permissionMode, signal }) => runner({ prompt, resumeSessionId, model, cwd, permissionMode, signal })
+        ? ({ prompt, resumeSessionId, model, cwd, permissionMode, signal, onSessionId }) => runner({ prompt, resumeSessionId, model, cwd, permissionMode, signal, onSessionId })
         : undefined;
     return makeDriveAgentTool(generic ?? defaultRunner, "claude", options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-capability-coding",
-  "version": "0.8.13",
+  "version": "0.8.20",
   "description": "Coding capability pack for the generic code-shell agent core.",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-core": "0.8.13"
+    "@cjhyy/code-shell-core": "0.8.20"
   },
   "engines": {
     "node": ">=20.10"