@co0ontty/wand 2.4.2 → 2.4.3-beta.gdd13483

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "618521bbe5e23601be39a6599b110d008f469b01",
-  "builtAt": "2026-07-04T11:34:01.260Z",
-  "version": "2.4.2",
-  "channel": "stable"
+  "commit": "dd13483272dbdc30919ef5f8db1a4cc97a718666",
+  "builtAt": "2026-07-10T02:23:43.798Z",
+  "version": "2.4.3-beta.gdd13483",
+  "channel": "beta"
 }

package/dist/git-quick-commit.d.ts

@@ -11,7 +11,7 @@ interface QuickCommitOptions {
     autoMessage: boolean;
     customMessage?: string;
     tag?: string;
-    /** When `tag` is empty, ask Claude to generate one based on the diff + commit message. */
+    /** When `tag` is empty, ask the session provider to generate one based on the diff + commit message. */
     autoTag?: boolean;
     push?: boolean;
     /**
@@ -39,7 +39,11 @@ export declare function generateCommitMessageOnly(cwd: string, language: string,
 interface TagHeadOptions {
     cwd: string;
     language: string;
-    /** Explicit tag name. If empty and `autoTag` is true, ask Claude to generate one. */
+    provider?: SessionProvider;
+    model?: string | null;
+    thinkingEffort?: SessionSnapshot["thinkingEffort"];
+    inheritEnv?: boolean;
+    /** Explicit tag name. If empty and `autoTag` is true, ask the session provider to generate one. */
     tag?: string;
     autoTag?: boolean;
     /** Push only this tag to its upstream remote after creating it. */

package/dist/git-quick-commit.js

@@ -492,7 +492,7 @@ export async function generateCommitMessageOnly(cwd, language, ai = {}) {
     return generateCommitMessageWithTag(cwd, language, ai);
 }
 /**
- * Ask Claude for a single tag string. Called from `runQuickCommit` after the commit has
+ * Ask the session provider for a single tag string. Called from `runQuickCommit` after the commit has
  * already landed, so we look at `git show HEAD` and use `HEAD~1` for the previous tag.
  */
 async function generateTagAfterCommit(cwd, language, commitMessage, ai = {}) {
@@ -613,7 +613,12 @@ export async function runTagHead(opts) {
         catch {
             headSubject = "";
         }
-        tagName = await generateTagAfterCommit(cwd, language, headSubject || "");
+        tagName = await generateTagAfterCommit(cwd, language, headSubject || "", {
+            provider: opts.provider,
+            model: opts.model,
+            thinkingEffort: opts.thinkingEffort,
+            inheritEnv: opts.inheritEnv,
+        });
     }
     if (!tagName) {
         throw new QuickCommitError("请填写 tag 名称，或开启 AI 生成。", "EMPTY_TAG");
@@ -1096,7 +1101,7 @@ export async function runQuickCommit(opts) {
     catch {
         commitHash = "";
     }
-    // Tag: explicit `tag` wins; if empty + autoTag, ask Claude; otherwise skip.
+    // Tag: explicit `tag` wins; if empty + autoTag, ask the session provider; otherwise skip.
     let tagName = (tag || "").trim();
     if (!tagName && autoTag) {
         tagName = await generateTagAfterCommit(cwd, language, message, ai);

package/dist/path-repair.d.ts

@@ -58,8 +58,9 @@ export declare function repairRuntimePath(): PathRepairResult;
  *
  * 行为：
  *   - 跑 `${shell} -l -c '...'` 拉 $PATH 和 command -v claude/codex（4s 超时）
- *   - 把 login shell PATH 里我们还没收录的目录 **前插** 到 process.env.PATH（注意
- *     是前插，不是追加 —— 它比 unit 里的更可信）
+ *   - 按 login shell 的 PATH 顺序重排 process.env.PATH，再把仅存在于 service 的
+ *     目录追加回去。不能只前插新增目录：同一个 CLI 同时装在 nvm 和 Homebrew 时，
+ *     两个目录本来都存在，旧实现不会重排，structured 与 PTY 会命中不同版本。
  *   - 失败时静默走同步那一版结果
  *
  * 接受一个已经跑过同步阶段的 result，在上面 mutate。

package/dist/path-repair.js

@@ -153,8 +153,9 @@ export function repairRuntimePath() {
  *
  * 行为：
  *   - 跑 `${shell} -l -c '...'` 拉 $PATH 和 command -v claude/codex（4s 超时）
- *   - 把 login shell PATH 里我们还没收录的目录 **前插** 到 process.env.PATH（注意
- *     是前插，不是追加 —— 它比 unit 里的更可信）
+ *   - 按 login shell 的 PATH 顺序重排 process.env.PATH，再把仅存在于 service 的
+ *     目录追加回去。不能只前插新增目录：同一个 CLI 同时装在 nvm 和 Homebrew 时，
+ *     两个目录本来都存在，旧实现不会重排，structured 与 PTY 会命中不同版本。
  *   - 失败时静默走同步那一版结果
  *
  * 接受一个已经跑过同步阶段的 result，在上面 mutate。
@@ -184,10 +185,11 @@ export async function deepRepairRuntimePath(result, opts = {}) {
         return result;
     }
     const delim = path.delimiter;
-    const existing = new Set((process.env.PATH ?? "")
+    const currentSegments = (process.env.PATH ?? "")
         .split(delim)
         .map((seg) => seg.trim())
-        .filter((seg) => seg.length > 0));
+        .filter((seg) => seg.length > 0);
+    const existing = new Set(currentSegments);
     // login shell 报告的所有 PATH 段 + claude/codex 解析出的目录都纳入候选。
     const fromShell = [];
     for (const seg of probe.path.split(delim).map((s) => s.trim()).filter(Boolean)) {
@@ -197,9 +199,10 @@ export async function deepRepairRuntimePath(result, opts = {}) {
         fromShell.push(path.dirname(probe.claude));
     if (probe.codex)
         fromShell.push(path.dirname(probe.codex));
-    const additions = [];
+    const preferred = [];
+    const preferredSet = new Set();
     for (const dir of fromShell) {
-        if (!dir || existing.has(dir))
+        if (!dir || preferredSet.has(dir))
             continue;
         let ok = false;
         try {
@@ -210,19 +213,22 @@ export async function deepRepairRuntimePath(result, opts = {}) {
         }
         if (!ok)
             continue;
-        existing.add(dir);
-        additions.push(dir);
+        preferredSet.add(dir);
+        preferred.push(dir);
+    }
+    const additions = preferred.filter((dir) => !existing.has(dir));
+    const serviceOnly = currentSegments.filter((dir) => !preferredSet.has(dir));
+    const reordered = [...preferred, ...serviceOnly];
+    const nextPath = reordered.join(delim);
+    if (nextPath && nextPath !== (process.env.PATH ?? "")) {
+        process.env.PATH = nextPath;
     }
     if (additions.length > 0) {
-        // 前插：login shell 的 PATH 优先级比 unit 写死的高，让 claude 解析到用户期望的版本。
-        const prefix = additions.join(delim);
-        const currentPath = process.env.PATH ?? "";
-        process.env.PATH = currentPath ? `${prefix}${delim}${currentPath}` : prefix;
         result.added.push(...additions);
     }
     result.finalPath = process.env.PATH ?? "";
-    // 修复完再 probe 一次，让 resolved 字段反映最终能找到的位置（之前 sync 阶段
-    // 可能 claude 还是 missing，login shell 注入 nvm 目录后这次能命中）。
+    // 修复完再 probe 一次，让 resolved 字段反映最终能找到的位置；目录即使原本已在
+    // service PATH 中，也可能因本次重排而从旧的 nvm 副本切换到 Homebrew 副本。
     result.resolved = probeCommands();
     result.deepProbe = "success";
     return result;

package/dist/process-manager.d.ts

@@ -85,6 +85,7 @@ export declare class ProcessManager extends EventEmitter {
     hasCodexSessionFile(threadId: string): boolean;
     deleteCodexHistoryFiles(threadIds: string[]): number;
     private captureCodexSessionId;
+    private captureClaudeSessionId;
     get(id: string): SessionSnapshot | null;
     getPtyTranscript(id: string): string | null;
     /**

package/dist/process-manager.js

@@ -44,6 +44,7 @@ function readClaudeProjectSessionDetails(filePath, id) {
         const fileSessionIds = new Set();
         let hasAssistant = false;
         let hasUser = false;
+        let firstUserAtMs = null;
         for (const line of lines) {
             try {
                 const parsed = JSON.parse(line);
@@ -52,6 +53,11 @@ function readClaudeProjectSessionDetails(filePath, id) {
                 }
                 if (parsed.type === "user" || parsed.message?.role === "user") {
                     hasUser = true;
+                    if (firstUserAtMs === null && parsed.timestamp) {
+                        const parsedTime = Date.parse(parsed.timestamp);
+                        if (Number.isFinite(parsedTime))
+                            firstUserAtMs = parsedTime;
+                    }
                 }
                 if (parsed.type === "assistant" || parsed.message?.role === "assistant") {
                     hasAssistant = true;
@@ -75,7 +81,8 @@ function readClaudeProjectSessionDetails(filePath, id) {
             id,
             filePath,
             mtimeMs: stats.mtimeMs,
-            hasConversation: hasUser && hasAssistant && lines.length >= REAL_CONVERSATION_MIN_LINES
+            hasConversation: hasUser && hasAssistant && lines.length >= REAL_CONVERSATION_MIN_LINES,
+            firstUserAtMs,
         };
     }
     catch {
@@ -150,6 +157,30 @@ function selectClaudeProjectSessionForRecord(record) {
 function getLatestClaudeProjectSessionId(record) {
     return selectClaudeProjectSessionForRecord(record)?.id ?? null;
 }
+function selectClaudeProjectSessionForTimeWindow(record) {
+    const startedAtMs = parseTimeMs(record.startedAt);
+    if (startedAtMs === null)
+        return null;
+    const endedAtMs = parseTimeMs(record.endedAt) ?? Date.now();
+    const windowStart = startedAtMs - START_TIME_SKEW_MS;
+    const windowEnd = endedAtMs + START_TIME_SKEW_MS;
+    const fallbackWindowEnd = endedAtMs + DISCOVERY_RECENT_WINDOW_MS;
+    const candidates = listClaudeProjectSessionCandidates(record.cwd)
+        .map((candidate) => readClaudeProjectSessionDetails(candidate.filePath, candidate.id))
+        .filter((candidate) => Boolean(candidate?.hasConversation))
+        .filter((candidate) => {
+        if (candidate.firstUserAtMs !== null) {
+            return candidate.firstUserAtMs >= windowStart && candidate.firstUserAtMs <= windowEnd;
+        }
+        return candidate.mtimeMs >= windowStart && candidate.mtimeMs <= fallbackWindowEnd;
+    })
+        .sort((a, b) => {
+        const aTime = a.firstUserAtMs ?? a.mtimeMs;
+        const bTime = b.firstUserAtMs ?? b.mtimeMs;
+        return Math.abs(aTime - startedAtMs) - Math.abs(bTime - startedAtMs);
+    });
+    return candidates.length === 1 ? candidates[0] : null;
+}
 function listRecentClaudeProjectSessionIds(cwd, startedAt) {
     return listClaudeProjectSessionCandidates(cwd)
         .filter((candidate) => hasRecentProjectActivity(candidate, startedAt))
@@ -504,6 +535,12 @@ function recoverCodexSessionIdFromHistory(snapshot) {
     }
     return getCodexResumeCommandSessionId(snapshot.command) ?? selectCodexSessionForTimeWindow(snapshot)?.claudeSessionId ?? null;
 }
+function recoverClaudeSessionIdFromHistory(snapshot) {
+    if (snapshot.provider !== "claude" || snapshot.claudeSessionId) {
+        return null;
+    }
+    return getResumeCommandSessionId(snapshot.command) ?? selectClaudeProjectSessionForTimeWindow(snapshot)?.id ?? null;
+}
 /** Delete every rollout file belonging to the given codex thread ids. */
 function deleteCodexRolloutFiles(threadIds) {
     if (threadIds.size === 0)
@@ -643,13 +680,19 @@ export class ProcessManager extends EventEmitter {
                     ? getCodexResumeCommandSessionId(snapshot.command)
                     : null;
             const orphanEndedAt = snapshot.status === "running" ? new Date().toISOString() : null;
-            const sessionIdFromHistory = isCodexCmd
-                ? recoverCodexSessionIdFromHistory({
+            const sessionIdFromHistory = isClaudeCmd
+                ? recoverClaudeSessionIdFromHistory({
                     ...snapshot,
-                    provider: "codex",
+                    provider: "claude",
                     endedAt: snapshot.endedAt ?? orphanEndedAt,
                 })
-                : null;
+                : isCodexCmd
+                    ? recoverCodexSessionIdFromHistory({
+                        ...snapshot,
+                        provider: "codex",
+                        endedAt: snapshot.endedAt ?? orphanEndedAt,
+                    })
+                    : null;
             const restoredSessionId = resumeCommandSessionId ?? snapshot.claudeSessionId ?? sessionIdFromHistory;
             // Sessions restored from storage have ptyProcess: null — the old server's PTY
             // belongs to a dead process. Mark running sessions as exited so the UI
@@ -664,8 +707,9 @@ export class ProcessManager extends EventEmitter {
                     messages: recoveredMessages.length > 0 ? recoveredMessages : snapshot.messages,
                 };
                 this.storage.saveSession(updated);
-                if (isCodexCmd && restoredSessionId && restoredSessionId !== snapshot.claudeSessionId) {
-                    process.stderr.write(`[wand] Recovered Codex thread ID for orphan PTY ${snapshot.id}: ${restoredSessionId}\n`);
+                if (restoredSessionId && restoredSessionId !== snapshot.claudeSessionId) {
+                    const label = isCodexCmd ? "Codex thread" : "Claude session";
+                    process.stderr.write(`[wand] Recovered ${label} ID for orphan PTY ${snapshot.id}: ${restoredSessionId}\n`);
                 }
                 this.sessions.set(snapshot.id, {
                     ...updated,
@@ -712,9 +756,8 @@ export class ProcessManager extends EventEmitter {
                     : snapshot;
                 if (updated !== snapshot) {
                     this.storage.saveSessionMetadata(updated);
-                    if (isCodexCmd) {
-                        process.stderr.write(`[wand] Recovered Codex thread ID for saved PTY ${snapshot.id}: ${restoredSessionId}\n`);
-                    }
+                    const label = isCodexCmd ? "Codex thread" : "Claude session";
+                    process.stderr.write(`[wand] Recovered ${label} ID for saved PTY ${snapshot.id}: ${restoredSessionId}\n`);
                 }
                 this.sessions.set(snapshot.id, {
                     ...updated,
@@ -995,6 +1038,7 @@ export class ProcessManager extends EventEmitter {
             }
             current.pendingEscalation = null;
             current.ptyPermissionBlocked = false;
+            this.captureClaudeSessionId(current, { allowTimeWindowFallback: true });
             this.captureCodexSessionId(current, { allowTimeWindowFallback: true });
             current.status = current.stopRequested ? "stopped" : exitCode === 0 ? "exited" : "failed";
             current.exitCode = current.stopRequested ? null : exitCode;
@@ -1268,6 +1312,34 @@ export class ProcessManager extends EventEmitter {
         process.stderr.write(`[wand] Captured Codex thread ID: ${threadId}\n`);
         return true;
     }
+    captureClaudeSessionId(record, options) {
+        if (record.provider !== "claude" || record.claudeSessionId) {
+            return false;
+        }
+        record.messages = snapshotMessages(record);
+        const discoveredSessionId = record.knownClaudeProjectMtimes
+            ? getLatestClaudeProjectSessionId({
+                cwd: record.cwd,
+                startedAt: record.startedAt,
+                knownClaudeProjectMtimes: record.knownClaudeProjectMtimes,
+                messages: record.messages,
+            })
+            : null;
+        const fallbackSessionId = discoveredSessionId
+            ? null
+            : options?.allowTimeWindowFallback
+                ? selectClaudeProjectSessionForTimeWindow(record)?.id ?? null
+                : null;
+        const sessionId = discoveredSessionId ?? fallbackSessionId;
+        if (!sessionId) {
+            return false;
+        }
+        record.claudeSessionId = sessionId;
+        record.knownClaudeProjectMtimes?.set(sessionId, Date.now());
+        this.claudeHistoryCache = null;
+        process.stderr.write(`[wand] Captured Claude session ID: ${sessionId}\n`);
+        return true;
+    }
     get(id) {
         const record = this.sessions.get(id);
         if (!record) {
@@ -1458,12 +1530,14 @@ export class ProcessManager extends EventEmitter {
         record.exitCode = null;
         record.endedAt = new Date().toISOString();
         record.ptyProcess = null;
+        // Update lifecycle before dropping the bridge so Claude project-session
+        // discovery can still inspect the latest parsed turns.
+        this.captureClaudeSessionId(record, { allowTimeWindowFallback: true });
+        this.captureCodexSessionId(record, { allowTimeWindowFallback: true });
         if (record.ptyBridge) {
             record.ptyBridge.removeAllListeners();
             record.ptyBridge = null;
         }
-        // Update lifecycle
-        this.captureCodexSessionId(record, { allowTimeWindowFallback: true });
         this.persist(record);
         return this.snapshot(record);
     }

package/dist/server-session-routes.js

@@ -4,6 +4,7 @@ import { getDefaultModelForProvider, normalizeMode } from "./config.js";
 import { blockWindowMessagesForTransport, sliceTurnBlocksForTransport, truncateMessagesForTransport, windowMessagesForTransport } from "./message-truncator.js";
 import { checkSessionWorktreeMergeability, cleanupSessionWorktree, getWorktreeMergeErrorCode, mergeSessionWorktree, WorktreeMergeError } from "./git-worktree.js";
 import { resolveSessionCwd } from "./session-cwd.js";
+import { resolveSessionAiContext } from "./session-ai-context.js";
 import { getGitStatus, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
 import { getErrorMessage } from "./error-utils.js";
 export { getErrorMessage };
@@ -537,13 +538,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
+            const ai = resolveSessionAiContext(snapshot, config);
             const result = await runQuickCommitWithFallback({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",
-                provider: snapshot.provider,
-                model: snapshot.selectedModel ?? snapshot.structuredState?.model ?? getDefaultModelForProvider(config, snapshot.provider),
-                thinkingEffort: snapshot.thinkingEffort ?? config.defaultThinkingEffort,
-                inheritEnv: config.inheritEnv,
+                ...ai,
                 autoMessage: body.autoMessage !== false,
                 customMessage: typeof body.customMessage === "string" ? body.customMessage : undefined,
                 tag: typeof body.tag === "string" ? body.tag : undefined,
@@ -573,11 +572,9 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             return;
         }
         try {
+            const ai = resolveSessionAiContext(snapshot, config);
             const result = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "", {
-                provider: snapshot.provider,
-                model: snapshot.selectedModel ?? snapshot.structuredState?.model ?? getDefaultModelForProvider(config, snapshot.provider),
-                thinkingEffort: snapshot.thinkingEffort ?? config.defaultThinkingEffort,
-                inheritEnv: config.inheritEnv,
+                ...ai,
             });
             res.json(result);
         }
@@ -601,9 +598,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const body = (req.body ?? {});
         try {
+            const ai = resolveSessionAiContext(snapshot, config);
             const result = await runTagHead({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",
+                ...ai,
                 tag: typeof body.tag === "string" ? body.tag : undefined,
                 autoTag: !!body.autoTag,
                 push: !!body.push,

package/dist/server.js

@@ -142,14 +142,58 @@ async function fetchGitHubLatestApk(forceRefresh = false) {
 function parseApkChannel(value) {
     return value === "beta" ? "beta" : "stable";
 }
+function asRecord(value) {
+    return value && typeof value === "object" ? value : null;
+}
+async function refreshDistributionConfig(configPath, config) {
+    let raw;
+    try {
+        raw = JSON.parse(await readFile(configPath, "utf8"));
+    }
+    catch {
+        return;
+    }
+    const android = asRecord(raw.android);
+    if (android) {
+        config.android = { ...(config.android ?? {}) };
+        if (typeof android.enabled === "boolean")
+            config.android.enabled = android.enabled;
+        if (Object.prototype.hasOwnProperty.call(android, "apkDir")) {
+            config.android.apkDir = typeof android.apkDir === "string" && android.apkDir.trim()
+                ? android.apkDir.trim()
+                : "android";
+        }
+        if (Object.prototype.hasOwnProperty.call(android, "currentApkFile")) {
+            config.android.currentApkFile = typeof android.currentApkFile === "string"
+                ? android.currentApkFile.trim()
+                : "";
+        }
+    }
+    const macos = asRecord(raw.macos);
+    if (macos) {
+        config.macos = { ...(config.macos ?? {}) };
+        if (typeof macos.enabled === "boolean")
+            config.macos.enabled = macos.enabled;
+        if (Object.prototype.hasOwnProperty.call(macos, "dmgDir")) {
+            config.macos.dmgDir = typeof macos.dmgDir === "string" && macos.dmgDir.trim()
+                ? macos.dmgDir.trim()
+                : "macos";
+        }
+        if (Object.prototype.hasOwnProperty.call(macos, "currentDmgFile")) {
+            config.macos.currentDmgFile = typeof macos.currentDmgFile === "string"
+                ? macos.currentDmgFile.trim()
+                : "";
+        }
+    }
+}
 /** 版本号带 prerelease 后缀（如 -debug.06121811）即视为 beta 构建。 */
 function isPrereleaseApkVersion(version) {
     return !!version && version.includes("-");
 }
-async function resolveLatestApkVersion(configDir, config, channel) {
+async function resolveLatestApkVersion(configDir, config, channel, configPath) {
     // local 与 github 两个来源都看，按安装序取真正更新的那个（持平偏向 local：同源下载更快）。
     // 旧逻辑是「local 存在就一票否决」——本地目录留着旧包时，会把线上新版压住不提示。
-    const localApk = await resolveAndroidApkAsset(configDir, config, channel);
+    const localApk = await resolveAndroidApkAsset(configDir, config, channel, configPath);
     const local = localApk && localApk.version
         ? {
             version: localApk.version,
@@ -212,8 +256,8 @@ async function fetchGitHubLatestDmg(forceRefresh = false) {
         return cachedGitHubDmg ?? null;
     }
 }
-async function resolveLatestDmgVersion(configDir, config) {
-    const localDmg = await resolveMacosDmgAsset(configDir, config);
+async function resolveLatestDmgVersion(configDir, config, configPath) {
+    const localDmg = await resolveMacosDmgAsset(configDir, config, configPath);
     if (localDmg && localDmg.version) {
         return {
             version: localDmg.version,
@@ -585,13 +629,18 @@ function resolveAndroidApkDir(configDir, config) {
 function extractAndroidApkVersion(fileName) {
     return extractSemver(fileName.replace(/\.apk$/i, ""));
 }
-async function resolveAndroidApkAsset(configDir, config, channel = "beta") {
+async function resolveAndroidApkAsset(configDir, config, channel = "beta", configPath) {
+    if (configPath)
+        await refreshDistributionConfig(configPath, config);
     if (config.android?.enabled !== true)
         return null;
     const apkDir = resolveAndroidApkDir(configDir, config);
     await mkdir(apkDir, { recursive: true });
     const configuredFile = config.android?.currentApkFile?.trim();
-    if (configuredFile) {
+    // Beta is the local development channel: every check should pick the newest
+    // APK in apkDir, so dropping a new debug build into the directory is enough.
+    // currentApkFile remains a stable/manual pin and backward-compatible fallback.
+    if (configuredFile && channel !== "beta") {
         const filePath = path.join(apkDir, path.basename(configuredFile));
         try {
             const fileStat = await stat(filePath);
@@ -676,7 +725,9 @@ function resolveMacosDmgDir(configDir, config) {
 function extractMacosDmgVersion(fileName) {
     return extractSemver(fileName.replace(/\.dmg$/i, ""));
 }
-async function resolveMacosDmgAsset(configDir, config) {
+async function resolveMacosDmgAsset(configDir, config, configPath) {
+    if (configPath)
+        await refreshDistributionConfig(configPath, config);
     if (config.macos?.enabled !== true)
         return null;
     const dmgDir = resolveMacosDmgDir(configDir, config);
@@ -1214,7 +1265,7 @@ export async function startServer(config, configPath) {
         }
         // 更新通道：beta 包含 -debug.* 构建，stable（默认，含不传参的老客户端）只推正式版。
         const channel = parseApkChannel(req.query.channel);
-        const latest = await resolveLatestApkVersion(configDir, config, channel);
+        const latest = await resolveLatestApkVersion(configDir, config, channel, configPath);
         if (!latest) {
             res.json({ updateAvailable: false, currentVersion, latestVersion: null, downloadUrl: null, source: null, channel });
             return;
@@ -1235,15 +1286,11 @@ export async function startServer(config, configPath) {
         });
     });
     app.get("/android/download", async (req, res) => {
-        if (config.android?.enabled !== true) {
-            res.status(404).json({ error: "Android APK 下载未启用。" });
-            return;
-        }
         // 更新弹窗的下载链接由 /api/android-apk-update 按通道生成（始终带 ?channel=）。
         // 裸 /android/download（网页下载页、二维码落地页）不带参时默认 beta ——
         // 保持「下载页拿到的就是目录里真正最新的包」的旧行为。
         const channel = req.query.channel === "stable" ? "stable" : "beta";
-        const androidApk = await resolveAndroidApkAsset(configDir, config, channel);
+        const androidApk = await resolveAndroidApkAsset(configDir, config, channel, configPath);
         if (!androidApk) {
             res.status(404).json({ error: "当前没有可下载的 APK 文件。" });
             return;
@@ -1263,7 +1310,7 @@ export async function startServer(config, configPath) {
             res.status(400).json({ error: "Missing currentVersion query parameter." });
             return;
         }
-        const latest = await resolveLatestDmgVersion(configDir, config);
+        const latest = await resolveLatestDmgVersion(configDir, config, configPath);
         if (!latest) {
             res.json({ updateAvailable: false, currentVersion, latestVersion: null, downloadUrl: null, source: null });
             return;
@@ -1280,11 +1327,7 @@ export async function startServer(config, configPath) {
         });
     });
     app.get("/macos/download", async (req, res) => {
-        if (config.macos?.enabled !== true) {
-            res.status(404).json({ error: "macOS DMG 下载未启用。" });
-            return;
-        }
-        const macosDmg = await resolveMacosDmgAsset(configDir, config);
+        const macosDmg = await resolveMacosDmgAsset(configDir, config, configPath);
         if (!macosDmg) {
             res.status(404).json({ error: "当前没有可下载的 DMG 文件。" });
             return;
@@ -1453,7 +1496,7 @@ export async function startServer(config, configPath) {
         };
         const { password: _pw, ...safeConfig } = config;
         const defaultModels = getProviderDefaultModels(config);
-        const localApk = await resolveAndroidApkAsset(configDir, config);
+        const localApk = await resolveAndroidApkAsset(configDir, config, "beta", configPath);
         const ghApk = await fetchGitHubLatestApk();
         const apkDir = resolveAndroidApkDir(configDir, config);
         // Backward-compatible: pick best available for hasApk/version/downloadUrl
@@ -1462,7 +1505,7 @@ export async function startServer(config, configPath) {
             : ghApk
                 ? { hasApk: true, fileName: ghApk.fileName, version: ghApk.version, size: ghApk.size, updatedAt: null, downloadUrl: ghApk.downloadUrl, source: "github" }
                 : null;
-        const localDmg = await resolveMacosDmgAsset(configDir, config);
+        const localDmg = await resolveMacosDmgAsset(configDir, config, configPath);
         const ghDmg = await fetchGitHubLatestDmg();
         const dmgDir = resolveMacosDmgDir(configDir, config);
         const resolvedDmg = localDmg
@@ -1525,7 +1568,7 @@ export async function startServer(config, configPath) {
         });
     });
     app.get("/api/android-apk", async (_req, res) => {
-        const localApk = await resolveAndroidApkAsset(configDir, config);
+        const localApk = await resolveAndroidApkAsset(configDir, config, "beta", configPath);
         const ghApk = await fetchGitHubLatestApk();
         const apkDir = resolveAndroidApkDir(configDir, config);
         const resolvedApk = localApk
@@ -1548,7 +1591,7 @@ export async function startServer(config, configPath) {
         });
     });
     app.get("/api/macos-dmg", async (_req, res) => {
-        const localDmg = await resolveMacosDmgAsset(configDir, config);
+        const localDmg = await resolveMacosDmgAsset(configDir, config, configPath);
         const ghDmg = await fetchGitHubLatestDmg();
         const dmgDir = resolveMacosDmgDir(configDir, config);
         const resolvedDmg = localDmg

package/dist/session-ai-context.d.ts

@@ -0,0 +1,15 @@
+import type { SessionProvider, SessionSnapshot, WandConfig } from "./types.js";
+export interface SessionAiContext {
+    provider: SessionProvider;
+    model?: string;
+    thinkingEffort: SessionSnapshot["thinkingEffort"];
+    inheritEnv?: boolean;
+}
+/**
+ * Resolve the provider from every representation used by current and legacy
+ * sessions. Older persisted sessions may not have the top-level provider, but
+ * still identify Codex through structuredState, runner, or command.
+ */
+export declare function resolveSessionProvider(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command">): SessionProvider;
+/** Build the provider-specific settings used by session-adjacent AI actions. */
+export declare function resolveSessionAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultThinkingEffort" | "inheritEnv">): SessionAiContext;

package/dist/session-ai-context.js

@@ -0,0 +1,36 @@
+import { getDefaultModelForProvider } from "./config.js";
+/**
+ * Resolve the provider from every representation used by current and legacy
+ * sessions. Older persisted sessions may not have the top-level provider, but
+ * still identify Codex through structuredState, runner, or command.
+ */
+export function resolveSessionProvider(snapshot) {
+    if (snapshot.provider === "claude" || snapshot.provider === "codex") {
+        return snapshot.provider;
+    }
+    if (snapshot.structuredState?.provider === "claude" || snapshot.structuredState?.provider === "codex") {
+        return snapshot.structuredState.provider;
+    }
+    const runner = snapshot.runner ?? snapshot.structuredState?.runner;
+    if (runner === "codex-cli-exec")
+        return "codex";
+    if (runner === "claude-cli" || runner === "claude-cli-print" || runner === "claude-sdk")
+        return "claude";
+    return /^codex\b/i.test(snapshot.command.trim()) ? "codex" : "claude";
+}
+function normalizeModel(value) {
+    const model = value?.trim();
+    return model && model !== "default" ? model : undefined;
+}
+/** Build the provider-specific settings used by session-adjacent AI actions. */
+export function resolveSessionAiContext(snapshot, config) {
+    const provider = resolveSessionProvider(snapshot);
+    const sessionModel = normalizeModel(snapshot.selectedModel) ?? normalizeModel(snapshot.structuredState?.model);
+    const defaultModel = normalizeModel(getDefaultModelForProvider(config, provider));
+    return {
+        provider,
+        model: sessionModel ?? defaultModel,
+        thinkingEffort: snapshot.thinkingEffort ?? config.defaultThinkingEffort,
+        inheritEnv: config.inheritEnv,
+    };
+}

package/dist/storage.js

@@ -24,7 +24,12 @@ function inferSessionProvider(row) {
     if (row.runner === "claude-cli" || row.runner === "claude-cli-print") {
         return "claude";
     }
-    return /^claude\b/.test(row.command.trim()) ? "claude" : undefined;
+    if (row.runner === "codex-cli-exec") {
+        return "codex";
+    }
+    if (/^codex\b/i.test(row.command.trim()))
+        return "codex";
+    return /^claude\b/i.test(row.command.trim()) ? "claude" : undefined;
 }
 function parseWorktreeInfo(raw) {
     const parsed = safeJsonParse(raw);