@co0ontty/wand 2.4.3 → 2.4.4

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "d0058288d0bce20e25fd06fd06f62de794d06790",
-  "builtAt": "2026-07-07T00:10:50.544Z",
-  "version": "2.4.3",
+  "commit": "c470535a559107d4b5f27a9cc7c7a4e7b057352e",
+  "builtAt": "2026-07-10T13:26:51.037Z",
+  "version": "2.4.4",
   "channel": "stable"
 }

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/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/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);