@jingyi0605/codingns4dsh 0.2.0-rc3 → 0.2.1-beta.2

package/data/build/dist/host/cli-adapters/codex-driver.d.ts

@@ -1,5 +1,5 @@
 import { spawn, spawnSync } from 'node:child_process';
-import type { CodingNsAgentEvent, CodingNsAgentQuestionResponse, CodingNsCliModelCatalog, CodingNsAgentPermissionResponse, CodingNsCliTurnInput } from '../../shared/contracts/cli-adapter.js';
+import type { CodingNsAgentEvent, CodingNsAgentQuestionResponse, CodingNsCliModelCatalog, CodingNsAgentPermissionResponse, CodingNsCliTurnInput, CodingNsCliSkillDescriptor, CodingNsCliSkillListInput } from '../../shared/contracts/cli-adapter.js';
 import type { CodingNsCliDriver, CodingNsCliSessionProbeInput, CodingNsCliSessionProbeResult } from './driver.js';
 export interface CodexAppServerDriverOptions {
     readonly binaries?: readonly string[];
@@ -13,17 +13,33 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
         readonly id: "codex";
         readonly name: "Codex";
         readonly protocol: "json-rpc";
-        readonly capabilities: readonly ["models", "stream", "resume", "interrupt", "tool-events", "reasoning", "usage", "permission", "questions", "steer"];
+        readonly capabilities: readonly ["models", "skills", "stream", "resume", "interrupt", "tool-events", "reasoning", "usage", "permission", "questions", "steer"];
     };
     readonly supportsSegmentedTurns = true;
     private readonly binaries;
     private readonly runSpawnSync;
     private readonly runSpawn;
     private readonly sessionRoots;
+    /** Codex 配置根目录；`config.toml` 与 `auth.json` 都位于这里。 */
+    private readonly codexHome;
     private cachedBinary;
     private readonly processes;
     private readonly sessions;
     constructor(options?: CodexAppServerDriverOptions);
+    /**
+     * Codex 目录语义指纹。
+     *
+     * 目录里的 `officialSubscription` 与 `defaultServiceTier` 完全由 `config.toml`
+     * 的 `model_provider` / `openai_base_url` / `service_tier` 和 `auth.json` 的登录
+     * 模式决定。用户在 cc-switch 之类的工具里切供应商时，只改写这两个文件，
+     * `codex` 可执行文件不变，安装探测指纹也就不会变——若不单独比对它们，
+     * 10 分钟 TTL 的目录缓存会把「第三方」判定一直沿用下去，官方订阅的 Fast
+     * 档位开关就会长期不出现。
+     *
+     * 只对解析出的**非敏感字段**做哈希：`auth.json` 里的 token 永远不进入指纹，
+     * 因此这里返回的内容不能反推凭据。
+     */
+    catalogFingerprint(): string | undefined;
     detect(): Promise<{
         installed: boolean;
         version: string | null;
@@ -31,6 +47,13 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
     }>;
     listModels(): Promise<CodingNsCliModelCatalog>;
     probeSession(input: CodingNsCliSessionProbeInput): Promise<CodingNsCliSessionProbeResult>;
+    /**
+     * 读取 Codex 当前工作目录的 Skill 目录。
+     *
+     * Skill 路径和内容只在本驱动缓存，Client 只能拿到可展示的摘要；这样既能
+     * 给 DSH `/skills` 提供目录，也不会把任意本地绝对路径变成浏览器输入。
+     */
+    listSkills(input: CodingNsCliSkillListInput): Promise<readonly CodingNsCliSkillDescriptor[]>;
     executeTurn(input: CodingNsCliTurnInput): AsyncIterable<CodingNsAgentEvent>;
     /**
      * 将一个 Codex turn 按 assistant item 切成多个 DSH step。
@@ -68,6 +91,9 @@ export declare class CodexAppServerDriver implements CodingNsCliDriver {
     private ensureContextCapacity;
     /** turn/start 遇到上下文超限时压缩一次并重试，兼容关闭自动压缩的 Codex 配置。 */
     private startTurn;
