@co0ontty/wand 4.89.4 → 4.89.5

package/dist/structured-session-manager.js

@@ -11,6 +11,7 @@ import { buildChildEnv } from "./env-utils.js";
 import { getErrorMessage } from "./error-utils.js";
 import { getDefaultModelForProvider } from "./config.js";
 import { isLocalDecisionModel } from "./decision-expert-identity.js";
+import { selectEmployeeCandidate } from "./silicon-employee-dispatch.js";
 import { recordIterationPrompt } from "./iteration-log.js";
 import { startEmployeeKnowledgeRunner } from "./employee-knowledge.js";
 import { CoreRunner } from "./core-runner.js";
@@ -2083,21 +2084,53 @@ export class StructuredSessionManager {
             throw new Error("执行引擎必须是 cli 或 sdk。");
         if (engine === "sdk" && provider !== "pi")
             throw new Error("Wand Agent 只支持 Pi 结构化会话。");
+        this.requireBlankSessionSelection(session);
+        const updated = this.blankSessionToolSelection(session, provider, engine);
+        if (updated === session)
+            return session;
+        return this.saveBlankSessionSelection(updated);
+    }
+    /** 首次发送前显式选择真实员工；同一会话、目录和未发送输入的归属不变。 */
+    setSessionEmployee(sessionId, employeeId) {
+        const session = this.requireSession(sessionId);
+        this.requireBlankSessionSelection(session);
+        const employee = this.storage.getSiliconEmployee(employeeId);
+        if (!employee || employee.archivedAt)
+            throw new Error("硅基员工不存在或已归档。");
+        const selected = selectEmployeeCandidate(employee);
+        if (session.employeeId === employee.id)
+            return session;
+        const role = {
+            ...session,
+            employeeId: employee.id,
+            employeeName: employee.name,
+            employeeAvatar: employee.avatar,
+            systemPrompt: employee.prompt,
+            runtimeSystemPrompt: undefined,
+            employeeCandidates: employee.agents,
+            employeeCandidateIndex: selected.index,
+        };
+        return this.saveBlankSessionSelection(this.blankSessionToolSelection(role, selected.agent.provider, selected.agent.engine ?? "cli", selected.index));
+    }
+    requireBlankSessionSelection(session) {
         if (session.status !== "idle" || session.archived || session.structuredState?.inFlight ||
-            this.pendingRunnerExecutions.has(sessionId) || session.claudeSessionId ||
+            session.structuredState?.activeRequestId ||
+            this.pendingRunnerExecutions.has(session.id) || session.claudeSessionId ||
             session.resumedFromSessionId || session.autoRecovered ||
             (session.messages?.length ?? 0) > 0 || (session.queuedMessages?.length ?? 0) > 0 ||
             session.automationId || (session.sessionSource && session.sessionSource !== "interactive") ||
             this.relayHandlerFor(session)) {
-            throw new Error("只有尚未发送消息的新建空白对话可以更换工具。");
+            throw new Error("只有尚未发送消息的新建空白对话可以更换员工或工具。");
         }
+    }
+    blankSessionToolSelection(session, provider, engine, selectedCandidateIndex) {
         const candidates = session.employeeCandidates ?? [];
         const currentCandidate = candidates[session.employeeCandidateIndex ?? 0];
         const currentEngine = session.provider === "pi" && (session.structuredState?.engine === "core"
             || (!session.structuredState?.engine && currentCandidate?.provider === "pi" && currentCandidate.engine === "sdk")) ? "sdk" : "cli";
         // 旧客户端只发 provider 时，同 provider 保持原引擎；显式 Pi 选项始终传 cli。
         const targetEngine = provider === "pi" ? engine ?? (session.provider === provider ? currentEngine : "cli") : "cli";
-        if (session.provider === provider && currentEngine === targetEngine)
+        if (selectedCandidateIndex === undefined && session.provider === provider && currentEngine === targetEngine)
             return session;
         if (targetEngine === "sdk" && session.provider === "pi" && (session.piSettings?.resources?.skills.length
             || session.piSettings?.resources?.mcpServers.length || session.piSettings?.lockedSkills?.length
@@ -2105,7 +2138,7 @@ export class StructuredSessionManager {
             throw new Error("Wand Agent 不支持会话级 Skills / MCP、自动选择或 CodeMode 覆盖；请先在 Pi 设置中关闭这些选项再切换。");
         }
         const resolution = provider === "pi" ? this.resolveNewSessionPiEngine(targetEngine) : undefined;
-        const candidateIndex = candidates.findIndex((candidate) => candidate.provider === provider
+        const candidateIndex = selectedCandidateIndex ?? candidates.findIndex((candidate) => candidate.provider === provider
             && (candidate.engine ?? "cli") === targetEngine);
         const candidate = candidateIndex >= 0 ? candidates[candidateIndex] : undefined;
         const runner = defaultStructuredRunner(provider);
@@ -2118,7 +2151,7 @@ export class StructuredSessionManager {
             (requestedMode === "auto-edit" && ["opencode", "grok", "pi"].includes(provider));
         const mode = provider === "codex" ? "full-access"
             : unsupportedMode ? "default" : requestedMode;
-        const updated = {
+        return {
             ...session,
             provider,
             runner,
@@ -2136,14 +2169,15 @@ export class StructuredSessionManager {
             structuredState: { ...defaultStructuredState(provider, runner), model: model ?? undefined,
                 ...(resolution ? { engine: resolution.engine, engineReason: resolution.reason } : {}) },
         };
-        // 身份、知识归属、任务/目录和候选快照不变；只更新本会话的执行参数。
+    }
+    saveBlankSessionSelection(updated) {
         this.storage.saveSession(updated);
-        this.sessions.set(sessionId, updated);
+        this.sessions.set(updated.id, updated);
         this.emit({
             type: "status",
-            sessionId,
+            sessionId: updated.id,
             data: { ...buildStructuredOutputPayload(updated), command: updated.command,
-                mode, autoApprovePermissions: updated.autoApprovePermissions },
+                mode: updated.mode, autoApprovePermissions: updated.autoApprovePermissions },
         });
         return updated;
     }

package/dist/task-archive-policy.d.ts

@@ -0,0 +1,4 @@
+import type { WandStorage } from "./storage.js";
+import type { SessionRegistry } from "./session-registry.js";
+/** Read live owners at the mutation boundary; a stale task label cannot hide active execution. */
+export declare function canArchiveTask(storage: WandStorage, sessions: SessionRegistry | undefined, taskId: string): boolean;

package/dist/task-archive-policy.js

@@ -0,0 +1,16 @@
+import { isArchiveBlocked } from "./archive-policy.js";
+import { AI_TEAM_ACTIVE_RUN_STATUSES } from "./ai-team-types.js";
+/** Read live owners at the mutation boundary; a stale task label cannot hide active execution. */
+export function canArchiveTask(storage, sessions, taskId) {
+    const task = storage.getWandTask(taskId);
+    if (!task || task.status === "doing")
+        return false;
+    if (storage.listWandTaskSessionIds(task.id).some(id => {
+        const session = sessions?.getLatest(id) ?? storage.getSession(id);
+        return session ? isArchiveBlocked(session) : false;
+    }))
+        return false;
+    return ![task.id, task.workspaceTaskId].some(id => id && storage.listAiTeamRuns({
+        taskId: id, statuses: AI_TEAM_ACTIVE_RUN_STATUSES, limit: 1,
+    }).length > 0);
+}

package/dist/tui/commands.d.ts

@@ -29,7 +29,7 @@ export declare function readUpdateChannel(configPath: string): UpdateChannel;
 /** 通过 npm dist-tag 拿到当前通道最新版本号。失败返回 latest=null。 */
 export declare function checkUpdate(currentVersion: string, channel?: UpdateChannel): UpdateInfo;
 /**
- * 执行 `npm install -g @co0ontty/wand@<dist-tag>`。
+ * 检查所选 npm dist-tag，再安装经过通道校验的固定版本。
  *
  * 此调用同步阻塞（TUI 上层应在另一线程的 setImmediate 调度，或直接 await）。
  * 通过 npm-update-utils 自动处理 `.wand-XXXXXX` 残留目录和 ENOTEMPTY 回退，

package/dist/tui/commands.js

@@ -9,7 +9,7 @@ import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync, unlinkSyn
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
-import { checkPackageUpdateSync, getInstallSpecForChannel, installPackageGloballySync, normalizeUpdateChannel, resolveGlobalWandBin, resolveGlobalWandCli, } from "../npm-update-utils.js";
+import { checkPackageUpdateSync, installPackageGloballySync, normalizeUpdateChannel, resolveGlobalWandBin, resolveGlobalWandCli, } from "../npm-update-utils.js";
 import { whichSync } from "../path-repair.js";
 import { computeRelaunch } from "../relaunch.js";
 import { ensureDatabaseFile, resolveDatabasePath, WandStorage } from "../storage.js";
@@ -77,7 +77,7 @@ export function checkUpdate(currentVersion, channel = "stable") {
     };
 }
 /**
- * 执行 `npm install -g @co0ontty/wand@<dist-tag>`。
+ * 检查所选 npm dist-tag，再安装经过通道校验的固定版本。
  *
  * 此调用同步阻塞（TUI 上层应在另一线程的 setImmediate 调度，或直接 await）。
  * 通过 npm-update-utils 自动处理 `.wand-XXXXXX` 残留目录和 ENOTEMPTY 回退，
@@ -89,7 +89,10 @@ export function installUpdate(channel = "stable") {
     const serviceSafety = checkInstalledServiceEntrypointsForUpdate();
     if (!serviceSafety.ok)
         return serviceSafety;
-    const res = installPackageGloballySync(getInstallSpecForChannel(channel), 180_000);
+    const info = checkPackageUpdateSync("dev", channel);
+    if (!info.latest)
+        return { ok: false, message: "npm 所选通道暂无有效版本，或 registry 暂时不可用。" };
+    const res = installPackageGloballySync(info.installSpec, 180_000);
     const out = (res.stdout || "") + (res.stderr ? "\n" + res.stderr : "");
     const trail = res.attempts.length > 1
         ? `\n\n尝试过的命令：\n  ${res.attempts.join("\n  ")}`

package/dist/web-ui/chat-message-meta.d.ts

@@ -5,7 +5,9 @@ export interface ChatUsageMetric {
     value: string;
     title: string;
 }
-/** Display only reported counts. Round aggregation remains owned by the chat renderer. */
+/** Latest reported round, retaining it while the next reply has no usage yet. */
+export declare function latestChatUsage(messages: readonly Pick<ConversationTurn, "role" | "usage">[]): ConversationTurn["usage"];
+/** Display only reported counts. */
 export declare function chatUsageMetrics(usage: ConversationTurn["usage"]): ChatUsageMetric[];
 /** Never infer a finished duration from wall time, a live turn, or invalid/reversed anchors. */
 export declare function chatReplyDuration(turn: Pick<ConversationTurn, "role" | "createdAt" | "completedAt">): string | null;

package/dist/web-ui/chat-message-meta.js

@@ -6,7 +6,27 @@ function compactNumber(value) {
         return `${(value / 1_000).toFixed(1).replace(/\.0$/, "")}k`;
     return String(Math.round(value));
 }
-/** Display only reported counts. Round aggregation remains owned by the chat renderer. */
+/** Latest reported round, retaining it while the next reply has no usage yet. */
+export function latestChatUsage(messages) {
+    let latest;
+    let round = {};
+    for (const message of messages) {
+        if (message.role === "user")
+            round = {};
+        if (message.role !== "assistant" || !message.usage)
+            continue;
+        for (const key of ["inputTokens", "outputTokens", "cacheReadInputTokens", "cacheCreationInputTokens", "reasoningOutputTokens", "totalCostUsd"]) {
+            const value = message.usage[key];
+            if (typeof value === "number" && Number.isFinite(value) && value >= 0)
+                round[key] = (round[key] ?? 0) + value;
+        }
+        if (message.usage.estimated)
+            round.estimated = true;
+        latest = { ...round };
+    }
+    return latest;
+}
+/** Display only reported counts. */
 export function chatUsageMetrics(usage) {
     if (!usage)
         return [];