weacpx 0.4.6 → 0.4.9

package/README.md

@@ -180,7 +180,7 @@ weacpx restart
 | `weacpx agent add <name>` | 从内置模板添加 agent；已存在且配置不同的同名 agent 不会被覆盖 |
 | `weacpx agent rm <name>` | 删除 agent |
 | `weacpx workspace list` | 查看本机已注册的 workspace |
-| `weacpx workspace add [name]` | 把当前目录注册成 workspace；不传 `name` 时使用当前目录名 |
+| `weacpx workspace add [name] [--raw]` | 把当前目录注册成 workspace；不传 `name` 时使用当前目录名，含特殊字符的名称会被自动规范化 |
 | `weacpx workspace rm <name>` | 删除 workspace |
 
 首次运行 `weacpx start` 或 `weacpx run` 时，如果没有会话、workspace 和插件，CLI 会询问是否把当前目录创建为 workspace，并选择一个内置 agent 模板；服务启动后会通过正常会话创建流程创建初始 acpx 会话。
@@ -200,8 +200,9 @@ weacpx ws rm backend
 | 命令 | 说明 |
 |------|------|
 | `weacpx workspace list` | 列出已注册的 workspace 及其路径 |
-| `weacpx workspace add` | 把当前目录注册为 workspace，名称默认取当前目录名 |
-| `weacpx workspace add <name>` | 把当前目录注册为指定名称 |
+| `weacpx workspace add` | 把当前目录注册为 workspace，名称默认取当前目录名（自动规范化） |
+| `weacpx workspace add <name>` | 把当前目录注册为指定名称（含特殊字符时自动规范化） |
+| `weacpx workspace add [name] --raw` | 保留原始名称（含空格等），后续命令需要用引号引用 |
 | `weacpx workspace rm <name>` | 删除指定 workspace |
 
 常见用法：