+    /** 只为显式 `/skill-name` 或 `$skill-name` 预取目录；没有显式调用时保留 Codex 自己的隐式匹配。 */
+    private prepareSkillInputs;
+    private refreshSkillCatalog;
     /** thread/compact/start 立即返回，真正完成由 contextCompaction turn 的终态通知表示。 */
     private compactThread;
     private waitForCompaction;

package/data/build/dist/host/cli-adapters/codex-driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-driver.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/codex-driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAIrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,uBAAuB,EAA0B,+BAA+B,EAA0B,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAC9O,OAAO,KAAK,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AASjH,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,SAAS,CAAA;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;CAC9B;AAmFD,iEAAiE;AACjE,qBAAa,oBAAqB,YAAW,iBAAiB;IAC5D,QAAQ,CAAC,UAAU;;;;;MAA6M;IAGhO,QAAQ,CAAC,sBAAsB,QAAO;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,OAAO,GAAE,2BAAgC;IAQ/C,MAAM,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAMzF,UAAU,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAoC9C,YAAY,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAWxF,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAiIlF;;;;;OAKG;YACY,oBAAoB;YAiDrB,kBAAkB;YA2EjB,cAAc;IAsD7B,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;OAQG;YACW,gBAAgB;IAmB9B;;;;;;;;;;OAUG;YACW,sBAAsB;IAoBpC,2CAA2C;YAC7B,qBAAqB;IAQnC,qDAAqD;YACvC,SAAS;IAUvB,sEAAsE;YACxD,aAAa;YAgBb,iBAAiB;IAyF/B,iCAAiC;IAC3B,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7D,yCAAyC;IACnC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD;;;OAGG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAM7C,iCAAiC;IACjC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,+BAA+B,GAAG,IAAI;IAuBrF,kCAAkC;IAClC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,6BAA6B,GAAG,IAAI;IAQjF,OAAO,IAAI,IAAI;YAcD,UAAU;CA6DzB"}
+{"version":3,"file":"codex-driver.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/codex-driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAKrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,uBAAuB,EAA0B,+BAA+B,EAA0B,oBAAoB,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAA;AACrS,OAAO,KAAK,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AASjH,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,SAAS,CAAA;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;CAC9B;AA2FD,iEAAiE;AACjE,qBAAa,oBAAqB,YAAW,iBAAiB;IAC5D,QAAQ,CAAC,UAAU;;;;;MAAuN;IAG1O,QAAQ,CAAC,sBAAsB,QAAO;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,OAAO,GAAE,2BAAgC;IASrD;;;;;;;;;;;;OAYG;IACH,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAWlC,MAAM,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAMzF,UAAU,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAoC9C,YAAY,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAW/F;;;;;OAKG;IACG,UAAU,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,SAAS,0BAA0B,EAAE,CAAC;IAe3F,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAiIlF;;;;;OAKG;YACY,oBAAoB;YAiDrB,kBAAkB;YA2EjB,cAAc;IAsD7B,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;OAQG;YACW,gBAAgB;IAmB9B;;;;;;;;;;OAUG;YACW,sBAAsB;IAoBpC,2CAA2C;YAC7B,qBAAqB;IAQnC,qDAAqD;YACvC,SAAS;IAWvB,uEAAuE;YACzD,kBAAkB;YAiBlB,mBAAmB;IAiBjC,sEAAsE;YACxD,aAAa;YAgBb,iBAAiB;IAyF/B,iCAAiC;IAC3B,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7D,yCAAyC;IACnC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD;;;OAGG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAM7C,iCAAiC;IACjC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,+BAA+B,GAAG,IAAI;IAuBrF,kCAAkC;IAClC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,6BAA6B,GAAG,IAAI;IAQjF,OAAO,IAAI,IAAI;YAcD,UAAU;CAqEzB"}

package/data/build/dist/host/cli-adapters/codex-driver.js

@@ -1,5 +1,6 @@
 import { spawn, spawnSync } from 'node:child_process';
