@co0ontty/wand 4.96.1-beta.202610161706 → 4.97.0

package/README.md

@@ -187,6 +187,8 @@ New system employees default to OpenCode's **Free group**, a saved Wand-managed
 
 Set `WAND_DISABLE_OPENCODE_FALLBACK=1` on the server to disable automatic preparation and the free-group execution service. Free upstream models can be rate-limited, retired, or have different data-retention/training policies; system text sent to this fallback is processed by that provider. See [OpenCode model policies](https://opencode.ai/docs/zen).
 
+Employee onboarding is available in the Web console: **Settings menu → 员工与通讯录 → 管理员工与团队模板 → 员工 → 招聘员工**. Use manual configuration or review HR's draft before confirming onboarding. See the [employee onboarding guide](docs/employee-onboarding.md); `employee:list` only lists definitions, it does not create employees.
+
 ## 中文
 
 ### 概览
@@ -232,6 +234,10 @@ npm install -g opencode-ai@latest
 
 服务环境设置 `WAND_DISABLE_OPENCODE_FALLBACK=1` 可关闭自动准备和免费分组执行服务。免费上游可能限流、退役，数据保留/训练政策也各不相同；使用兜底时系统文本会发往对应提供商，详见 [OpenCode 模型政策](https://opencode.ai/docs/zen)。
 
+### 创建硅基员工
+
+正式入口：**左侧设置菜单 → 员工与通讯录 → 管理员工与团队模板 → 员工 → 招聘员工**。可手动填写资料，或请 HR 嘟嘟拟定后核对并确认入职；起草不会自动创建员工。详见[招聘与入职指南](docs/employee-onboarding.md)。CLI `employee:list` 仅查询定义，创建请使用控制台，无需绕过界面调用内部接口。
+
 ### 功能
 
 #### 核心

package/dist/ai-text-runner.d.ts

@@ -1,9 +1,9 @@
 import { type EmployeeTextDeps } from "./employee-text.js";
-import { type AiCallTraceFactory, type SystemAiPurpose } from "./system-ai-call.js";
+import { type AiCallTrace, type AiCallTraceFactory, type SystemAiPurpose } from "./system-ai-call.js";
 import type { OpenCodeTextRuntime, OpenCodeFreePool } from "./opencode-system-fallback.js";
 import type { AiTextRequest, SessionProvider, SessionSnapshot } from "./types.js";
 export { QuickCommitError } from "./command-error.js";
-/** Neutral one-shot text execution. Tool-running Git fallback never uses the retry chain. */
+/** Neutral one-shot text execution. Tool-running Git fallback uses the same employee chain. */
 export declare function defaultProvider(provider: SessionProvider | undefined): SessionProvider;
 export interface QuickCommitAiOptions {
     modelGroups?: import("./model-groups.js").ModelGroup[];
@@ -53,6 +53,13 @@ export declare function runCliText(command: string, args: string[], prompt: stri
 export declare function callCliAiText(request: AiTextRequest, cwd: string, language: string, opts: CliAiTextOptions): Promise<string>;
 /** 角色设定走系统提示前缀；任务自己的输出格式与约束必须排在后面。 */
 export declare function withOpsPersona(request: AiTextRequest, persona?: string): AiTextRequest;
+export interface ExpandedAiCandidates {
+    chain: import("./types.js").AiCliCandidate[];
+    freeLeaves: Set<import("./types.js").AiCliCandidate>;
+    deadline: number;
+}
+/** Expand the system employee's chain once: groups, free leaves, and duplicates. */
+export declare function expandEmployeeCandidates(opts: QuickCommitAiOptions, trace?: AiCallTrace): Promise<ExpandedAiCandidates>;
 /**
  * Run a lightweight AI request through the system employee's configured chain.
  * provider 与引擎由候选决定；SDK 与 CLI 均保留各自适配和身份。

package/dist/ai-text-runner.js

@@ -16,7 +16,7 @@ import { composeSystemFallback, systemPromptFlag, thinkingEffortToClaudeCliEffor
 export { QuickCommitError } from "./command-error.js";
 const CLAUDE_MESSAGE_TIMEOUT_MS = 60_000;
 const CODEX_MESSAGE_TIMEOUT_MS = 60_000;
-/** Neutral one-shot text execution. Tool-running Git fallback never uses the retry chain. */
+/** Neutral one-shot text execution. Tool-running Git fallback uses the same employee chain. */
 export function defaultProvider(provider) {
     return isSessionProvider(provider) ? provider : "claude";
 }
@@ -531,12 +531,8 @@ function singleCandidate(opts) {
         thinkingEffort: opts.thinkingEffort ?? undefined,
     };
 }
-/**
- * 按顺序尝试候选：跳过没安装的 CLI，协议与输出校验均成功才返回。
- * 只有一条候选时保持原行为（错误原样抛出，不摘要）。
- * 仅用于一次性文本生成；执行工具的任务不能使用这条无条件重试路径。
- */
-async function callTextCandidates(request, cwd, language, opts, parseOutput, trace) {
+/** Expand the system employee's chain once: groups, free leaves, and duplicates. */
+export async function expandEmployeeCandidates(opts, trace) {
     opts.signal?.throwIfAborted();
     const { resolveModelGroupModels } = await import("./model-groups.js");
     const modelGroups = opts.modelGroups ?? opts.employeeText?.config.modelGroups;
@@ -570,8 +566,7 @@ async function callTextCandidates(request, cwd, language, opts, parseOutput, tra
         }
         expanded.push(...resolveModelGroupModels(modelGroups, candidate.provider, candidate.model, { preferDefault: !candidate.model || candidate.model === "default" }).map(model => ({ ...candidate, model: model || undefined })));
     }
-    const chain = expanded
-        .filter(candidate => {
+    const chain = expanded.filter(candidate => {
         const key = JSON.stringify([candidate.provider, candidate.engine ?? "cli", candidate.model ?? "", candidate.thinkingEffort ?? opts.thinkingEffort]);
         if (seen.has(key))
             return false;
@@ -583,6 +578,16 @@ async function callTextCandidates(request, cwd, language, opts, parseOutput, tra
     }
     if (!chain.length)
         throw new QuickCommitError("系统员工没有可用的执行候选；免费分组为空或尚未同步。", "AI_FALLBACK_FAILED");
+    return { chain, freeLeaves, deadline };
+}
+/**
+ * 按顺序尝试候选：跳过没安装的 CLI，协议与输出校验均成功才返回。
+ * 只有一条候选时保持原行为（错误原样抛出，不摘要）。
+ * 文本生成可以无条件换下一条；有副作用的执行要先确认没有产生结果再换。
+ */
+async function callTextCandidates(request, cwd, language, opts, parseOutput, trace) {
+    const modelGroups = opts.modelGroups ?? opts.employeeText?.config.modelGroups;
+    const { chain, freeLeaves, deadline } = await expandEmployeeCandidates(opts, trace);
     const call = async (candidate) => {
         const free = freeLeaves.has(candidate);
         const candidateDeadline = free ? Math.min(deadline, Date.now() + 20_000) : deadline;

package/dist/auth.js

@@ -60,10 +60,8 @@ export class AuthService {
         const expiresAt = Date.now() + this.sessionTtlMs;
         const cached = { expiresAt, principal: clonePrincipal(principal) };
         this.sessions.set(token, cached);
-        // Scoped automation cookies deliberately die on server restart. Persisting only
-        // kind/scopes would silently discard the actor boundary and broaden access.
-        if (!cached.principal.webSession)
-            this.storage.saveAuthSession(token, expiresAt, cached.principal);
+        // 所有登录态（含票据登录）持久化，和密码登录一样跨服务重启有效。
+        this.storage.saveAuthSession(token, expiresAt, cached.principal);
         return token;
     }
     authenticateSession(token) {
@@ -85,10 +83,10 @@ export class AuthService {
             return null;
         }
         // Retire cookies minted by the early ticket prototype. Native App sessions
-        // use the established multi-scope principal; a sessions-only cookie without
-        // its actor boundary must never regain broad workbench access after upgrade.
+        // use the established multi-scope principal; a sessions-only connected-app
+        // cookie must never regain broad workbench access after upgrade.
         if (cached.principal.kind === "connected-app" && cached.principal.scopes.length === 1
-            && cached.principal.scopes[0] === "sessions" && !cached.principal.webSession)
+            && cached.principal.scopes[0] === "sessions")
             return null;
         return clonePrincipal(cached.principal);
     }
@@ -131,13 +129,10 @@ export class AuthService {
     }
 }
 export function principalHasScope(principal, scope) {
-    if (principal.webSession)
-        return scope === "sessions" && principal.scopes.includes("sessions");
     return principal.kind === "browser-admin"
         || principal.scopes.includes("admin")
         || principal.scopes.includes(scope);
 }
 function clonePrincipal(principal) {
-    return { kind: principal.kind, scopes: [...principal.scopes],
-        ...(principal.webSession ? { webSession: { ...principal.webSession } } : {}) };
+    return { kind: principal.kind, scopes: [...principal.scopes] };
 }

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "1aed3bb45f06259c1e9b957b93983dda9ea6c8d8",
-  "builtAt": "2026-10-16T09:10:20.913Z",
-  "version": "4.96.1-beta.202610161706",
-  "channel": "beta"
+  "commit": "a09542822526896c8dcc2c5af5862441fdb58282",
+  "builtAt": "2026-10-17T13:42:08.826Z",
+  "version": "4.97.0",
+  "channel": "stable"
 }

package/dist/cli.js

@@ -359,7 +359,7 @@ Agent runtime:
   wand system:skills [--providers pi,claude,...]  Install the managed wand-system skill
   wand employee:list [--include-archived]  List employee definitions (not private knowledge)
   wand workspace:list       List project directories
-  wand web-login:issue --stdin  Mint a 60s, one-use, non-admin Web ticket (controlled pipe only)
+  wand web-login:issue --stdin  Mint a 60s, one-use Web admin ticket (employee execution proof + controlled pipe only)
   wand web-login:cancel --stdin  Cancel an unconsumed ticket by requestId
   wand session:create --stdin  Create an employee session from JSON
   wand session:resume <id> --stdin  Continue the exact structured session with JSON input

package/dist/decision-skill.d.ts

@@ -1,5 +1,3 @@
+import { type ManagedSkillInstallResult } from "./managed-skill.js";
 import { type SessionProvider } from "./provider-catalog.js";
-export declare function installDecisionSkill(configDir: string, providers?: readonly SessionProvider[], home?: string): Promise<{
-    installed: string[];
-    providers: readonly SessionProvider[];
-}>;
+export declare function installDecisionSkill(configDir: string, providers?: readonly SessionProvider[], home?: string): Promise<ManagedSkillInstallResult>;

package/dist/git-quick-commit.js

@@ -2,8 +2,10 @@ import { existsSync } from "node:fs";
 import { getGitErrorMessage, runGitAsync as runGitAsyncBase, runGitRawAsync as runGitRawAsyncBase, } from "./git-utils.js";
 import { thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant } from "./structured-provider-common.js";
 /** provider 缺省值：无法识别时回落到 Claude。 */
-import { buildGrokTextArgs, buildPiTextArgs, buildQoderTextArgs, callConfiguredAiText, contentWithSystemPrompt, defaultProvider, normalizeAiText, runCliText, systemPromptArgsFrom, withOpsPersona } from "./ai-text-runner.js";
+import { buildGrokTextArgs, buildPiTextArgs, buildQoderTextArgs, callConfiguredAiText, contentWithSystemPrompt, defaultProvider, expandEmployeeCandidates, normalizeAiText, runCliText, systemPromptArgsFrom, withOpsPersona } from "./ai-text-runner.js";
 import { QuickCommitError } from "./command-error.js";
+import { candidateInstalled } from "./session-provider.js";
+import { AiCallTraceError } from "./system-ai-call.js";
 export { callCliAiText, callConfiguredAiText, withOpsPersona } from "./ai-text-runner.js";
 export { QuickCommitError } from "./command-error.js";
 const GIT_TIMEOUT_MS = 1500;
@@ -876,23 +878,57 @@ async function getLatestTagAtHead(cwd) {
 }
 async function runQuickCommitFallbackCli(opts, priorError) {
     const trace = opts.traceFactory?.start("git-fallback", buildFallbackPrompt(opts, priorError), opts.cwd);
-    const candidate = { provider: defaultProvider(opts.provider), engine: "cli", model: opts.model ?? undefined, thinkingEffort: opts.thinkingEffort ?? undefined };
+    if (trace)
+        opts.onCallSessionCreated?.(trace.sessionId);
+    const beforeHead = await getHead(opts.cwd);
     try {
-        if (trace)
-            opts.onCallSessionCreated?.(trace.sessionId);
-        trace?.candidateStarted(candidate);
-        const result = await runQuickCommitFallbackCliImpl(opts, priorError);
-        trace?.applicationResult(result);
-        trace?.complete();
-        return result;
+        const { chain, deadline } = await expandEmployeeCandidates(opts, trace);
+        const executable = chain.filter(candidate => candidate.engine !== "sdk" && candidateInstalled(candidate));
+        for (const candidate of chain) {
+            if (candidate.engine === "sdk")
+                trace?.candidateSkipped(candidate, "提交执行需要 CLI 工具，未把无工具文字候选当执行器。");
+            else if (!executable.includes(candidate))
+                trace?.candidateSkipped(candidate, "CLI 未安装，未提交输入。");
+        }
+        if (!executable.length)
+            throw new QuickCommitError("系统员工没有可执行 git 的 CLI 候选。", "AI_FALLBACK_FAILED");
+        const errors = [];
+        for (const candidate of executable) {
+            opts.signal?.throwIfAborted();
+            if (Date.now() >= deadline) {
+                errors.push("已超过等待上限");
+                break;
+            }
+            trace?.candidateStarted(candidate);
+            try {
+                const result = await runQuickCommitFallbackCliImpl({
+                    ...opts,
+                    provider: candidate.provider,
+                    model: candidate.model,
+                    thinkingEffort: candidate.thinkingEffort ?? opts.thinkingEffort,
+                }, priorError, Math.max(1, Math.min(QUICK_COMMIT_CLI_TIMEOUT_MS, deadline - Date.now())));
+                trace?.applicationResult(result);
+                trace?.complete();
+                return result;
+            }
+            catch (error) {
+                if (error instanceof AiCallTraceError)
+                    throw error;
+                trace?.candidateFailed(candidate, error, "execution");
+                const afterHead = await getHead(opts.cwd);
+                if (afterHead && afterHead !== beforeHead)
+                    throw error;
+                errors.push(`${candidate.provider}: ${getGitErrorMessage(error)}`);
+            }
+        }
+        throw new QuickCommitError(`所有执行候选均失败：${errors.join("；")}`, "AI_FALLBACK_FAILED");
     }
     catch (error) {
-        trace?.candidateFailed(candidate, error, "execution");
         trace?.fail(error);
         throw error;
     }
 }
-async function runQuickCommitFallbackCliImpl(opts, priorError) {
+async function runQuickCommitFallbackCliImpl(opts, priorError, timeoutMs = QUICK_COMMIT_CLI_TIMEOUT_MS) {
     await assertGitWorkTreeAsync(opts.cwd);
     const beforeHead = await getHead(opts.cwd);
     const request = withOpsPersona(buildFallbackPrompt(opts, priorError), opts.opsPersona);
@@ -908,7 +944,7 @@ async function runQuickCommitFallbackCliImpl(opts, priorError) {
         args.push("-");
         await runCliText("codex", args, contentWithSystemPrompt("codex", request), {
             cwd: opts.cwd,
-            timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
+            timeoutMs,
             inheritEnv: opts.inheritEnv,
         });
     }
@@ -922,28 +958,28 @@ async function runQuickCommitFallbackCliImpl(opts, priorError) {
             args.push("--variant", variant);
         await runCliText("opencode", args, contentWithSystemPrompt("opencode", request), {
             cwd: opts.cwd,
-            timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
+            timeoutMs,
             inheritEnv: opts.inheritEnv,
         });
     }
     else if (provider === "grok") {
         await runCliText("grok", buildGrokTextArgs(request, opts, true), "", {
             cwd: opts.cwd,
-            timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
+            timeoutMs,
             inheritEnv: opts.inheritEnv,
         });
     }
     else if (provider === "qoder") {
         await runCliText("qodercli", buildQoderTextArgs(request, opts, true), "", {
             cwd: opts.cwd,
-            timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
+            timeoutMs,
             inheritEnv: opts.inheritEnv,
         });
     }
     else if (provider === "pi") {
         await runCliText("pi", buildPiTextArgs(request, opts, true), "", {
             cwd: opts.cwd,
-            timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
+            timeoutMs,
             inheritEnv: opts.inheritEnv,
         });
     }
@@ -967,7 +1003,7 @@ async function runQuickCommitFallbackCliImpl(opts, priorError) {
         args.push(...systemPromptArgsFrom("claude", request.system));
         await runCliText("claude", args, request.prompt, {
             cwd: opts.cwd,
-            timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,
+            timeoutMs,
             inheritEnv: opts.inheritEnv,
         });
     }

package/dist/managed-skill.d.ts

@@ -1,6 +1,11 @@
 import { type SessionProvider } from "./provider-catalog.js";
-/** Install trusted bundled files without overwriting user content or changing tool permissions. */
-export declare function installManagedSkill(configDir: string, name: string, files: Record<string, string>, providers?: readonly SessionProvider[], home?: string): Promise<{
+export interface ManagedSkillInstallResult {
     installed: string[];
     providers: readonly SessionProvider[];
-}>;
+    /** Canonical files whose content was newly written (missing or refreshed from a prior managed version). */
+    changed: string[];
+    /** Provider discovery symlinks newly created by this install. */
+    linked: string[];
+}
+/** Install trusted bundled files without overwriting user content or changing tool permissions. */
+export declare function installManagedSkill(configDir: string, name: string, files: Record<string, string>, providers?: readonly SessionProvider[], home?: string): Promise<ManagedSkillInstallResult>;

package/dist/managed-skill.js

@@ -67,15 +67,20 @@ export async function installManagedSkill(configDir, name, files, providers = SE
             throw error;
     }
     const contents = Object.entries(files).map(([file, content]) => ({ file, content }));
+    const changed = [];
     for (const { file, content } of contents) {
         try {
             const old = await readFile(path.join(canonical, file), "utf8");
-            if (old !== content && sha(old) !== previous[file])
-                throw new Error(`技能已有用户修改，拒绝覆盖：${file}`);
+            if (old !== content) {
+                if (sha(old) !== previous[file])
+                    throw new Error(`技能已有用户修改，拒绝覆盖：${file}`);
+                changed.push(file);
+            }
         }
         catch (error) {
             if (error.code !== "ENOENT")
                 throw error;
+            changed.push(file);
         }
     }
     for (const { file, content } of contents) {
@@ -83,10 +88,12 @@ export async function installManagedSkill(configDir, name, files, providers = SE
         await writeFile(path.join(canonical, file), content, { mode: 0o644 });
     }
     await writeFile(path.join(canonical, ".wand-managed.json"), JSON.stringify(Object.fromEntries(contents.map(({ file, content }) => [file, sha(content)]))), { mode: 0o600 });
+    const linked = [];
     for (const target of targets) {
         await mkdir(path.dirname(target), { recursive: true });
         try {
             await symlink(canonical, target, "dir");
+            linked.push(target);
         }
         catch (error) {
             if (error.code !== "EEXIST")
@@ -95,5 +102,5 @@ export async function installManagedSkill(configDir, name, files, providers = SE
         if (await realpath(target) !== await realpath(canonical))
             throw new Error("技能链接目标校验失败。");
     }
-    return { installed: [...targets], providers };
+    return { installed: [...targets], providers, changed, linked };
 }

package/dist/managed-skills-ensure.d.ts

@@ -0,0 +1,12 @@
+export interface ManagedSkillEnsureOutcome {
+    name: string;
+    status: "synced" | "unchanged" | "failed";
+    files: number;
+    links: number;
+    error?: string;
+}
+/** 机器级技能发现链接只服务默认安装；隔离配置（开发/测试）各有自己的 canonical 目录，不互相抢占。 */
+export declare function isDefaultConfigPath(configPath: string, home?: string): boolean;
+/** 幂等同步包内托管技能：不抛异常、不覆盖用户改动，调用方只在有变化或失败时输出。 */
+export declare function ensureManagedSkills(configPath: string, home?: string): Promise<ManagedSkillEnsureOutcome[]>;
+export declare function formatManagedSkillsEnsureLog(outcomes: readonly ManagedSkillEnsureOutcome[]): string | null;

package/dist/managed-skills-ensure.js

@@ -0,0 +1,43 @@
+import { homedir } from "node:os";
+import path from "node:path";
+import { installDecisionSkill } from "./decision-skill.js";
+import { getErrorMessage } from "./error-utils.js";
+import { installSystemSkill } from "./system-skill.js";
+/** 机器级技能发现链接只服务默认安装；隔离配置（开发/测试）各有自己的 canonical 目录，不互相抢占。 */
+export function isDefaultConfigPath(configPath, home = homedir()) {
+    return path.resolve(path.dirname(configPath)) === path.join(home, ".wand");
+}
+/** 幂等同步包内托管技能：不抛异常、不覆盖用户改动，调用方只在有变化或失败时输出。 */
+export async function ensureManagedSkills(configPath, home = homedir()) {
+    const installs = [
+        ["wand-system", async () => installSystemSkill(configPath, undefined, home)],
+        ["wand-decision", async () => installDecisionSkill(path.dirname(configPath), undefined, home)],
+    ];
+    const outcomes = [];
+    for (const [name, install] of installs) {
+        try {
+            const { changed, linked } = await install();
+            outcomes.push({
+                name,
+                status: changed.length || linked.length ? "synced" : "unchanged",
+                files: changed.length,
+                links: linked.length,
+            });
+        }
+        catch (error) {
+            outcomes.push({ name, status: "failed", files: 0, links: 0, error: getErrorMessage(error) });
+        }
+    }
+    return outcomes;
+}
+export function formatManagedSkillsEnsureLog(outcomes) {
+    const synced = outcomes.filter((outcome) => outcome.status === "synced");
+    const failed = outcomes.filter((outcome) => outcome.status === "failed");
+    if (!synced.length && !failed.length)
+        return null;
+    const parts = [
+        ...synced.map((outcome) => `${outcome.name}（${outcome.files} 个文件${outcome.links ? `、${outcome.links} 个新链接` : ""}）`),
+        ...failed.map((outcome) => `${outcome.name} 未同步：${outcome.error}`),
+    ];
+    return `[wand] 托管技能${failed.length ? "部分未同步" : "已同步"}：${parts.join("；")}\n`;
+}

package/dist/middleware/auth.js

@@ -2,7 +2,6 @@ import { BROWSER_ADMIN_PRINCIPAL, CONNECTED_APP_PRINCIPAL, principalHasScope, re
 import { firstHeaderValue } from "../server-request.js";
 import { verifyAppToken } from "../server-app-connect.js";
 import { checkBearerRateLimit, recordFailedBearer } from "./rate-limit.js";
-import { webSessionRequestAllowed } from "../web-session-access.js";
 export const UNAUTHORIZED_ERROR = { error: "未授权，请先登录。", code: "unauthorized" };
 export const FORBIDDEN_SCOPE_ERROR = { error: "当前连接没有执行此操作的权限。", code: "forbidden" };
 export const PREFERENCE_ONLY_ERROR = { error: "当前连接只能修改新会话默认偏好。", code: "forbidden" };
@@ -82,18 +81,6 @@ export function createRequireAuth(deps) {
             res.status(401).json(UNAUTHORIZED_ERROR);
             return;
         }
-        if (principal.webSession) {
-            const session = deps.storage.getSessionSlim(principal.webSession.sessionId);
-            if (!session || session.employeeId !== principal.webSession.employeeId) {
-                deps.authService.revokeSession(readSessionCookie(req, deps.useHttps));
-                res.status(401).json(UNAUTHORIZED_ERROR);
-                return;
-            }
-            if (!webSessionRequestAllowed(principal, req.method, `${req.baseUrl}${req.path}`)) {
-                res.status(403).json({ error: "此票据登录仅可查看签发时的当前员工会话。", code: "web_session_read_only" });
-                return;
-            }
-        }
         req.principal = principal;
         next();
     };

package/dist/model-group-runner.js

@@ -14,6 +14,7 @@ export function withModelGroups(runner, config) {
             const grouped = !!group && models[0] !== OPENROUTER_FREE_SELECTOR;
             let cancelled = false;
             let current;
+            const exits = [];
             const start = (model) => {
                 let active = true;
                 let output = false;
@@ -40,6 +41,7 @@ export function withModelGroups(runner, config) {
                         observer.onUpdate({ ...state, model: state.model ?? model });
                     },
                 });
+                exits.push(execution.exited ?? execution.completion);
                 return { ...execution, get args() { return execution.args; }, get pid() { return execution.pid; },
                     completion: execution.completion.then((result) => {
                         const failed = result.spawnError ? { ...result, exitCode: result.exitCode ?? 1,
@@ -61,7 +63,8 @@ export function withModelGroups(runner, config) {
                     current = start(models[index + 1]);
                 }
             })();
-            return { ...first, get args() { return first.args; }, get pid() { return first.pid; }, completion, interrupt() {
+            const exited = completion.then(() => Promise.all(exits), () => Promise.all(exits)).then(() => { });
+            return { ...first, get args() { return first.args; }, get pid() { return first.pid; }, completion, exited, interrupt() {
                     cancelled = true;
                     try {
                         current.interrupt();

package/dist/pi-auto-resources.js

@@ -139,7 +139,9 @@ export function withAutomaticPiResources(runner, config, options) {
                 };
             });
             return { get args() { return execution?.args ?? []; }, get pid() { return execution?.pid ?? null; },
-                spawnedAt, completion, interrupt: () => {
+                spawnedAt, completion,
+                exited: completion.then(() => execution?.exited, () => execution?.exited).then(() => { }),
+                interrupt: () => {
                     if (interrupted)
                         return;
                     if (notice.status === "selecting") {

package/dist/pi-tmux-host.js

@@ -111,7 +111,7 @@ class NativeProcess {
         }
         catch (error) {
             logInfo(`Pi native file observation failed: ${error instanceof Error ? error.message : String(error)}`);
-            this.ended = { exitCode: 1, signal: null };
+            this.ended = { exitCode: 1, signal: null, processExited: false };
             void this.host.kill(this.job).catch(() => { });
         }
         if (this.timer)

package/dist/process-manager.d.ts

@@ -141,6 +141,7 @@ export declare class ProcessManager extends EventEmitter {
     private readonly sessions;
     /** Own the full start handshake, including model resolution and late host replies. */
     private readonly startingSessions;
+    private readonly nativeCleanupBarriers;
     private readonly logger;
     private readonly providerHistory;
     /** Quiet window for the non-Claude PTY turn tracker. */
@@ -290,6 +291,8 @@ export declare class ProcessManager extends EventEmitter {
     private finishProviderCli;
     stop(id: string): SessionSnapshot;
     private cleanupRecord;
+    /** Capture before delete drops the process handles. Never unlink a live CLI's history. */
+    nativeHistoryCleanupBarrier(id: string): Promise<void> | null;
     delete(id: string): void;
     private deleteClaudeCache;
     runStartupCommands(): Promise<SessionSnapshot[]>;

package/dist/process-manager.js

@@ -14,6 +14,8 @@ import { SessionTimers } from "./process-manager-timers.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
 import { appendWindow, hasExplicitConfirmSyntax, hasPermissionActionContext, normalizePromptText, PTY_OUTPUT_MAX_SIZE } from "./pty-text-utils.js";
 import { buildChildEnv, isRunningAsRoot, systemEnvValue } from "./env-utils.js";
+import { coreHarnessAgentDir } from "./harness-engine.js";
+import { waitForSessionProcessExit } from "./session-artifact-cleanup.js";
 import { buildLanguageDirective, buildManagedAutonomyDirective } from "./language-prompt.js";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getProviderCommandSessionId, getProviderResumeCommandSessionId } from "./resume-policy.js";
@@ -90,8 +92,9 @@ export class ProcessManager extends EventEmitter {
     sessions = new Map();
     /** Own the full start handshake, including model resolution and late host replies. */
     startingSessions = new Map();
+    nativeCleanupBarriers = new Map();
     logger;
-    providerHistory = new ProviderHistoryScanner();
+    providerHistory;
     /** Quiet window for the non-Claude PTY turn tracker. */
     ptyTurnIdleMs;
     /** Foreground-process-group sampling interval. */
@@ -128,6 +131,12 @@ export class ProcessManager extends EventEmitter {
         super();
         this.config = config;
         this.storage = storage;
+        const cliEnv = buildChildEnv(config.inheritEnv !== false);
+        this.providerHistory = new ProviderHistoryScanner({
+            claudeHome: cliEnv.CLAUDE_CONFIG_DIR?.trim() || path.join(os.homedir(), ".claude"),
+            codexHome: cliEnv.CODEX_HOME?.trim() || path.join(os.homedir(), ".codex"),
+            openCodeDatabasePath: path.join(cliEnv.XDG_DATA_HOME?.trim() || path.join(os.homedir(), ".local", "share"), "opencode", "opencode.db"),
+        });
         this.ptyTurnIdleMs = options.ptyTurnIdleMs ?? PTY_TURN_IDLE_MS;
         this.ptyForegroundSampleMs = options.ptyForegroundSampleMs ?? PTY_FOREGROUND_SAMPLE_MS;
         this.probePtyForegrounds = options.samplePtyForegrounds ?? samplePtyForegrounds;
@@ -1127,7 +1136,16 @@ export class ProcessManager extends EventEmitter {
         return this.providerHistory.deleteQoderHistoryFiles(sessionIds);
     }
     deletePiHistoryFiles(sessionIds) {
-        return this.providerHistory.deletePiHistoryFiles(sessionIds);
+        // Structured Pi uses harness.agentDir, which may differ from the CLI default.
+        // PTY Pi uses the default root. Remove the exact IDs from both, never a root.
+        const configured = path.join(coreHarnessAgentDir(this.config.harness), "sessions");
+        const defaults = path.join(buildChildEnv(this.config.inheritEnv !== false).PI_CODING_AGENT_DIR?.trim()
+            || path.join(os.homedir(), ".pi", "agent"), "sessions");
+        let deleted = new ProviderHistoryScanner({ piSessionsDir: configured }).deletePiHistoryFiles(sessionIds);
+        if (path.resolve(defaults) !== path.resolve(configured)) {
+            deleted += new ProviderHistoryScanner({ piSessionsDir: defaults }).deletePiHistoryFiles(sessionIds);
+        }
+        return deleted;
     }
     deleteGrokHistoryFiles(sessionIds) {
         return this.providerHistory.deleteGrokHistoryFiles(sessionIds);
@@ -1548,6 +1566,42 @@ export class ProcessManager extends EventEmitter {
         record.terminalState?.dispose();
         record.terminalState = null;
     }
+    /** Capture before delete drops the process handles. Never unlink a live CLI's history. */
+    nativeHistoryCleanupBarrier(id) {
+        const existing = this.nativeCleanupBarriers.get(id);
+        if (existing)
+            return existing;
+        const record = this.sessions.get(id);
+        if (!record)
+            return null;
+        if (this.startingSessions.has(id)) {
+            return Promise.reject(new Error("CLI startup is still pending; session artifacts were preserved."));
+        }
+        const waits = [];
+        if (record.ptyProcess) {
+            const terminal = record.ptyProcess;
+            waits.push(waitForSessionProcessExit((done) => {
+                const listener = terminal.onExit((event) => {
+                    // A missing remote inventory entry is reported as -1, not an OS exit.
+                    if (event.exitCode >= 0)
+                        done();
+                });
+                return () => listener.dispose();
+            }));
+        }
+        const child = record.childProcess;
+        if (child && child.exitCode === null && child.signalCode === null) {
+            waits.push(waitForSessionProcessExit((done) => {
+                child.once("close", done);
+                return () => { child.off("close", done); };
+            }));
+        }
+        if (!waits.length)
+            return null;
+        const barrier = Promise.all(waits).then(() => { });
+        this.nativeCleanupBarriers.set(id, barrier);
+        return barrier;
+    }
     delete(id) {
         const record = this.mustGet(id);
         const start = this.startingSessions.get(id);
@@ -1588,7 +1642,18 @@ export class ProcessManager extends EventEmitter {
         }
         record.terminalState?.dispose();
         record.terminalState = null;
-        this.terminalHost.forget(id);
+        const barrier = this.nativeCleanupBarriers.get(id);
+        if (barrier) {
+            const forget = () => {
+                this.nativeCleanupBarriers.delete(id);
+                if (!this.sessions.has(id))
+                    this.terminalHost.forget(id);
+            };
+            // Keep remote handles until their exit event has reached the barrier.
+            void barrier.then(forget, forget);
+        }
+        else
+            this.terminalHost.forget(id);
         // Delete from persistent storage BEFORE removing from in-memory map,
         // so a storage failure doesn't leave orphan records in the database.
         this.storage.deleteSession(id);

package/dist/provider-history-scanner.d.ts

@@ -45,6 +45,7 @@ export interface QoderHistorySession {
 export interface ProviderHistoryScannerOptions {
     claudeHome?: string;
     codexSessionsDir?: string;
+    codexHome?: string;
     openCodeDatabasePath?: string;
     /** Qoder and Qoder CN use separate config roots; callers may override both for tests. */
     qoderProjectsDirs?: string[];
@@ -59,6 +60,7 @@ export declare class ProviderHistoryScanner {
     private readonly claudeHome;
     private readonly claudeProjectsDir;
     private readonly codexSessionsDir;
+    private readonly codexHome;
     private readonly openCodeDatabasePath;
     private readonly qoderProjectsDirs;
     private readonly piSessionsDir;