@@ -224,7 +225,7 @@ weacpx ws rm frontend
 /ss new claude --ws frontend
 ```
 
-注意：`workspace add` 总是注册**当前终端所在目录**；如果不传名称，会用当前目录名作为 workspace 名称。
+注意：`workspace add` 总是注册**当前终端所在目录**。如果不传名称，会用当前目录名作为 workspace 名称。含空格、中文等字符的名称会被自动规范化为 `[a-zA-Z0-9._-]+`（例如目录 `My Project` 会保存为 `My-Project`），重名时追加 `-2`、`-3`。如需保留原始名称，加 `--raw`；之后 `weacpx workspace rm`、`/ws rm`、`--ws <name>` 都需要用引号引用，例如 `weacpx workspace rm "My Project"`。
 
 ### `agent` CLI 怎么用
 
@@ -292,7 +293,7 @@ opencode, qoder, qwen, trae
 | 命令 | 说明 |
 |------|------|
 | `/workspaces` / `/workspace` / `/ws` | 查看 workspace 列表 |
-| `/ws new <name> -d <path>` | 添加 workspace，`path` 是电脑上的绝对路径，Windows 不用区分正反斜杠 |
+| `/ws new <name> -d <path> [--raw]` | 添加 workspace，`path` 是电脑上的绝对路径，Windows 不用区分正反斜杠；含空格/中文等特殊字符的名称会被自动规范化，--raw 保留原名 |
 | `/workspace rm <name>` | 删除 workspace |
 
 ### Session 会话

package/dist/bridge/bridge-main.js

@@ -60,6 +60,10 @@ function encodeBridgePromptToolEvent(event) {
   return `${JSON.stringify(event)}
 `;
 }
+function encodeBridgePromptThoughtEvent(event) {
+  return `${JSON.stringify(event)}
+`;
+}
 function encodeBridgeSessionProgressEvent(event) {
   return `${JSON.stringify(event)}
 `;
@@ -366,6 +370,7 @@ var init_tool_kind_emoji = __esm(() => {
 function createStreamingPromptState(formatToolCalls = false, options) {
   let toolEventMode;
   let onToolEvent;
+  let onThought;
   if (options === undefined) {
     toolEventMode = "text";
     onToolEvent = undefined;
@@ -374,6 +379,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     toolEventMode = "structured";
   } else {
     onToolEvent = options.onToolEvent;
+    onThought = options.onThought;
     toolEventMode = resolveToolEventMode({
       toolEventMode: options.mode,
       onToolEvent
@@ -388,6 +394,7 @@ function createStreamingPromptState(formatToolCalls = false, options) {
     emittedToolCallIds: new Set,
     toolEventMode,
     onToolEvent,
+    onThought,
     finalize() {
       if (this.pendingLine.trim().length > 0) {
         parseStreamingChunks(this, this.pendingLine);
@@ -446,6 +453,14 @@ function parseStreamingChunks(state, line) {
     }
     return;
   }
+  const isThoughtChunk = update.sessionUpdate === "agent_thought_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
+  if (isThoughtChunk) {
+    const chunk2 = update.content.text;
+    if (chunk2.length > 0) {
+      state.onThought?.(chunk2);
+    }
+    return;
+  }
   const isMessageChunk = update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && typeof update.content.text === "string";
   if (!isMessageChunk)
     return;
@@ -473,7 +488,7 @@ function formatToolCallEvent(update, sessionUpdate) {
   if (title.length === 0)
     return null;
   const emoji = TOOL_KIND_EMOJI[kind] ?? DEFAULT_TOOL_EMOJI;
-  const inputSummary = summarizeToolInput(update.rawInput, title);
+  const inputSummary = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
   const status = readString(update, "status");
   if (!inputSummary && status === "pending")
     return null;
@@ -504,15 +519,23 @@ function buildToolUseEvent(update) {
   })();
   const title = (update.title ?? "").trim();
   const toolName = title || "Tool";
-  const summaryRaw = summarizeToolInput(update.rawInput, title);
+  const summaryRaw = summarizeToolInput(update.rawInput, title) || summarizeToolInput(update.rawOutput, title);
   const summary = summaryRaw && summaryRaw !== title ? summaryRaw : undefined;
   const statusRaw = readString(update, "status");
   const status = statusRaw === "completed" || statusRaw === "success" ? "success" : statusRaw === "failed" || statusRaw === "error" ? "error" : "running";
+  const rawInput = update.rawInput;
+  const content = update.content;
+  const rawOutput = update.rawOutput;
+  const locations = update.locations;
   return {
     toolCallId,
     toolName,
     kind,
     ...summary ? { summary } : {},
+    ...rawInput !== undefined ? { rawInput } : {},
+    ...content !== undefined ? { content } : {},
+    ...rawOutput !== undefined ? { rawOutput } : {},
+    ...locations !== undefined ? { locations } : {},
     status
   };
 }
@@ -831,6 +854,8 @@ function buildQueueOwnerPayload(input) {
     nonInteractivePermissions: input.nonInteractivePermissions,
     ttlMs: input.ttlMs ?? 300000,
     maxQueueDepth: input.maxQueueDepth ?? 16,
+    ...Number.isFinite(input.promptRetries) ? { promptRetries: input.promptRetries } : {},
+    ...input.sessionOptions ? { sessionOptions: input.sessionOptions } : {},
     mcpServers: input.mcpServers
   };
 }
@@ -1113,6 +1138,7 @@ class BridgeRuntime {
   async updatePermissionPolicy(policy) {
     this.options.permissionMode = policy.permissionMode;
     this.options.nonInteractivePermissions = policy.nonInteractivePermissions;
+    this.options.permissionPolicy = policy.permissionPolicy;
     return {};
   }
   async hasSession(input) {
@@ -1124,6 +1150,26 @@ class BridgeRuntime {
     const result = await this.run(spawnSpec.command, spawnSpec.args);
     return { exists: result.code === 0 };
   }
+  async tailSessionHistory(input) {
+    const candidates = [
+      ["sessions", "history", "quiet", "-s", input.name, String(input.lines)],
+      ["sessions", "history", "quiet", input.name, String(input.lines)],
+      ["sessions", "history", "-s", input.name, "--tail", String(input.lines)],
+      ["sessions", "history", input.name, "--tail", String(input.lines)],
+      ["sessions", "history", "--name", input.name, "--tail", String(input.lines)]
+    ];
+    let lastResult;
+    for (const tailArgs of candidates) {
+      const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, tailArgs));
+      const result = await this.run(spawnSpec.command, spawnSpec.args);
+      if (result.code === 0) {
+        return { text: result.stdout.trimEnd() };
+      }
+      lastResult = result;
+    }
+    const message = lastResult?.stderr || lastResult?.stdout || "sessions history failed";
+    throw new Error(message);
+  }
   async ensureSession(input, onProgress) {
     onProgress?.("spawn");
     const onStderrLine = onProgress ? (line) => {
@@ -1346,7 +1392,11 @@ class BridgeRuntime {
     const permissionMode = this.options.permissionMode ?? "approve-all";
     const nonInteractivePermissions = this.options.nonInteractivePermissions ?? "deny";
     const modeFlag = permissionModeToFlag(permissionMode);
-    return [modeFlag, "--non-interactive-permissions", nonInteractivePermissions];
+    const args = [modeFlag, "--non-interactive-permissions", nonInteractivePermissions];
+    if (typeof this.options.permissionPolicy === "string" && this.options.permissionPolicy.trim().length > 0) {
+      args.push("--permission-policy", this.options.permissionPolicy);
+    }
+    return args;
   }
 }
 function spawnCapture(command, args, options) {
@@ -1398,7 +1448,8 @@ async function runStreamingPrompt(command, args, onEvent, options = {}) {
     const toolEventMode = options.toolEventMode ?? "text";
     const state = createStreamingPromptState(options.formatToolCalls ?? false, {
       mode: toolEventMode,
-      ...onEvent && (toolEventMode === "structured" || toolEventMode === "both") ? { onToolEvent: (toolEvent) => onEvent({ type: "prompt.tool_event", event: toolEvent }) } : {}
+      ...onEvent && (toolEventMode === "structured" || toolEventMode === "both") ? { onToolEvent: (toolEvent) => onEvent({ type: "prompt.tool_event", event: toolEvent }) } : {},
+      ...onEvent ? { onThought: (chunk) => onEvent({ type: "prompt.thought", text: chunk }) } : {}
     });
     let lastReplyAt = now();
     const flushBuffer = () => {
@@ -1514,6 +1565,7 @@ var BRIDGE_METHODS = new Set([
   "updatePermissionPolicy",
   "hasSession",
   "ensureSession",
+  "tailSessionHistory",
   "prompt",
   "setMode",
   "cancel",
@@ -1522,6 +1574,7 @@ var BRIDGE_METHODS = new Set([
 var SESSION_SCOPED_METHODS = new Set([
   "hasSession",
   "ensureSession",
+  "tailSessionHistory",
   "prompt",
   "setMode",
   "cancel",
@@ -1596,6 +1649,14 @@ class BridgeServer {
           cwd: requireString(params, "cwd"),
           name: requireString(params, "name")
         });
+      case "tailSessionHistory":
+        return await this.runtime.tailSessionHistory({
+          agent: requireString(params, "agent"),
+          agentCommand: asOptionalString(params.agentCommand),
+          cwd: requireString(params, "cwd"),
+          name: requireString(params, "name"),
+          lines: requirePositiveInt(params, "lines")
+        });
       case "ensureSession":
         return await this.runtime.ensureSession({
           agent: requireString(params, "agent"),
@@ -1647,6 +1708,12 @@ class BridgeServer {
               event: "prompt.tool_event",
               toolEvent: event.event
             }));
+          } else if (event.type === "prompt.thought") {
+            writeLine?.(encodeBridgePromptThoughtEvent({
+              id: requestId,
+              event: "prompt.thought",
+              text: event.text
+            }));
           }
         });
       case "setMode":
@@ -1745,6 +1812,13 @@ function requireString(params, key) {
   }
   return value;
 }
+function requirePositiveInt(params, key) {
+  const value = params[key];
+  if (typeof value !== "number" || !Number.isFinite(value) || !Number.isInteger(value) || value <= 0) {
+    throw new BridgeInvalidRequestError(`${key} must be a positive integer`);
+  }
+  return value;
+}
 function requirePromptText(params, media) {
   const value = params.text;
   if (typeof value !== "string") {

package/dist/channels/types.d.ts

@@ -71,6 +71,10 @@ export interface ToolUseEvent {
     kind: ToolUseKind;
     /** Best-effort one-line summary derived from `rawInput`. */
     summary?: string;
+    rawInput?: unknown;
+    content?: unknown;
+    rawOutput?: unknown;
+    locations?: unknown;
     status: ToolUseStatus;
     /** Set when status transitions out of "running". */
     durationMs?: number;