shennian 0.2.38 → 0.2.43

package/dist/src/agents/codex.d.ts

@@ -28,6 +28,9 @@ export declare class CodexAdapter extends AgentAdapter {
     private spawnAppServer;
     private ensureAppServer;
     private initializeAppServer;
+    private startTurnWithRecovery;
+    private startTurn;
+    private interruptActiveTurn;
     private sendRpc;
     private handleAppServerMessage;
     private handleAppServerNonJsonStdout;
@@ -50,3 +53,4 @@ export declare class CodexAdapter extends AgentAdapter {
     private clearForceCloseTimer;
 }
 export declare function normalizeCodexModelId(modelId?: string | null): string | undefined;
+export declare function isMissingCodexRolloutError(error: unknown): boolean;

package/dist/src/agents/codex.js

@@ -34,6 +34,7 @@ export class CodexAdapter extends AgentAdapter {
     }
     async send(text, modelId) {
         if (this.activeTurnId) {
+            await this.interruptActiveTurn().catch(() => { });
             await this.killProcess();
         }
         const codexModelId = normalizeCodexModelId(modelId);
@@ -52,13 +53,7 @@ export class CodexAdapter extends AgentAdapter {
             }).catch(() => { });
             this.namedThread = true;
         }
-        const response = await this.sendRpc('turn/start', {
-            threadId,
-            input: [{ type: 'text', text, text_elements: [] }],
-            approvalPolicy: 'never',
-            sandboxPolicy: { type: 'dangerFullAccess' },
-            ...(codexModelId ? { model: codexModelId } : {}),
-        });
+        const response = await this.startTurnWithRecovery(threadId, text, codexModelId);
         this.activeTurnId = response.turn?.id ?? null;
     }
     async resume(agentSessionId) {
@@ -68,6 +63,7 @@ export class CodexAdapter extends AgentAdapter {
         this.resetTextState();
     }
     async stop() {
+        await this.interruptActiveTurn().catch(() => { });
         await this.killProcess();
     }
     spawnCodex(args) {
@@ -218,6 +214,35 @@ export class CodexAdapter extends AgentAdapter {
         this.agentSessionId = threadId;
         this.namedThread = !!response.thread?.name;
     }
+    async startTurnWithRecovery(threadId, text, codexModelId) {
+        try {
+            return await this.startTurn(threadId, text, codexModelId);
+        }
+        catch (error) {
+            if (!isMissingCodexRolloutError(error))
+                throw error;
+            await this.killProcess();
+            await this.ensureAppServer(codexModelId);
+            return await this.startTurn(threadId, text, codexModelId);
+        }
+    }
+    async startTurn(threadId, text, codexModelId) {
+        return await this.sendRpc('turn/start', {
+            threadId,
+            input: [{ type: 'text', text, text_elements: [] }],
+            approvalPolicy: 'never',
+            sandboxPolicy: { type: 'dangerFullAccess' },
+            ...(codexModelId ? { model: codexModelId } : {}),
+        });
+    }
+    async interruptActiveTurn() {
+        const threadId = this.agentSessionId;
+        const turnId = this.activeTurnId;
+        if (!threadId || !turnId || !this.process)
+            return;
+        await this.sendRpc('turn/interrupt', { threadId, turnId }, 5_000);
+        this.activeTurnId = null;
+    }
     sendRpc(method, params, timeoutMs = 60_000) {
         if (this.appServerStartupError)
             return Promise.reject(this.appServerStartupError);
@@ -755,6 +780,10 @@ export function normalizeCodexModelId(modelId) {
         return undefined;
     return trimmed.toLowerCase() === 'openai' ? undefined : trimmed;
 }
+export function isMissingCodexRolloutError(error) {
+    const message = error instanceof Error ? error.message : String(error ?? '');
+    return /\bno rollout found for thread id\b/i.test(message);
+}
 function extractAppServerErrorMessage(params) {
     if (typeof params.message === 'string' && params.message.trim())
         return params.message.trim();

package/dist/src/agents/pi.d.ts

@@ -1,4 +1,10 @@
 import { AgentAdapter } from './adapter.js';
+type ShellCommandSpec = {
+    file: string;
+    args: string[];
+    shell: 'bash' | 'powershell';
+};
+export declare function buildShellCommandSpec(command: string, platform?: NodeJS.Platform): ShellCommandSpec;
 export declare class PiAdapter extends AgentAdapter {
     readonly type: "pi";
     private agent;
@@ -49,3 +55,4 @@ export declare class PiAdapter extends AgentAdapter {
     private resolvePendingSendStart;
     private rejectPendingSendStart;
 }
+export {};

package/dist/src/agents/pi.js

@@ -12,6 +12,20 @@ import { loadConfig, resolveShennianPath } from '../config/index.js';
 import { SERVERS } from '../region.js';
 const execFileAsync = promisify(execFile);
 const PI_DEFAULT_MODEL_ID = 'qwen3.6-plus';
+export function buildShellCommandSpec(command, platform = process.platform) {
+    if (platform === 'win32') {
+        return {
+            file: 'powershell.exe',
+            args: ['-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-Command', command],
+            shell: 'powershell',
+        };
+    }
+    return {
+        file: 'bash',
+        args: ['-c', command],
+        shell: 'bash',
+    };
+}
 function createPiModel(modelId = PI_DEFAULT_MODEL_ID) {
     return {
         id: modelId,
@@ -29,6 +43,7 @@ function createPiModel(modelId = PI_DEFAULT_MODEL_ID) {
 const SYSTEM_PROMPT = `你是神念内置编程助手，运行在用户本地机器上。
 你可以读写文件、执行 shell 命令、帮助用户完成编程和系统管理任务。
 工作目录已设置，操作文件时使用相对路径或绝对路径均可。
+当前 shell 会随操作系统选择：Windows 使用 PowerShell，macOS/Linux 使用 bash。Windows 下需要真实 curl 时使用 curl.exe，避免 PowerShell 的 curl 别名。
 保持回复简洁、准确，中文回复。`;
 // ── Context compression ──────────────────────────────────────────────────────
 const CONTEXT_TOKEN_THRESHOLD = 90_000;
@@ -268,13 +283,14 @@ function makeTools(workDir) {
         {
             name: 'bash',
             label: '执行命令',
-            description: 'Execute a shell command in the working directory. Timeout: 30s.',
+            description: 'Execute a shell command in the working directory. Uses PowerShell on Windows and bash on macOS/Linux. Timeout: 30s.',
             parameters: Type.Object({
                 command: Type.String({ description: 'Shell command to execute' }),
             }),
             async execute(_id, { command }, signal) {
+                const spec = buildShellCommandSpec(command);
                 try {
-                    const { stdout, stderr } = await execFileAsync('bash', ['-c', command], {
+                    const { stdout, stderr } = await execFileAsync(spec.file, spec.args, {
                         cwd: workDir,
                         timeout: 30_000,
                         signal,
@@ -283,14 +299,14 @@ function makeTools(workDir) {
                     const output = [stdout, stderr].filter(Boolean).join('\n---stderr---\n');
                     return {
                         content: [{ type: 'text', text: output || '(no output)' }],
-                        details: { command },
+                        details: { command, shell: spec.shell },
                     };
                 }
                 catch (err) {
                     const msg = err instanceof Error ? err.message : String(err);
                     return {
                         content: [{ type: 'text', text: `Error: ${msg}` }],
-                        details: { command },
+                        details: { command, shell: spec.shell },
                     };
                 }
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shennian",
-  "version": "0.2.38",
+  "version": "0.2.43",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {