@cjhyy/code-shell-capability-coding 0.9.6 → 0.9.7

package/dist/external-runtimes/codex/app-server-client.d.ts

@@ -61,6 +61,6 @@ export declare class CodexAppServerClient {
     private write;
     private failAll;
     get isClosed(): boolean;
-    /** Graceful stop: stdin EOF (the Rust app-server exits on it), SIGTERM after. */
+    /** Stop via stdin EOF, then SIGTERM and SIGKILL if the server does not exit. */
     close(): Promise<void>;
 }

package/dist/external-runtimes/codex/app-server-client.js

@@ -219,12 +219,14 @@ export class CodexAppServerClient {
     get isClosed() {
         return this.closed;
     }
-    /** Graceful stop: stdin EOF (the Rust app-server exits on it), SIGTERM after. */
+    /** Stop via stdin EOF, then SIGTERM and SIGKILL if the server does not exit. */
     async close() {
         const child = this.child;
         this.failAll("app-server client closed");
         this.lines?.close();
-        if (!child)
+        // Failed spawns have no pid and never emit `exit`. A process already killed
+        // by a signal likewise has no numeric exitCode and will not emit it again.
+        if (!child || !child.pid || child.exitCode !== null || child.signalCode !== null)
             return;
         try {
             child.stdin.end();
@@ -237,8 +239,20 @@ export class CodexAppServerClient {
                 return resolve();
             child.once("exit", () => resolve());
         });
-        const timer = setTimeout(() => child.kill("SIGTERM"), 2_000);
-        await exited;
-        clearTimeout(timer);
+        let killTimer;
+        const terminateTimer = setTimeout(() => {
+            child.kill("SIGTERM");
+            // Cleanup must finish even when an unresponsive server ignores SIGTERM.
+            // Keep awaiting its actual exit so callers never leave an orphan behind.
+            killTimer = setTimeout(() => child.kill("SIGKILL"), 500);
+        }, 2_000);
+        try {
+            await exited;
+        }
+        finally {
+            clearTimeout(terminateTimer);
+            if (killTimer)
+                clearTimeout(killTimer);
+        }
     }
 }

package/dist/external-runtimes/codex/model-discovery.d.ts

@@ -0,0 +1,14 @@
+import { type AppServerClientOptions } from "./app-server-client.js";
+export interface CodexDiscoveredModel {
+    model: string;
+    displayName: string;
+    isDefault: boolean;
+}
+/**
+ * Read the installed Codex CLI's available models without starting a thread or
+ * turn. The deadline covers initialization and every page together. Callers own
+ * caching and fallback policy; a valid empty catalog is distinct from failure.
+ */
+export declare function discoverCodexModels(options?: AppServerClientOptions & {
+    timeoutMs?: number;
+}): Promise<CodexDiscoveredModel[]>;

package/dist/external-runtimes/codex/model-discovery.js

@@ -0,0 +1,76 @@
+import { CodexAppServerClient } from "./app-server-client.js";
+import { buildRuntimeSpawnEnv } from "../shared/spawn-env.js";
+const DEFAULT_TIMEOUT_MS = 8_000;
+const MAX_PAGES = 100;
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function nonemptyString(value) {
+    return typeof value === "string" && value.trim().length > 0;
+}
+/**
+ * Read the installed Codex CLI's available models without starting a thread or
+ * turn. The deadline covers initialization and every page together. Callers own
+ * caching and fallback policy; a valid empty catalog is distinct from failure.
+ */
+export async function discoverCodexModels(options = {}) {
+    const { timeoutMs = DEFAULT_TIMEOUT_MS, ...clientOptions } = options;
+    if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+        throw new Error("Codex model discovery requires a positive timeout");
+    }
+    const deadline = performance.now() + timeoutMs;
+    const remainingMs = () => {
+        const remaining = deadline - performance.now();
+        if (remaining <= 0)
+            throw new Error("Codex model discovery timed out");
+        return Math.ceil(remaining);
+    };
+    const client = new CodexAppServerClient({
+        ...clientOptions,
+        env: buildRuntimeSpawnEnv({ base: options.env }),
+    });
+    client.onNotification(() => { });
+    client.onServerRequest(() => undefined);
+    try {
+        client.start();
+        await client.request("initialize", { clientInfo: { name: "codeshell", title: "CodeShell", version: "1" } }, remainingMs());
+        client.notify("initialized");
+        const models = new Map();
+        const cursors = new Set();
+        let cursor;
+        for (let page = 0; page < MAX_PAGES; page++) {
+            const result = await client.request("model/list", { includeHidden: false, limit: 100, ...(cursor ? { cursor } : {}) }, remainingMs());
+            if (!isRecord(result) || !Array.isArray(result.data)) {
+                throw new Error("Invalid Codex model/list response");
+            }
+            for (const entry of result.data) {
+                if (!isRecord(entry) ||
+                    !nonemptyString(entry.model) ||
+                    !nonemptyString(entry.displayName) ||
+                    (entry.isDefault !== undefined && typeof entry.isDefault !== "boolean") ||
+                    (entry.hidden !== undefined && typeof entry.hidden !== "boolean")) {
+                    throw new Error("Invalid Codex model/list entry");
+                }
+                if (entry.hidden === true || models.has(entry.model))
+                    continue;
+                models.set(entry.model, {
+                    model: entry.model,
+                    displayName: entry.displayName,
+                    isDefault: entry.isDefault === true,
+                });
+            }
+            if (result.nextCursor === null || result.nextCursor === undefined) {
+                return [...models.values()];
+            }
+            if (!nonemptyString(result.nextCursor) || cursors.has(result.nextCursor)) {
+                throw new Error("Invalid Codex model/list pagination cursor");
+            }
+            cursor = result.nextCursor;
+            cursors.add(cursor);
+        }
+        throw new Error("Codex model/list exceeded the pagination limit");
+    }
+    finally {
+        await client.close();
+    }
+}

package/dist/external-runtimes/index.d.ts

@@ -25,6 +25,8 @@ export type { ExternalRuntimeAttachment, ExternalRuntimeTurnInput } from "./turn
 export { CodexEventTranslator } from "./codex/event-translator.js";
 export { CodexAppServerClient } from "./codex/app-server-client.js";
 export type { AppServerClientOptions } from "./codex/app-server-client.js";
+export { discoverCodexModels } from "./codex/model-discovery.js";
+export type { CodexDiscoveredModel } from "./codex/model-discovery.js";
 export { CodexRuntime } from "./codex/runtime.js";
 export type { CodexRuntimeOptions, CodexRuntimeHooks, CodexTurnHandle, NativeApprovalDecision, } from "./codex/runtime.js";
 export { buildClaudeMcpConfig, claudeAllowedToolNames, claudeBridgeArgs, CLAUDE_MCP_SERVER_NAME, } from "./claude-code/mcp-config.js";

package/dist/external-runtimes/index.js

@@ -20,6 +20,7 @@ export { buildRuntimeSpawnEnv } from "./shared/spawn-env.js";
 export { textWithAttachmentReferences } from "./turn-input.js";
 export { CodexEventTranslator } from "./codex/event-translator.js";
 export { CodexAppServerClient } from "./codex/app-server-client.js";
+export { discoverCodexModels } from "./codex/model-discovery.js";
 export { CodexRuntime } from "./codex/runtime.js";
 export { buildClaudeMcpConfig, claudeAllowedToolNames, claudeBridgeArgs, CLAUDE_MCP_SERVER_NAME, } from "./claude-code/mcp-config.js";
 export { writeClaudeMcpConfigFile } from "./claude-code/mcp-config.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-capability-coding",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "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.9.6"
+    "@cjhyy/code-shell-core": "0.9.7"
   },
   "engines": {
     "node": ">=20.10"