weacpx 0.1.2 → 0.1.3

package/dist/bridge/bridge-main.js

@@ -43,6 +43,123 @@ var init_spawn_command = __esm(() => {
   SCRIPT_FILE_PATTERN = /\.(c|m)?js$/i;
 });
 
+// src/transport/prompt-output.ts
+function getPromptText(result) {
+  const stdoutOutput = extractPromptOutput(result.stdout);
+  if (result.code === 0) {
+    return sanitizePromptText(stdoutOutput.text);
+  }
+  const preferredError = extractPromptFailureMessage(result);
+  if (preferredError) {
+    throw new Error(preferredError);
+  }
+  const stderrOutput = extractPromptOutput(result.stderr);
+  const partialReply = [stdoutOutput, stderrOutput].filter((output) => output.hasAgentMessage && output.text.length > 0).map((output) => sanitizePromptText(output.text)).find((text) => text.length > 0);
+  if (partialReply) {
+    return partialReply;
+  }
+  throw new Error(`command failed with exit code ${result.code}`);
+}
+function normalizeCommandError(result) {
+  const preferredError = extractPromptFailureMessage(result);
+  if (preferredError) {
+    return preferredError;
+  }
+  return result.stdout.trim() || null;
+}
+function extractPromptFailureMessage(result) {
+  const rpcMessages = extractJsonRpcErrorMessages(result.stderr).concat(extractJsonRpcErrorMessages(result.stdout)).filter((message) => message.length > 0);
+  const preferredMessage = [...rpcMessages].reverse().find((message) => message !== "Resource not found");
+  if (preferredMessage) {
+    return preferredMessage;
+  }
+  if (rpcMessages.length > 0) {
+    return rpcMessages[rpcMessages.length - 1] ?? null;
+  }
+  const stderrText = result.stderr.trim();
+  if (stderrText.length > 0) {
+    return stderrText;
+  }
+  return null;
+}
+function extractPromptOutput(output) {
+  const lines = output.split(`
+`).map((line) => line.trim()).filter((line) => line.length > 0);
+  const messageSegments = [];
+  let currentSegment = "";
+  let hasAgentMessage = false;
+  for (const line of lines) {
+    try {
+      const event = JSON.parse(line);
+      const isMessageChunk = event.method === "session/update" && event.params?.update?.sessionUpdate === "agent_message_chunk" && event.params.update.content?.type === "text" && typeof event.params.update.content.text === "string";
+      if (isMessageChunk) {
+        hasAgentMessage = true;
+        const chunk = event.params.update.content.text ?? "";
+        if (chunk.length > 0) {
+          currentSegment += chunk;
+        }
+        continue;
+      }
+      if (currentSegment.trim().length > 0) {
+        messageSegments.push(currentSegment.trim());
+      }
+      currentSegment = "";
+    } catch {
+      if (currentSegment.trim().length > 0) {
+        messageSegments.push(currentSegment.trim());
+        currentSegment = "";
+      }
+    }
+  }
+  if (currentSegment.trim().length > 0) {
+    messageSegments.push(currentSegment.trim());
+  }
+  if (messageSegments.length > 0) {
+    return {
+      text: messageSegments[messageSegments.length - 1],
+      hasAgentMessage
+    };
+  }
+  return {
+    text: output.trim(),
+    hasAgentMessage
+  };
+}
+function sanitizePromptText(text) {
+  const trimmed = text.trim();
+  const paragraphs = trimmed.split(/\n\s*\n/);
+  if (paragraphs.length < 2) {
+    return trimmed;
+  }
+  const firstParagraph = paragraphs[0].trim().replace(/\s+/g, " ").toLowerCase();
+  if (!looksLikeWorkflowPreamble(firstParagraph)) {
+    return trimmed;
+  }
+  return paragraphs.slice(1).join(`
+
+`).trim();
+}
+function looksLikeWorkflowPreamble(paragraph) {
+  if (!paragraph.startsWith("using ")) {
+    return false;
+  }
+  return paragraph.includes("using-superpowers") || paragraph.includes("repo workflow requirement") || paragraph.includes("workflow requirement") || paragraph.includes("before responding") || paragraph.includes("skill check");
+}
+function extractJsonRpcErrorMessages(output) {
+  return output.split(`
+`).map((line) => line.trim()).filter((line) => line.length > 0).flatMap((line) => {
+    try {
+      const payload = JSON.parse(line);
+      if (typeof payload.error?.message === "string" && payload.error.message.length > 0) {
+        return [payload.error.message];
+      }
+    } catch {
+      return [];
+    }
+    return [];
+  });
+}
+
 // src/bridge/bridge-main.ts
 import { createInterface } from "node:readline";
 
