@co0ontty/wand 4.76.0 → 4.77.0-beta.g6c4df97

package/dist/structured-provider-common.js

@@ -1,4 +1,56 @@
+import { shellQuote } from "./shell-quote.js";
 const NATIVE_THINKING_EFFORT = /^(claude|codex|opencode|grok|qoder|pi):[a-z0-9][a-z0-9_-]{0,31}$/;
+/**
+ * 把会话级系统提示交给 CLI 的开关。Claude / Qoder / Pi 用 `--append-system-prompt`，
+ * Grok 用 `--rules`；Codex / OpenCode 没有这个入口，只能退回并入本轮消息。
+ * 各 provider 的支持情况由 `--help` 实测得出，新增 provider 前先验。
+ */
+export function systemPromptFlag(provider) {
+    switch (provider) {
+        case "claude":
+        case "qoder":
+        case "pi":
+            return "--append-system-prompt";
+        case "grok":
+            return "--rules";
+        default:
+            return null;
+    }
+}
+/** 结构化 runner 的 args：provider 支持时把系统提示当成独立参数传。 */
+export function systemPromptArgs(session) {
+    const text = session.systemPrompt?.trim();
+    if (!text)
+        return [];
+    const flag = systemPromptFlag(session.provider);
+    return flag ? [flag, text] : [];
+}
+/**
+ * provider 没有系统提示通道时的兜底：把它放在本会话第一条消息最前面，并写明它不是用户输入。
+ * 只在首轮拼一次：后续轮次的消息已经接在有它的对话历史后面。有通道的 provider 不会走这里。
+ */
+export function promptWithSystemFallback(session, prompt) {
+    const text = session.systemPrompt?.trim();
+    if (!text || systemPromptFlag(session.provider))
+        return prompt;
+    if ((session.messages?.length ?? 0) > 1)
+        return prompt;
+    return composeSystemFallback(text, prompt);
+}
+/** provider 没有系统提示通道时的并接格式：明确标出这不是用户输入。 */
+export function composeSystemFallback(systemPrompt, prompt) {
+    return `以下是本会话的固定要求（来自系统，不是用户输入，优先级高于后面的内容）：\n\n${systemPrompt.trim()}\n\n---\n\n${prompt}`;
+}
+/** 把系统提示接到 CLI 命令上（provider 支持时）；不支持时原样返回，由调用方并进首条输入。 */
+export function commandWithSystemPrompt(command, provider, systemPrompt) {
+    const text = systemPrompt?.trim();
+    if (!text)
+        return command;
+    const flag = systemPromptFlag(provider);
+    if (!flag || command.includes(flag))
+        return command;
+    return `${command} ${flag} ${shellQuote(text)}`;
+}
 /** 判断任意值是否为合法的 thinking effort（旧四档，或 `provider:level`）。 */
 export function isThinkingEffort(value) {
     return value === "off"

package/dist/structured-qoder-adapter.js

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
 import { ClaudeCliProtocolReducer } from "./structured-claude-protocol.js";
 import { startStructuredCli } from "./structured-exec-pump.js";
-import { thinkingEffortToQoderEffort } from "./structured-provider-common.js";
+import { systemPromptArgs, thinkingEffortToQoderEffort } from "./structured-provider-common.js";
 export function buildQoderArgs(session, prompt) {
     const args = ["-p", prompt, "--output-format", "stream-json"];
     const model = session.selectedModel?.trim();
@@ -13,6 +13,7 @@ export function buildQoderArgs(session, prompt) {
     // 与 PTY runner 一致：Qoder 一律以 yolo（bypass_permissions）启动。结构化 runner 没有
     // 权限桥，--print 下未批准的调用只会被拒绝，因此不做任何模式降级。
     args.push("--permission-mode", "bypass_permissions");
+    args.push(...systemPromptArgs(session));
     if (session.claudeSessionId)
         args.push("-r", session.claudeSessionId);
     return args;

package/dist/structured-session-manager.d.ts

@@ -2,7 +2,7 @@ import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
 import { type WorktreeSetupSpec } from "./git-worktree.js";
 import { SessionLogger } from "./session-logger.js";
 import { WandStorage } from "./storage.js";
-import { ExecutionMode, ProcessEvent, SessionProvider, SessionRunner, SessionSnapshot, SessionSource, WandConfig } from "./types.js";
+import { ConversationTurn, ExecutionMode, ProcessEvent, SessionProvider, SessionRunner, SessionSnapshot, SessionSource, WandConfig } from "./types.js";
 import { type StructuredExecHost } from "./structured-exec-host.js";
 import type { StructuredRunnerAdapter } from "./structured-runner.js";
 export interface StructuredSessionManagerRunners {
@@ -26,6 +26,8 @@ interface CreateStructuredSessionOptions {
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
     sessionSource?: SessionSource;
     automationId?: string;
+    /** 会话级系统提示（团队 / 自动化的角色与规则）；走 provider 的系统提示通道。 */
+    systemPrompt?: string;
     /** 所属工作空间 ID（多标签 / 分屏项目）。 */
     workspaceId?: string;
     /** 所属工作空间任务 ID（任务 = 独立 worktree + 一组标签）。 */
@@ -38,6 +40,12 @@ interface CreateStructuredSessionOptions {
      */
     claudeSessionId?: string;
 }
+/**
+ * 转发会话（AI 团队群聊）：外观是普通结构化会话，但不起 CLI。
+ * 用户发的话交给 handler，别的参与者的发言由 appendRelayTurns 写进来。
+ * 按 automationId 前缀识别，重启后照样生效。
+ */
+export type StructuredRelayHandler = (sessionId: string, text: string) => void | Promise<void>;
 /**
  * 返回最近一次真正提交给结构化会话的用户输入。
  *
@@ -89,6 +97,7 @@ export declare class StructuredSessionManager {
      * map 大小溢出时按时间裁剪。
      */
     private readonly seenIdempotencyKeys;
+    private readonly relayHandlers;
     private emitEvent;
     private archiveTimer;
     private readonly topicCoordinator;
@@ -139,6 +148,14 @@ export declare class StructuredSessionManager {
     setWorktreeMergeState(id: string, status: SessionSnapshot["worktreeMergeStatus"], info: SessionSnapshot["worktreeMergeInfo"]): SessionSnapshot | null;
     private maybeGenerateSessionTopic;
     createSession(options: CreateStructuredSessionOptions): SessionSnapshot;
+    registerRelay(automationIdPrefix: string, handler: StructuredRelayHandler): void;
+    private relayHandlerFor;
+    createRelaySession(options: CreateStructuredSessionOptions & {
+        automationId: string;
+        title: string;
+    }): SessionSnapshot;
+    /** 往转发会话里追加别的参与者的发言。 */
+    appendRelayTurns(id: string, turns: ConversationTurn[]): SessionSnapshot | null;
     sendMessage(id: string, input: string, opts?: {
         interrupt?: boolean;
         idempotencyKey?: string;

package/dist/structured-session-manager.js

@@ -14,7 +14,7 @@ import { resolveSystemAiContext } from "./session-ai-context.js";
 import { CodexRunner } from "./structured-codex-adapter.js";
 import { CodexProtocolReducer } from "./structured-codex-protocol.js";
 import { normalizeStructuredToolResultContent } from "./structured-content.js";
-import { buildAppendSystemPromptParts, buildClaudeSdkThinking, ClaudeCliRunner, derivePermissionPolicy, } from "./structured-claude-adapter.js";
+import { buildClaudeSdkThinking, buildSessionSystemPromptParts, ClaudeCliRunner, derivePermissionPolicy, } from "./structured-claude-adapter.js";
 import { inferStructuredEscalation, structuredPermissionDenied } from "./structured-permission.js";
 import { captureTaskMeta, extractClaudeAssistantMessage, extractClaudeModelName, normalizeClaudeToolInput, stampParentTaskResults, stampSelfTask, tagSubagentBlocks, ClaudeCliProtocolReducer, } from "./structured-claude-protocol.js";
 import { OpenCodeRunner, applyOpenCodeEvent } from "./structured-opencode-adapter.js";
@@ -24,7 +24,6 @@ import { PiRunner, applyPiEvent, isMissingPiSession } from "./structured-pi-adap
 import { structuredRunId, } from "./structured-exec-host.js";
 import { defaultStructuredRunner, defaultStructuredState, isStructuredRunnerForProvider, normalizeThinkingEffort, resolveStructuredRunner, } from "./structured-provider-common.js";
 import { enrichStructuredMessages, WAND_PROTOCOL_VERSION } from "./structured-client-protocol.js";
-/** The runner already persisted/emitted its detailed terminal snapshot. */
 class PersistedStructuredRunnerError extends Error {
     constructor(message) {
         super(message);
@@ -416,6 +415,7 @@ export class StructuredSessionManager {
      * map 大小溢出时按时间裁剪。
      */
     seenIdempotencyKeys = new Map();
+    relayHandlers = new Map();
     emitEvent = null;
     archiveTimer = null;
     topicCoordinator = new SessionTopicCoordinator();
@@ -1168,6 +1168,7 @@ export class StructuredSessionManager {
             sessionKind: "structured",
             sessionSource: options.sessionSource ?? "interactive",
             automationId: options.automationId,
+            systemPrompt: options.systemPrompt?.trim() || null,
             workspaceId: options.workspaceId,
             workspaceTaskId: options.workspaceTaskId,
             provider,
@@ -1218,6 +1219,43 @@ export class StructuredSessionManager {
         this.emit({ type: "started", sessionId: id, data: { sessionKind: "structured" } });
         return snapshot;
     }
+    registerRelay(automationIdPrefix, handler) {
+        this.relayHandlers.set(automationIdPrefix, handler);
+    }
+    relayHandlerFor(session) {
+        const automationId = session.automationId ?? "";
+        for (const [prefix, handler] of this.relayHandlers) {
+            if (automationId.startsWith(prefix))
+                return handler;
+        }
+        return null;
+    }
+    createRelaySession(options) {
+        const created = this.createSession(options);
+        const titled = { ...created, title: options.title };
+        this.sessions.set(titled.id, titled);
+        this.storage.saveSession(titled);
+        this.emitStructuredSnapshot(titled);
+        return titled;
+    }
+    /** 往转发会话里追加别的参与者的发言。 */
+    appendRelayTurns(id, turns) {
+        const session = this.sessions.get(id);
+        if (!session || turns.length === 0)
+            return session ?? null;
+        const createdAt = new Date().toISOString();
+        const updated = {
+            ...session,
+            messages: [
+                ...(session.messages ?? []),
+                ...turns.map((turn) => ({ ...turn, createdAt: turn.createdAt ?? createdAt })),
+            ],
+        };
+        this.sessions.set(id, updated);
+        this.storage.saveSession(updated);
+        this.emitStructuredSnapshot(updated);
+        return updated;
+    }
     async sendMessage(id, input, opts) {
         if (this.disposed)
             throw new Error("StructuredSessionManager has been disposed.");
@@ -1225,6 +1263,20 @@ export class StructuredSessionManager {
         const prompt = input.trim();
         if (!prompt)
             return session;
+        const relay = this.relayHandlerFor(session);
+        if (relay) {
+            // 群聊不起 CLI：先落下用户这句话，再交给转发方；转发失败以提示行告诉用户。
+            const posted = this.appendRelayTurns(id, [{ role: "user", content: [{ type: "text", text: prompt }] }]);
+            try {
+                await relay(id, prompt);
+            }
+            catch (error) {
+                this.appendRelayTurns(id, [{
+                        role: "assistant", notice: true, content: [{ type: "text", text: `没能转达：${getErrorMessage(error)}` }],
+                    }]);
+            }
+            return this.sessions.get(id) ?? posted;
+        }
         const skills = opts?.skills ?? [];
         if (opts?.idempotencyKey) {
             const mapKey = `${id}:${opts.idempotencyKey}`;
@@ -2639,13 +2691,18 @@ export class StructuredSessionManager {
         const interruptedByUser = this.interruptedWith.has(sessionId);
         const interruptedForQuestion = result.stopReason === "ask-user-question";
         const failedExit = (result.exitCode !== null && result.exitCode !== 0) || result.signal !== null;
-        if (failedExit && !interruptedByUser && !interruptedForQuestion) {
-            const errorText = this.formatStructuredExitError(commandLabel, result.exitCode, result.signal, {
-                stderr: result.stderr,
-                stdoutTail: result.stdoutTail,
-                primary: result.primaryError,
-            });
-            const failed = this.finishStructuredFailure(current, typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
+        // Pi 等 CLI 在 provider 报错（额度用尽、鉴权失败）时仍以 0 退出；这一轮没有任何产出时
+        // 必须按失败落盘，否则会被当成一次空回复，用户和团队调度都看不到真正的错误。
+        const erroredEmptyTurn = !failedExit && !!result.primaryError && !result.state.blocks.some((block) => block.type === "tool_use" || (block.type === "text" && block.text.trim() !== ""));
+        if ((failedExit || erroredEmptyTurn) && !interruptedByUser && !interruptedForQuestion) {
+            const errorText = erroredEmptyTurn
+                ? result.primaryError.trim()
+                : this.formatStructuredExitError(commandLabel, result.exitCode, result.signal, {
+                    stderr: result.stderr,
+                    stdoutTail: result.stdoutTail,
+                    primary: result.primaryError,
+                });
+            const failed = this.finishStructuredFailure(current, failedExit && typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
             if (provider === "pi" && isMissingPiSession(result.stderr, current.claudeSessionId)) {
                 failed.claudeSessionId = null;
             }
@@ -2734,7 +2791,7 @@ export class StructuredSessionManager {
         let killedForAskUserQuestion = false;
         // 权限策略 + 系统提示词都通过共享 helper 派生，与 CLI runner 一字不差。
         const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false, session.cwd);
-        const systemPromptParts = buildAppendSystemPromptParts(this.config.language, session.mode);
+        const systemPromptParts = buildSessionSystemPromptParts(session, this.config.language);
         const sdkClaudeBinary = resolveSdkClaudeBinary();
         // SDK 默认会把整个 process.env 透传给 claude 子进程；这里显式按 inheritEnv 配置组装，
         // 否则关闭"继承环境变量"开关时 SDK 路径会被静默忽略。

package/dist/system-ai.d.ts

@@ -11,6 +11,17 @@ export declare function systemAiProfiles(config: SystemAiConfig | undefined, for
  * Later groups are appended after earlier groups and duplicate routes are skipped.
  */
 export declare function mergeSystemAiConfigs(...groups: Array<SystemAiConfig | SystemAiConfig[] | undefined>): SystemAiConfig | undefined;
-export declare function callSystemAiText(prompt: string, config: SystemAiConfig, timeoutMs?: number): Promise<string>;
+/**
+ * 一次性 AI 请求：规则 / 角色走系统提示，内容走用户消息。
+ * 直连 API 用各协议的 system 通道；CLI 用各 provider 自己的系统提示开关
+ * （`systemPromptFlag`），没有开关的 provider 退回把规则并在内容前面。
+ */
+export interface AiTextRequest {
+    /** 规则、角色、输出格式。空字符串表示这次调用不需要系统提示。 */
+    system: string;
+    /** 本次要处理的内容（diff、用户原话、对话摘要…）。 */
+    prompt: string;
+}
+export declare function callSystemAiText(request: AiTextRequest, config: SystemAiConfig, timeoutMs?: number): Promise<string>;
 /** Try every configured API in order. Empty responses are treated as unavailable. */
-export declare function callSystemAiTextWithFallback(prompt: string, config: SystemAiConfig, timeoutMs?: number): Promise<string>;
+export declare function callSystemAiTextWithFallback(request: AiTextRequest, config: SystemAiConfig, timeoutMs?: number): Promise<string>;

package/dist/system-ai.js

@@ -344,11 +344,15 @@ function endpoint(baseUrl, protocol) {
     }
     return url.toString();
 }
-export async function callSystemAiText(prompt, config, timeoutMs = SYSTEM_AI_TIMEOUT_MS) {
+function requestParts(request) {
+    return { system: request.system?.trim() ?? "", prompt: request.prompt ?? "" };
+}
+export async function callSystemAiText(request, config, timeoutMs = SYSTEM_AI_TIMEOUT_MS) {
     const normalized = normalizeSystemAiConfig(config);
     if (!normalized.enabled || !normalized.baseUrl || !normalized.apiKey || !normalized.model) {
         throw new SystemAiError("系统 AI API 配置不完整。", "SYSTEM_AI_CONFIG_INVALID");
     }
+    const { system, prompt } = requestParts(request);
     const headers = { "content-type": "application/json" };
     if (normalized.protocol === "anthropic") {
         headers["anthropic-version"] = "2023-06-01";
@@ -364,14 +368,14 @@ export async function callSystemAiText(prompt, config, timeoutMs = SYSTEM_AI_TIM
             headers.authorization = `Bearer ${normalized.apiKey}`;
     }
     const body = normalized.protocol === "anthropic"
-        ? { model: normalized.model, max_tokens: 2048, messages: [{ role: "user", content: prompt }] }
+        ? { model: normalized.model, max_tokens: 2048, ...(system ? { system } : {}), messages: [{ role: "user", content: prompt }] }
         : {
             model: normalized.model,
             // Quick system tasks should not silently inherit a model's expensive
             // default reasoning level. Settings probes a route with this same
             // payload, so an incompatible endpoint fails visibly before it is used.
             reasoning_effort: "low",
-            messages: [{ role: "user", content: prompt }],
+            messages: [...(system ? [{ role: "system", content: system }] : []), { role: "user", content: prompt }],
             stream: false,
         };
     let response;
@@ -399,7 +403,7 @@ export async function callSystemAiText(prompt, config, timeoutMs = SYSTEM_AI_TIM
     }
 }
 /** Try every configured API in order. Empty responses are treated as unavailable. */
-export async function callSystemAiTextWithFallback(prompt, config, timeoutMs = SYSTEM_AI_TIMEOUT_MS) {
+export async function callSystemAiTextWithFallback(request, config, timeoutMs = SYSTEM_AI_TIMEOUT_MS) {
     const profiles = systemAiProfiles(config, true);
     if (!profiles.length) {
         throw new SystemAiError("系统 AI API 配置不完整。", "SYSTEM_AI_CONFIG_INVALID");
@@ -407,7 +411,7 @@ export async function callSystemAiTextWithFallback(prompt, config, timeoutMs = S
     const errors = [];
     for (const profile of profiles) {
         try {
-            const text = await callSystemAiText(prompt, profile, timeoutMs);
+            const text = await callSystemAiText(request, profile, timeoutMs);
             if (text.trim())
                 return text;
             errors.push(`${profile.source ?? "custom"}: 返回空结果`);

package/dist/task-title.js

@@ -69,16 +69,16 @@ export async function generateWandTaskTitle(description, cwd, language = "", ai
     if (!input)
         throw new Error("没有可总结的任务描述。");
     const outputLanguage = language.trim() || "与描述相同的语言";
-    const prompt = [
-        "根据下面的任务描述，写一个用于任务列表的具体标题。",
-        `使用${outputLanguage}输出。`,
-        "只输出标题本身：一行纯文本，不要引号、不要 Markdown、不要编号、不要「标题：」这类前缀、不要任何解释。",
-        "不超过 20 个字，必须点出描述里的具体对象或动作，不要使用「任务」「待办」「关于」「请求」等空泛词。",
-        "",
-        "任务描述：",
-        input,
-    ].join("\n");
-    const raw = await callConfiguredAiText(prompt, cwd || process.cwd(), language, ai);
+    const request = {
+        system: [
+            "根据用户消息里的任务描述，写一个用于任务列表的具体标题。",
+            `使用${outputLanguage}输出。`,
+            "只输出标题本身：一行纯文本，不要引号、不要 Markdown、不要编号、不要「标题：」这类前缀、不要任何解释。",
+            "不超过 20 个字，必须点出描述里的具体对象或动作，不要使用「任务」「待办」「关于」「请求」等空泛词。",
+        ].join("\n"),
+        prompt: `任务描述：\n${input}`,
+    };
+    const raw = await callConfiguredAiText(request, cwd || process.cwd(), language, ai);
     const stripped = stripGeneratedTitle(raw);
     // 拿到报错文案 / 整段解释时宁可保留占位标题，也不能把垃圾写进看板。
     // 先判可信度再裁剪：截断过的长句看起来就像标题，会绕过长度检查。

package/dist/types.d.ts

@@ -57,8 +57,6 @@ export interface CardExpandDefaults {
     terminal?: boolean;
     /** Thinking blocks (default: false) */
     thinking?: boolean;
-    /** Tool groups (default: false) */
-    toolGroup?: boolean;
 }
 export interface AndroidApkConfig {
     enabled?: boolean;
@@ -363,6 +361,11 @@ export interface CommandRequest {
     cwd?: string;
     mode?: ExecutionMode;
     initialInput?: string;
+    /**
+     * 会话级系统提示（角色、规则）：走 provider 自己的系统提示开关，
+     * 不要拼进 initialInput。见 AGENTS.md「Session 输入契约」。
+     */
+    systemPrompt?: string;
     worktreeEnabled?: boolean;
     /** 模型（别名或完整 ID）。留空则按 provider 回落到服务端默认模型。 */
     model?: string;
@@ -514,9 +517,24 @@ export interface ToolResultBlock {
     __subagent?: SubagentMeta;
 }
 export type ContentBlock = TextBlock | ThinkingBlock | ToolUseBlock | ToolResultBlock;
+/** 群聊（AI 团队）里的发言人；普通会话没有，按 role 用默认人设。 */
+export interface ConversationAuthor {
+    /** 团队成员 id；用户发言为 "user"。 */
+    id: string;
+    name: string;
+    /** 成员头像：上传的 data URL、"cat:<n>" 指定毛色，或空（按 id 哈希毛色）。 */
+    avatar?: string;
+    leader?: boolean;
+    provider?: SessionProvider;
+    /** 这条发言对应的成员会话，可点开看完整过程。 */
+    sessionId?: string;
+}
 export interface ConversationTurn {
     role: "user" | "assistant";
     content: ContentBlock[];
+    author?: ConversationAuthor;
+    /** 群聊里的进度提示（派工、开始、出错）：渲染成居中的一行，不是气泡。 */
+    notice?: boolean;
     /** ISO time when this turn was first recorded (user send / assistant start). */
     createdAt?: string;
     /** ISO time when an assistant turn finished streaming. */
@@ -550,6 +568,11 @@ export interface SessionSnapshot {
     sessionSource?: SessionSource;
     /** 自动化创建会话时关联的自动化任务 ID。 */
     automationId?: string;
+    /**
+     * 会话级系统提示：自动化 / 团队会话的角色与规则放这里，走 provider 的系统提示通道，
+     * 不要拼进首条用户消息。provider 没有该通道时（codex / opencode）由调用方退回并入消息。
+     */
+    systemPrompt?: string | null;
     /** 所属工作空间 ID（多标签 / 分屏项目）。会话在该工作空间窗口内作为一个标签。 */
     workspaceId?: string;
     /** 所属工作空间任务 ID；任务独占一个 worktree，其下所有会话共享该 worktree 目录。 */

package/dist/wand-task-sync.d.ts

@@ -22,6 +22,7 @@ export declare function taskAutoNameSignature(source: string): string;
 export declare function ensureBoardTaskForWorkspaceTask(storage: WandStorage, task: WorkspaceTask, workspace: Workspace, options?: {
     titleSource?: WandTaskTitleSource;
     description?: string;
+    parentTaskId?: string | null;
 }): WandTask;
 /** A board task always has a sidebar container, even before its first session. */
 export declare function ensureWorkspaceTaskForBoardTask(storage: WandStorage, card: WandTask): WorkspaceTask;

package/dist/wand-task-sync.js

@@ -112,6 +112,7 @@ export function ensureBoardTaskForWorkspaceTask(storage, task, workspace, option
     return storage.createWandTask({
         workspaceId: workspace.kind === "global" ? null : workspace.id,
         workspaceTaskId: task.id,
+        parentTaskId: options.parentTaskId ?? null,
         title: task.name,
         // 占位名（未命名任务 / 新任务 / 空）走自动命名；用户填过名就是 user，永不被模型覆盖。
         titleSource: options.titleSource ?? (isUnnamedWorkspaceTaskName(task.name) ? "auto" : "user"),