-import { randomUUID } from 'node:crypto';
+import { createHash, randomUUID } from 'node:crypto';
+import { readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { basename, join, resolve } from 'node:path';
 import { JsonRpcProcess, JsonRpcRequestError } from './json-rpc-process.js';
@@ -18,7 +19,7 @@ const CODEX_COMPACTION_TIMEOUT_MS = 60_000;
 const CODEX_APP_SERVER_ARGS = ['app-server', '--disable', 'computer_use'];
 /** Codex app-server 的 JSON-RPC 驱动，Host 只暴露统一文本流，不暴露线程和 token。 */
 export class CodexAppServerDriver {
-    descriptor = { id: 'codex', name: 'Codex', protocol: 'json-rpc', capabilities: ['models', 'stream', 'resume', 'interrupt', 'tool-events', 'reasoning', 'usage', 'permission', 'questions', 'steer'] };
+    descriptor = { id: 'codex', name: 'Codex', protocol: 'json-rpc', capabilities: ['models', 'skills', 'stream', 'resume', 'interrupt', 'tool-events', 'reasoning', 'usage', 'permission', 'questions', 'steer'] };
     // Codex 一个 Provider turn 可能同时包含多个工具调用。只有 assistant item
     // 切换后才分段，不能在每个工具完成后注入下一 step。
     supportsSegmentedTurns = true;
@@ -26,6 +27,8 @@ export class CodexAppServerDriver {
     runSpawnSync;
     runSpawn;
     sessionRoots;
+    /** Codex 配置根目录；`config.toml` 与 `auth.json` 都位于这里。 */
+    codexHome;
     cachedBinary = null;
     processes = new Set();
     sessions = new Map();
@@ -34,8 +37,33 @@ export class CodexAppServerDriver {
         this.runSpawnSync = options.spawnSync ?? spawnSync;
         this.runSpawn = options.spawn ?? spawn;
         const codexHome = process.env.CODEX_HOME ?? join(homedir(), '.codex');
+        this.codexHome = codexHome;
         this.sessionRoots = options.sessionRoots ?? [join(codexHome, 'sessions'), join(codexHome, 'archived_sessions')];
     }
+    /**
+     * Codex 目录语义指纹。
+     *
+     * 目录里的 `officialSubscription` 与 `defaultServiceTier` 完全由 `config.toml`
+     * 的 `model_provider` / `openai_base_url` / `service_tier` 和 `auth.json` 的登录
+     * 模式决定。用户在 cc-switch 之类的工具里切供应商时，只改写这两个文件，
+     * `codex` 可执行文件不变，安装探测指纹也就不会变——若不单独比对它们，
+     * 10 分钟 TTL 的目录缓存会把「第三方」判定一直沿用下去，官方订阅的 Fast
+     * 档位开关就会长期不出现。
+     *
+     * 只对解析出的**非敏感字段**做哈希：`auth.json` 里的 token 永远不进入指纹，
+     * 因此这里返回的内容不能反推凭据。
+     */
+    catalogFingerprint() {
+        const config = readTextFile(join(this.codexHome, 'config.toml'));
+        const auth = readTextFile(join(this.codexHome, 'auth.json'));
+        // 两个文件都读不到时返回 undefined，表示无法判断；Registry 不会据此失效缓存，
+        // 避免在非标准部署下把目录变成每次都重新探测。
+        if (config === undefined && auth === undefined)
+            return undefined;
+        const configSummary = config === undefined ? 'missing' : summarizeCodexConfig(config);
+        const authSummary = auth === undefined ? 'missing' : summarizeCodexAuth(auth);
+        return createHash('sha256').update(`${configSummary}\u0000${authSummary}`).digest('hex').slice(0, 16);
+    }
     async detect() {
         const result = await detectBinary({ binaries: this.binaries, spawnSync: this.runSpawnSync });
         if (result.installed)
@@ -92,6 +120,27 @@ export class CodexAppServerDriver {
             },
         });
     }
+    /**
+     * 读取 Codex 当前工作目录的 Skill 目录。
+     *
+     * Skill 路径和内容只在本驱动缓存，Client 只能拿到可展示的摘要；这样既能
+     * 给 DSH `/skills` 提供目录，也不会把任意本地绝对路径变成浏览器输入。
+     */
+    async listSkills(input) {
+        const command = this.cachedBinary ?? (await this.detect()).command;
+        if (command === null)
+            return [];
+        const sessionInput = {
+            sessionId: input.sessionId,
+            messages: [],
+            prompt: '',
+            ...(input.cwd === undefined ? {} : { cwd: input.cwd }),
+            ...(input.signal === undefined ? {} : { signal: input.signal }),
+        };
+        const session = await this.getSession(sessionInput, command);
+        await this.refreshSkillCatalog(session, input.cwd, input.forceReload === true, input.signal);
+        return [...session.skills.values()].map(({ path: _path, ...descriptor }) => descriptor);
+    }
     async *executeTurn(input) {
         const command = this.cachedBinary ?? (await this.detect()).command;
         if (command === null)
@@ -516,16 +565,50 @@ export class CodexAppServerDriver {
     }
     /** turn/start 遇到上下文超限时压缩一次并重试，兼容关闭自动压缩的 Codex 配置。 */
     async startTurn(session, input) {
+        await this.prepareSkillInputs(session, input);
         try {
-            return await session.rpc.request('turn/start', codexTurnStartParams(input, session.threadId), { signal: input.signal, killOnAbort: false });
+            return await session.rpc.request('turn/start', codexTurnStartParams(input, session.threadId, session.skills), { signal: input.signal, killOnAbort: false });
         }
         catch (error) {
             if (!isContextWindowError(error))
                 throw error;
             await this.compactThread(session, input);
-            return session.rpc.request('turn/start', codexTurnStartParams(input, session.threadId), { signal: input.signal, killOnAbort: false });
+            return session.rpc.request('turn/start', codexTurnStartParams(input, session.threadId, session.skills), { signal: input.signal, killOnAbort: false });
         }
     }
+    /** 只为显式 `/skill-name` 或 `$skill-name` 预取目录；没有显式调用时保留 Codex 自己的隐式匹配。 */
+    async prepareSkillInputs(session, input) {
+        const names = codexSkillNames(input.prompt);
+        if (names.length === 0)
+            return;
+        const cwd = input.cwd ?? process.cwd();
+        if (session.skillsCwd !== cwd)
+            session.skills.clear();
+        if (session.skillsCwd !== cwd || session.skills.size === 0) {
+            try {
+                await this.refreshSkillCatalog(session, cwd, false, input.signal);
+            }
+            catch (error) {
+                // 旧版 app-server 可能还没有 skills/list；保留原始 Skill 文本，让 Codex
+                // 继续走它自己的解析路径，而不是把一次能力探测失败变成整轮失败。
+                if (!isMethodNotFound(error))
+                    throw error;
+                return;
+            }
+        }
+    }
+    async refreshSkillCatalog(session, cwd, forceReload, signal) {
+        const resolvedCwd = cwd ?? process.cwd();
+        const response = await session.rpc.request('skills/list', {
+            cwds: [resolvedCwd],
+            ...(forceReload ? { forceReload: true } : {}),
+        }, { signal, killOnAbort: false });
+        const entries = parseCodexSkills(response, resolvedCwd);
+        session.skills.clear();
+        for (const entry of entries)
+            session.skills.set(entry.name, entry);
+        session.skillsCwd = resolvedCwd;
+    }
     /** thread/compact/start 立即返回，真正完成由 contextCompaction turn 的终态通知表示。 */
     async compactThread(session, input) {
         if (session.compacting !== undefined)
@@ -754,9 +837,18 @@ export class CodexAppServerDriver {
             suppressedCompactionTurnIds: new Set(),
             pendingCompactionEvents: [],
             autoCompaction: undefined,
+            skillsCwd: undefined,
+            skills: new Map(),
         };
         this.processes.add(rpc);
         this.sessions.set(input.sessionId, session);
+        // Codex 目录发生变化时丢弃 Host 侧路径缓存；下一次显式调用会重新读取目录。
+        rpc.addNotificationListener((message) => {
+            if (message.method !== 'skills/changed')
+                return;
+            session.skills.clear();
+            session.skillsCwd = undefined;
+        });
         await rpc.request('initialize', { clientInfo: { name: 'codingns4dsh', version: '0.1.1' }, capabilities: { experimentalApi: true } }, { signal: input.signal, killOnAbort: false });
         rpc.notify('initialized', {});
         rpc.setServerRequestHandler((request) => {
@@ -944,6 +1036,76 @@ async function readCodexOfficialSubscription(rpc, signal) {
         return undefined;
     }
 }
+/** 同步读取文本文件；不存在或不可读时返回 undefined，调用方按“无法判断”处理。 */
+function readTextFile(path) {
+    try {
+        return readFileSync(path, 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * 从 `config.toml` 摘出影响目录语义的字段。
+ *
+ * 这里刻意不做完整 TOML 解析：只需覆盖两种常见写法——顶层 `key = "value"`，
+ * 以及 `[model_providers.xxx]` 段内的 `base_url`。手写正则比引入解析依赖更稳，
+ * 也不会因为 Codex 新增字段而改变指纹。凭据不在 config.toml 中，无需脱敏。
+ */
+function summarizeCodexConfig(config) {
+    const fields = [];
+    let section = '';
+    for (const rawLine of config.split(/\r?\n/u)) {
+        const line = rawLine.trim();
+        if (line === '' || line.startsWith('#'))
+            continue;
+        const sectionMatch = line.match(/^\[(?<name>[^\]]+)\]$/u);
+        if (sectionMatch !== null) {
+            section = sectionMatch.groups?.name?.trim() ?? '';
+            continue;
+        }
+        const assignment = line.match(/^(?<key>[A-Za-z0-9_.-]+)\s*=\s*(?<value>.*)$/u);
+        if (assignment === null)
+            continue;
+        const key = assignment.groups?.key ?? '';
+        const value = (assignment.groups?.value ?? '').trim();
+        // 顶层：决定 Provider 与档位；Provider 段内：只有 base_url 影响上游身份。
+        const topLevelKeys = ['model_provider', 'model', 'service_tier', 'openai_base_url', 'profile'];
+        const isTopLevel = section === '' && topLevelKeys.includes(key);
+        const isProviderBaseUrl = section.startsWith('model_providers.') && key === 'base_url';
+        if (!isTopLevel && !isProviderBaseUrl)
+            continue;
+        fields.push(`${section}.${key}=${value}`);
+    }
+    return fields.join('\n');
+}
+/**
+ * 从 `auth.json` 摘出登录模式，**不读取任何凭据**。
+ *
+ * 官方订阅与 API key 两种登录方式的 `auth_mode` 不同；`OPENAI_API_KEY` 只取
+ * 「有没有设置」这一位布尔信息，token 与 key 原文永远不进入指纹。
+ */
+function summarizeCodexAuth(auth) {
+    let parsed;
+    try {
+        parsed = JSON.parse(auth);
+    }
+    catch {
+        // auth.json 不是合法 JSON（例如切换过程中被截断）：用长度当指纹，
+        // 下一次读取到完整文件时指纹自然变化并触发失效。
+        return `invalid:${auth.length}`;
+    }
+    if (!isRecord(parsed))
+        return 'invalid:not-object';
+    const mode = typeof parsed.auth_mode === 'string' ? parsed.auth_mode : 'unknown';
+    const hasApiKey = typeof parsed.OPENAI_API_KEY === 'string' && parsed.OPENAI_API_KEY.trim() !== '';
+    // 只比较 token 的“有无”与 account_id 是否变化，不比较 token 内容：
+    // 官方订阅每次刷新都会轮换 access_token，把 token 纳入指纹会让目录每次刷新都失效。
+    const tokens = isRecord(parsed.tokens) ? parsed.tokens : undefined;
+    const hasTokens = tokens !== undefined && typeof tokens.refresh_token === 'string';
+    const accountId = tokens !== undefined && typeof tokens.account_id === 'string' ? tokens.account_id : '';
+    return `${mode}|apiKey=${hasApiKey}|tokens=${hasTokens}|account=${accountId}`;
+}
 function codexMessageToChunk(message) {
     const params = isRecord(message.params) ? message.params : message;
     const item = isRecord(params.item) ? params.item : params;
@@ -1464,7 +1626,7 @@ function codexServiceTier(value) {
     const tier = value?.trim();
     return tier === undefined || tier === '' ? undefined : tier;
 }
-function codexTurnStartParams(input, threadId) {
+function codexTurnStartParams(input, threadId, skills) {
     const cwd = resolve(input.cwd ?? process.cwd());
     const inputBlocks = [];
     const attachments = input.attachments ?? [];
@@ -1474,6 +1636,12 @@ function codexTurnStartParams(input, threadId) {
         if (attachment.kind === 'image')
             inputBlocks.push({ type: 'localImage', path: attachment.path });
     }
+    for (const name of codexSkillNames(input.prompt)) {
+        const skill = skills.get(name);
+        if (skill?.enabled !== true || skill.path === undefined)
+            continue;
+        inputBlocks.push({ type: 'skill', name: skill.name, path: skill.path });
+    }
     return {
         threadId,
         input: inputBlocks,
@@ -1483,6 +1651,67 @@ function codexTurnStartParams(input, threadId) {
         ...(input.effortId ? { effort: input.effortId } : {}),
     };
 }
+/** 从用户文本提取显式 Skill mention，兼容 DSH 原生 `/name` 与旧版 `$name` 写法。 */
+function codexSkillNames(prompt) {
+    const names = [];
+    const seen = new Set();
+    for (const match of prompt.matchAll(/(?:^|\s)(?:\$|\/)([A-Za-z0-9][A-Za-z0-9._-]*)(?=\s|$)/gu)) {
+        const name = match[1]?.trim();
+        if (name === undefined || name === '' || seen.has(name))
+            continue;
+        seen.add(name);
+        names.push(name);
+    }
+    return names;
+}
+/** 兼容不同 Codex app-server 版本的 `skills/list` 响应包装。 */
+function parseCodexSkills(value, cwd) {
+    const root = isRecord(value) && Array.isArray(value.data) ? value.data : [];
+    const normalizedCwd = resolve(cwd);
+    const scoped = root
+        .filter(isRecord)
+        .find((item) => typeof item.cwd === 'string' && resolve(item.cwd) === normalizedCwd);
+    // 当前请求只传了一个 cwd。部分 Codex 版本会返回规范化前后的路径，
+    // 甚至省略 cwd；此时唯一作用域就是本次请求的结果，不能把它误判成空目录。
+    const singleScope = root.length === 1 && isRecord(root[0]) && Array.isArray(root[0].skills);
+    const rawSkills = Array.isArray(scoped?.skills)
+        ? scoped.skills
+        : singleScope
+            ? root[0].skills
+            : root.every((item) => isRecord(item) && typeof item.name === 'string')
+                ? root
+                : [];
+    const result = [];
+    for (const raw of rawSkills) {
+        if (!isRecord(raw))
+            continue;
+        const name = typeof raw.name === 'string' ? raw.name.trim() : '';
+        if (name === '')
+            continue;
+        const interfaceInfo = isRecord(raw.interface) ? raw.interface : null;
+        const description = firstNonEmptyString(raw.description, interfaceInfo?.shortDescription, interfaceInfo?.displayName, name) ?? name;
+        const displayName = firstNonEmptyString(interfaceInfo?.displayName);
+        const path = firstNonEmptyString(raw.path, raw.skillPath);
+        if (result.some((item) => item.name === name))
+            continue;
+        result.push({
+            id: name,
+            name,
+            description,
+            enabled: raw.enabled !== false,
+            ...(displayName === undefined ? {} : { displayName }),
+            ...(path === undefined ? {} : { path }),
+        });
+    }
+    return result;
+}
+function firstNonEmptyString(...values) {
+    for (const value of values) {
+        if (typeof value === 'string' && value.trim() !== '')
+            return value.trim();
+    }
+    return undefined;
+}
 /**
  * 由 DSH 会话权限状态派生 Codex 原生沙箱模式。
  *