@@ -169,17 +286,14 @@ class BridgeRuntime {
     return {};
   }
   async prompt(input) {
-    const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
+    const spawnSpec = resolveSpawnCommand(this.command, this.buildPromptArgs(input, [
       "prompt",
       "-s",
       input.name,
       input.text
     ]));
     const result = await this.run(spawnSpec.command, spawnSpec.args);
-    if (result.code !== 0) {
-      throw new Error(result.stderr || result.stdout || "prompt failed");
-    }
-    return { text: result.stdout.trim() };
+    return { text: getPromptText(result) };
   }
   async cancel(input) {
     const spawnSpec = resolveSpawnCommand(this.command, this.buildSessionArgs(input, [
@@ -205,6 +319,12 @@ class BridgeRuntime {
     }
     return ["--format", "quiet", "--cwd", input.cwd, input.agent, ...tail];
   }
+  buildPromptArgs(input, tail) {
+    if (input.agentCommand) {
+      return ["--format", "json", "--json-strict", "--cwd", input.cwd, "--agent", input.agentCommand, ...tail];
+    }
+    return ["--format", "json", "--json-strict", "--cwd", input.cwd, input.agent, ...tail];
+  }
 }
 async function defaultRunner(command, args) {
   return await new Promise((resolve, reject) => {

package/dist/cli.js

@@ -1440,6 +1440,9 @@ function parseCommand(input) {
     }
     return { kind: "session.attach", alias, agent, workspace, transportSession };
   }
+  if (command.startsWith("/") && isRecognizedCommand(command)) {
+    return { kind: "invalid", text: trimmed, recognizedCommand: command };
+  }
   return { kind: "prompt", text: trimmed };
 }
 function hasAnyFlag(parts, flags) {
@@ -1462,6 +1465,9 @@ function normalizeCommand(command) {
     return "/cancel";
   return command;
 }
+function isRecognizedCommand(command) {
+  return RECOGNIZED_COMMANDS.has(command);
+}
 function tokenizeCommand(input) {
   const tokens = [];
   let current = "";
@@ -1493,10 +1499,26 @@ function tokenizeCommand(input) {
   }
   return tokens;
 }
+var RECOGNIZED_COMMANDS;
+var init_parse_command = __esm(() => {
+  RECOGNIZED_COMMANDS = new Set([
+    "/help",
+    "/agents",
+    "/workspaces",
+    "/sessions",
+    "/status",
+    "/cancel",
+    "/session",
+    "/workspace",
+    "/use",
+    "/agent"
+  ]);
+});
 
 // src/commands/command-router.ts
 import { access } from "node:fs/promises";
 import { basename as basename2, normalize } from "node:path";
+import { homedir } from "node:os";
 
 class CommandRouter {
   sessions;
@@ -1520,6 +1542,19 @@ class CommandRouter {
     });
     return await this.executeCommand(chatKey, command.kind, startedAt, async () => {
       switch (command.kind) {
+        case "invalid":
+          return {
+            text: [
+              "无法识别的命令格式。",
+              "",
+              "正确的会话创建格式：",
+              "/session new <别名> --agent <Agent名> --ws <工作区名>",
+              "",
+              "例如：",
+              "/session new demo --agent claude --ws weacpx"
+            ].join(`
+`)
+          };
         case "help":
           return { text: renderHelpText() };
         case "agents":
@@ -1553,10 +1588,11 @@ class CommandRouter {
           if (!this.config || !this.configStore) {
             return { text: "当前没有加载可写入的配置。" };
           }
-          if (!await pathExists(command.cwd)) {
+          const wsCwd = normalizePathForWorkspace(command.cwd);
+          if (!await pathExists(wsCwd)) {
             return { text: `工作区路径不存在：${command.cwd}` };
           }
-          const updated = await this.configStore.upsertWorkspace(command.name, command.cwd);
+          const updated = await this.configStore.upsertWorkspace(command.name, wsCwd);
           this.replaceConfig(updated);
           return { text: `工作区「${command.name}」已保存` };
         }
@@ -1755,7 +1791,17 @@ class CommandRouter {
 `)
       };
     }
-    throw error;
+    if (!isPartialPromptOutputError(message)) {
+      throw error;
+    }
+    return {
+      text: [
+        `当前会话「${session.alias}」执行中断，未收到最终回复。`,
+        "请直接重试；如果长时间无响应，可先发送 /cancel 后再重试。",
+        `错误信息：${summarizeTransportError(message)}`
+      ].join(`
+`)
+    };
   }
   renderSessionCreationError(session, error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -1891,7 +1937,8 @@ async function pathExists(path) {
   }
 }
 function normalizePathForWorkspace(path) {
-  return normalize(path);
+  const expanded = path.startsWith("~") ? homedir() + path.slice(1) : path;
+  return normalize(expanded);
 }
 function sameWorkspacePath(left, right) {
   const normalizedLeft = normalizePathForWorkspace(left);
@@ -1901,9 +1948,16 @@ function sameWorkspacePath(left, right) {
   }
   return normalizedLeft === normalizedRight;
 }
+function summarizeTransportError(message) {
+  return message.replace(/\s+/g, " ").trim().slice(0, 200);
+}
+function isPartialPromptOutputError(message) {
+  return message.includes("未收到最终回复");
+}
 var init_command_router = __esm(() => {
   init_agent_templates();
   init_app_logger();
+  init_parse_command();
 });
 
 // src/config/resolve-agent-command.ts
@@ -2319,17 +2373,27 @@ async function runConsole(paths, deps) {
         configPath: paths.configPath,
         statePath: paths.statePath
       });
-      heartbeatTimer = setIntervalFn(() => deps.daemonRuntime?.heartbeat(), deps.heartbeatIntervalMs ?? 30000);
+      heartbeatTimer = setIntervalFn(() => {
+        deps.daemonRuntime?.heartbeat().catch(() => {});
+      }, deps.heartbeatIntervalMs ?? 30000);
     }
     await sdk.start(runtime.agent);
   } finally {
+    let disposeError = null;
     if (heartbeatTimer !== null) {
       clearIntervalFn(heartbeatTimer);
     }
-    await runtime.dispose();
+    try {
+      await runtime.dispose();
+    } catch (error) {
+      disposeError = error;
+    }
     if (deps.daemonRuntime) {
       await deps.daemonRuntime.stop();
     }
+    if (disposeError) {
+      throw disposeError;
+    }
   }
 }
 
@@ -2376,6 +2440,13 @@ class AcpxBridgeClient {
     }
     pending.reject(new Error(response.error.message));
   }
+  handleExit(error) {
+    const pendingRequests = [...this.pending.values()];
+    this.pending.clear();
+    for (const pending of pendingRequests) {
+      pending.reject(error);
+    }
+  }
 }
 function buildBridgeSpawnSpec(options) {
   if (options.execPath.endsWith("bun")) {
@@ -2415,6 +2486,10 @@ async function spawnAcpxBridgeClient(options = {}) {
   });
   child.on("exit", () => {
     output.close();
+    client.handleExit(new Error("bridge process exited before responding"));
+  });
+  child.on("error", (error) => {
+    client.handleExit(error);
   });
   client.waitUntilReady = async () => {
     await client.request("ping", {});
@@ -2490,6 +2565,123 @@ var init_spawn_command = __esm(() => {
   SCRIPT_FILE_PATTERN = /\.(c|m)?js$/i;
 });
 
+// src/transport/prompt-output.ts
+function getPromptText(result) {
+  const stdoutOutput = extractPromptOutput(result.stdout);
+  if (result.code === 0) {
+    return sanitizePromptText(stdoutOutput.text);
+  }
+  const preferredError = extractPromptFailureMessage(result);
+  if (preferredError) {
+    throw new Error(preferredError);
+  }
+  const stderrOutput = extractPromptOutput(result.stderr);
+  const partialReply = [stdoutOutput, stderrOutput].filter((output) => output.hasAgentMessage && output.text.length > 0).map((output) => sanitizePromptText(output.text)).find((text) => text.length > 0);
+  if (partialReply) {
+    return partialReply;
+  }
+  throw new Error(`command failed with exit code ${result.code}`);
+}
+function normalizeCommandError(result) {
+  const preferredError = extractPromptFailureMessage(result);
+  if (preferredError) {
+    return preferredError;
+  }
+  return result.stdout.trim() || null;
+}
+function extractPromptFailureMessage(result) {
+  const rpcMessages = extractJsonRpcErrorMessages(result.stderr).concat(extractJsonRpcErrorMessages(result.stdout)).filter((message) => message.length > 0);
+  const preferredMessage = [...rpcMessages].reverse().find((message) => message !== "Resource not found");
+  if (preferredMessage) {
+    return preferredMessage;
+  }
+  if (rpcMessages.length > 0) {
+    return rpcMessages[rpcMessages.length - 1] ?? null;
+  }
+  const stderrText = result.stderr.trim();
+  if (stderrText.length > 0) {
+    return stderrText;
+  }
+  return null;
+}
+function extractPromptOutput(output) {
+  const lines = output.split(`
+`).map((line) => line.trim()).filter((line) => line.length > 0);
+  const messageSegments = [];
+  let currentSegment = "";
+  let hasAgentMessage = false;
+  for (const line of lines) {
+    try {
+      const event = JSON.parse(line);
+      const isMessageChunk = event.method === "session/update" && event.params?.update?.sessionUpdate === "agent_message_chunk" && event.params.update.content?.type === "text" && typeof event.params.update.content.text === "string";
+      if (isMessageChunk) {
+        hasAgentMessage = true;
+        const chunk = event.params.update.content.text ?? "";
+        if (chunk.length > 0) {
+          currentSegment += chunk;
+        }
+        continue;
+      }
+      if (currentSegment.trim().length > 0) {
+        messageSegments.push(currentSegment.trim());
+      }
+      currentSegment = "";
+    } catch {
+      if (currentSegment.trim().length > 0) {
+        messageSegments.push(currentSegment.trim());
+        currentSegment = "";
+      }
+    }
+  }
+  if (currentSegment.trim().length > 0) {
+    messageSegments.push(currentSegment.trim());
+  }
+  if (messageSegments.length > 0) {
+    return {
+      text: messageSegments[messageSegments.length - 1],
+      hasAgentMessage
+    };
+  }
+  return {
+    text: output.trim(),
+    hasAgentMessage
+  };
+}
+function sanitizePromptText(text) {
+  const trimmed = text.trim();
+  const paragraphs = trimmed.split(/\n\s*\n/);
+  if (paragraphs.length < 2) {
+    return trimmed;
+  }
+  const firstParagraph = paragraphs[0].trim().replace(/\s+/g, " ").toLowerCase();
+  if (!looksLikeWorkflowPreamble(firstParagraph)) {
+    return trimmed;
+  }
+  return paragraphs.slice(1).join(`
+
+`).trim();
+}
+function looksLikeWorkflowPreamble(paragraph) {
+  if (!paragraph.startsWith("using ")) {
+    return false;
+  }
+  return paragraph.includes("using-superpowers") || paragraph.includes("repo workflow requirement") || paragraph.includes("workflow requirement") || paragraph.includes("before responding") || paragraph.includes("skill check");
+}
+function extractJsonRpcErrorMessages(output) {
+  return output.split(`
+`).map((line) => line.trim()).filter((line) => line.length > 0).flatMap((line) => {
+    try {
+      const payload = JSON.parse(line);
+      if (typeof payload.error?.message === "string" && payload.error.message.length > 0) {
+        return [payload.error.message];
+      }
+    } catch {
+      return [];
+    }
+    return [];
+  });
+}
+
 // src/transport/acpx-cli/node-pty-helper.ts
 import { chmod as chmodFs } from "node:fs/promises";
 import { dirname as dirname7, join as join3 } from "node:path";
@@ -2598,8 +2790,8 @@ class AcpxCliTransport {
     });
   }
   async prompt(session, text) {
-    const output = await this.run(this.buildPromptArgs(session, text));
-    return { text: sanitizePromptText(extractPromptText(output)) };
+    const result = await this.runCommand(this.command, this.buildPromptArgs(session, text));
+    return { text: getPromptText(result) };
   }
   async cancel(session) {
     const output = await this.run(this.buildArgs(session, [
@@ -2689,86 +2881,6 @@ function renderCommandForError(args) {
   }
   return rendered.join(" ");
 }
-function extractPromptText(output) {
-  const lines = output.split(`
-`).map((line) => line.trim()).filter((line) => line.length > 0);
-  const messageSegments = [];
-  let currentSegment = "";
-  for (const line of lines) {
-    try {
-      const event = JSON.parse(line);
-      const isMessageChunk = event.method === "session/update" && event.params?.update?.sessionUpdate === "agent_message_chunk" && event.params.update.content?.type === "text" && typeof event.params.update.content.text === "string";
-      if (isMessageChunk) {
-        const chunk = event.params.update.content.text ?? "";
-        if (chunk.length > 0) {
-          currentSegment += chunk;
-        }
-        continue;
-      }
-      if (currentSegment.trim().length > 0) {
-        messageSegments.push(currentSegment.trim());
-      }
-      currentSegment = "";
-    } catch {
-      if (currentSegment.trim().length > 0) {
-        messageSegments.push(currentSegment.trim());
-        currentSegment = "";
-      }
-    }
-  }
-  if (currentSegment.trim().length > 0) {
-    messageSegments.push(currentSegment.trim());
-  }
-  if (messageSegments.length > 0) {
-    return messageSegments[messageSegments.length - 1];
-  }
-  return output.trim();
-}
-function sanitizePromptText(text) {
-  const trimmed = text.trim();
-  const paragraphs = trimmed.split(/\n\s*\n/);
-  if (paragraphs.length < 2) {
-    return trimmed;
-  }
-  const firstParagraph = paragraphs[0].trim().replace(/\s+/g, " ").toLowerCase();
-  if (!looksLikeWorkflowPreamble(firstParagraph)) {
-    return trimmed;
-  }
-  return paragraphs.slice(1).join(`
-
-`).trim();
-}
-function looksLikeWorkflowPreamble(paragraph) {
-  if (!paragraph.startsWith("using ")) {
-    return false;
-  }
-  return paragraph.includes("using-superpowers") || paragraph.includes("repo workflow requirement") || paragraph.includes("workflow requirement") || paragraph.includes("before responding") || paragraph.includes("skill check");
-}
-function normalizeCommandError(result) {
-  const rpcMessages = extractJsonRpcErrorMessages(result.stderr).concat(extractJsonRpcErrorMessages(result.stdout)).filter((message) => message.length > 0);
-  const preferredMessage = [...rpcMessages].reverse().find((message) => message !== "Resource not found");
-  if (preferredMessage) {
-    return preferredMessage;
-  }
-  if (rpcMessages.length > 0) {
-    return rpcMessages[rpcMessages.length - 1] ?? null;
-  }
-  return result.stderr.trim() || result.stdout.trim() || null;
-}
-function extractJsonRpcErrorMessages(output) {
-  return output.split(`
-`).map((line) => line.trim()).filter((line) => line.length > 0).flatMap((line) => {
-    try {
-      const payload = JSON.parse(line);
-      if (typeof payload.error?.message === "string" && payload.error.message.length > 0) {
-        return [payload.error.message];
-      }
-    } catch {
-      return [];
-    }
-    return [];
-  });
-}
 var require3;
 var init_acpx_cli_transport = __esm(() => {
   init_spawn_command();
@@ -2783,7 +2895,7 @@ __export(exports_main, {
   main: () => main2,
   buildApp: () => buildApp
 });
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import { dirname as dirname8, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 async function buildApp(paths, deps = {}) {
@@ -2844,7 +2956,7 @@ async function main2() {
   }
 }
 function resolveRuntimePaths() {
-  const home = process.env.HOME ?? homedir();
+  const home = process.env.HOME ?? homedir2();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
@@ -2880,7 +2992,7 @@ var init_main = __esm(async () => {
 });
 
 // src/cli.ts
-import { homedir as homedir2 } from "node:os";
+import { homedir as homedir3 } from "node:os";
 import { sep } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
@@ -2929,10 +3041,18 @@ class DaemonController {
   paths;
   deps;
   statusStore;
+  startupPollIntervalMs;
+  startupTimeoutMs;
+  onStartupPoll;
   constructor(paths, deps) {
     this.paths = paths;
     this.deps = deps;
     this.statusStore = new DaemonStatusStore(paths.statusFile);
+    this.startupPollIntervalMs = deps.startupPollIntervalMs ?? 50;
+    this.startupTimeoutMs = deps.startupTimeoutMs ?? 5000;
+    this.onStartupPoll = deps.onStartupPoll ?? (async () => {
+      await new Promise((resolve) => setTimeout(resolve, this.startupPollIntervalMs));
+    });
   }
   async getStatus() {
     const pid = await this.loadPid();
@@ -2958,8 +3078,10 @@ class DaemonController {
     if (current.state === "running") {
       return { state: "already-running", pid: current.pid };
     }
+    await this.statusStore.clear();
     const pid = await this.deps.spawnDetached();
     await this.writePid(pid);
+    await this.waitForStartupMetadata(pid);
     return { state: "started", pid };
   }
   async stop() {
@@ -2994,6 +3116,21 @@ class DaemonController {
     await rm2(this.paths.pidFile, { force: true });
     await this.statusStore.clear();
   }
+  async waitForStartupMetadata(pid) {
+    const deadline = Date.now() + this.startupTimeoutMs;
+    while (Date.now() < deadline) {
+      const status = await this.statusStore.load();
+      if (status?.pid === pid) {
+        return;
+      }
+      if (!this.deps.isProcessRunning(pid)) {
+        await this.clearRuntimeFiles();
+        throw new Error(`weacpx daemon exited before reporting ready state (pid ${pid})`);
+      }
+      await this.onStartupPoll();
+    }
+    throw new Error(`weacpx daemon did not report ready state within ${this.startupTimeoutMs}ms (pid ${pid})`);
+  }
 }
 
 // src/daemon/create-daemon-controller.ts
@@ -3100,6 +3237,7 @@ async function spawnWindowsHiddenProcess(request) {
         return;
       }
       settled = true;
+      child.stdout?.destroy();
       child.unref();
       resolve(pid);
     });
@@ -3315,7 +3453,7 @@ function createDefaultController() {
   });
 }
 function requireHome() {
-  const home = process.env.HOME ?? homedir2();
+  const home = process.env.HOME ?? homedir3();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weacpx",
   "description": "用微信远程控制 `acpx` 会话的控制台, 底层基于 `weixin-agent-sdk` 与 `acpx`",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "index.js",
   "directories": {
     "doc": "docs",