duclaw-cli 1.8.14 → 1.8.15

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.14" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.15" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -32629,7 +32629,7 @@ var chokidar_default = { watch, FSWatcher };
 var import_node_cron = __toESM(require_node_cron());
 
 // src/agent/createAgent.ts
-var import_node_crypto10 = require("node:crypto");
+var import_node_crypto11 = require("node:crypto");
 var import_node_fs6 = require("node:fs");
 
 // src/background/BackgroundManager.ts
@@ -39476,13 +39476,13 @@ var Diff = class {
       editLength++;
     };
     if (callback) {
-      (function exec2() {
+      (function exec() {
         setTimeout(function() {
           if (editLength > maxEditLength || Date.now() > abortAfterTimestamp) {
             return callback(void 0);
           }
           if (!execEditLength()) {
-            exec2();
+            exec();
           }
         }, 0);
       })();
@@ -42873,6 +42873,7 @@ var mailboxFollowup = {
 
 // src/tools/tools/Bash.ts
 var import_node_child_process = require("node:child_process");
+var import_node_crypto7 = require("node:crypto");
 var import_node_fs4 = require("node:fs");
 var DESCRIPTION29 = `\u5728\u7CFB\u7EDF shell \u4E2D\u6267\u884C\u547D\u4EE4\u3002
 
@@ -42888,17 +42889,24 @@ var DESCRIPTION29 = `\u5728\u7CFB\u7EDF shell \u4E2D\u6267\u884C\u547D\u4EE4\u30
 - Bash \u53EF\u4EE5\u7528\u6765\u8FD0\u884C\u6D4B\u8BD5\u3001\u683C\u5F0F\u5316\u3001\u8BAD\u7EC3\u3001\u63A8\u7406\u3001\u67E5\u770B\u76EE\u5F55\u3001\u6267\u884C\u5DF2\u7ECF\u5199\u597D\u7684\u811A\u672C\u3002
 
 \u53C2\u6570\uFF1A
+- action: \u64CD\u4F5C\u7C7B\u578B\uFF08\u53EF\u9009\uFF0Crun/check/write/stop\uFF0C\u9ED8\u8BA4 run\uFF09
 - command: \u8981\u6267\u884C\u7684 shell \u547D\u4EE4
 - cwd: \u547D\u4EE4\u6267\u884C\u7684\u5DE5\u4F5C\u76EE\u5F55\uFF08\u53EF\u9009\uFF0C\u9ED8\u8BA4\u4E3A\u5F53\u524D\u76EE\u5F55\uFF09
-- timeout: \u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF0C\u53EF\u9009\uFF0C\u9ED8\u8BA4 30000ms\uFF09
+- timeout: \u7B49\u5F85\u547D\u4EE4\u5B8C\u6210\u7684\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF0C\u53EF\u9009\uFF0C\u9ED8\u8BA4 30000ms\uFF09\u3002\u8D85\u8FC7\u540E\u547D\u4EE4\u7EE7\u7EED\u5728\u540E\u53F0\u8FD0\u884C\uFF0C\u5E76\u8FD4\u56DE session_id
+- session_id: \u540E\u53F0\u8FD0\u884C\u4E2D\u7684 Bash \u4F1A\u8BDD ID\uFF08check/write/stop \u65F6\u4F7F\u7528\uFF09
+- input: \u5199\u5165\u540E\u53F0\u4F1A\u8BDD stdin \u7684\u5185\u5BB9\uFF08write \u65F6\u4F7F\u7528\uFF09
 
 \u6CE8\u610F\u4E8B\u9879\uFF1A
 - \u4E0D\u8981\u6267\u884C\u7834\u574F\u6027\u547D\u4EE4\uFF08\u5982 rm -rf /\uFF09
-- \u957F\u65F6\u95F4\u8FD0\u884C\u7684\u547D\u4EE4\uFF08\u5982\u542F\u52A8\u670D\u52A1\u5668\uFF09\u4F1A\u5728\u8D85\u65F6\u540E\u88AB\u7EC8\u6B62
+- \u957F\u65F6\u95F4\u8FD0\u884C\u7684\u547D\u4EE4\uFF08\u5982\u542F\u52A8\u670D\u52A1\u5668\uFF09\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\u540E\u4F1A\u4FDD\u7559\u4F1A\u8BDD\uFF0C\u53EF\u7528 session_id \u67E5\u8BE2\u589E\u91CF\u8F93\u51FA
 - \u5982\u679C\u4F60\u5904\u4E8E\u90E8\u95E8\u5DE5\u4F5C\u533A\u6A21\u5F0F\uFF0Ccwd \u5FC5\u987B\u5728\u5DE5\u4F5C\u533A\u8303\u56F4\u5185
 `;
 var MAX_OUTPUT_LENGTH = 1e4;
+var MAX_SESSION_OUTPUT_LENGTH = 5e4;
+var DEFAULT_TIMEOUT_MS = 3e4;
+var DEFAULT_SESSION_TTL_MS = 30 * 60 * 1e3;
 var SHELL_CANDIDATES2 = ["/bin/sh", "/usr/bin/sh", "/bin/bash"];
+var sessions = /* @__PURE__ */ new Map();
 function findExecutableShell2() {
   for (const shell of SHELL_CANDIDATES2) {
     try {
@@ -42928,12 +42936,70 @@ function validateCwd(cwd) {
     return `[bash] \u9519\u8BEF: cwd \u4E0D\u53EF\u7528: ${cwd} (${err.message})`;
   }
 }
+function truncateOutput(output, limit = MAX_OUTPUT_LENGTH) {
+  if (output.length <= limit) return output;
+  return output.slice(0, limit) + `
+... (\u8F93\u51FA\u622A\u65AD\uFF0C\u5171 ${output.length} \u5B57\u7B26)`;
+}
+function appendSessionOutput(session, chunk, source) {
+  const text2 = chunk.toString();
+  session.output += source === "stderr" ? `[stderr]
+${text2}` : text2;
+  if (session.output.length > MAX_SESSION_OUTPUT_LENGTH) {
+    const removed = session.output.length - MAX_SESSION_OUTPUT_LENGTH;
+    session.output = session.output.slice(removed);
+    session.readOffset = Math.max(0, session.readOffset - removed);
+  }
+}
+function finishSession(session, status, exitCode, signal) {
+  if (session.status !== "running") return;
+  session.status = status;
+  session.exitCode = exitCode;
+  session.signal = signal;
+  session.finishedAt = (/* @__PURE__ */ new Date()).toISOString();
+  if (status === "failed") {
+    const prefix = session.output ? "\n" : "";
+    session.output += `${prefix}[bash] \u547D\u4EE4\u9000\u51FA\u7801: ${exitCode ?? "unknown"}${signal ? `, signal: ${signal}` : ""}`;
+  }
+}
+function renderSessionDelta(session, prefix) {
+  const delta = session.output.slice(session.readOffset);
+  session.readOffset = session.output.length;
+  const body = delta ? truncateOutput(delta) : "[bash] \u6682\u65E0\u65B0\u8F93\u51FA";
+  const state = session.status === "running" ? `\u4ECD\u5728\u8FD0\u884C` : `\u5DF2\u7ED3\u675F\uFF08status=${session.status}${session.exitCode === void 0 ? "" : `, exitCode=${session.exitCode}`}\uFF09`;
+  return `${prefix}
+[bash] session_id=${session.id} ${state}
+${body}`;
+}
+function waitForClose(session, waitMs) {
+  if (session.status !== "running") return Promise.resolve("closed");
+  return new Promise((resolve11) => {
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve11("timeout");
+    }, waitMs);
+    const onClose = () => {
+      cleanup();
+      resolve11("closed");
+    };
+    const cleanup = () => {
+      clearTimeout(timer);
+      session.child.off("close", onClose);
+    };
+    session.child.once("close", onClose);
+  });
+}
 var bashTool = {
   name: `bash`,
   description: DESCRIPTION29,
   input_schema: {
     type: `object`,
     properties: {
+      action: {
+        type: `string`,
+        enum: [`run`, `check`, `write`, `stop`],
+        description: `\u64CD\u4F5C\u7C7B\u578B\uFF1Arun \u6267\u884C\u547D\u4EE4\uFF1Bcheck \u8BFB\u53D6\u540E\u53F0\u4F1A\u8BDD\u589E\u91CF\u8F93\u51FA\uFF1Bwrite \u5411\u540E\u53F0\u4F1A\u8BDD stdin \u5199\u5165\u5185\u5BB9\uFF1Bstop \u505C\u6B62\u540E\u53F0\u4F1A\u8BDD\u3002\u9ED8\u8BA4 run`
+      },
       command: {
         type: `string`,
         description: `\u8981\u6267\u884C\u7684 shell \u547D\u4EE4`
@@ -42944,15 +43010,50 @@ var bashTool = {
       },
       timeout: {
         type: `number`,
-        description: `\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 30000`
+        description: `run \u65F6\u7B49\u5F85\u547D\u4EE4\u5B8C\u6210\u7684\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u9ED8\u8BA4 30000\u3002\u8D85\u8FC7\u540E\u8FD4\u56DE session_id\uFF0C\u547D\u4EE4\u7EE7\u7EED\u8FD0\u884C`
+      },
+      session_id: {
+        type: `string`,
+        description: `\u540E\u53F0 Bash \u4F1A\u8BDD ID\uFF0C\u7528\u4E8E check/write/stop`
+      },
+      input: {
+        type: `string`,
+        description: `write \u65F6\u5199\u5165 stdin \u7684\u5185\u5BB9`
       }
     },
-    required: [`command`]
+    required: []
   },
   async execute(input, userRequest) {
+    const action = input.action || "run";
+    const sessionId = input.session_id;
+    if (action === "check" || action === "write" || action === "stop") {
+      if (!sessionId) return `[bash] \u9519\u8BEF: ${action} \u9700\u8981 session_id`;
+      const session = sessions.get(sessionId);
+      if (!session) return `[bash] \u9519\u8BEF: \u672A\u627E\u5230 session_id: ${sessionId}`;
+      if (action === "write") {
+        if (session.status !== "running") {
+          return renderSessionDelta(session, `[bash] session ${session.id} \u5DF2\u4E0D\u5728\u8FD0\u884C\uFF0C\u65E0\u6CD5\u5199\u5165 stdin`);
+        }
+        const stdin = input.input;
+        if (stdin === void 0) return `[bash] \u9519\u8BEF: write \u9700\u8981 input`;
+        session.child.stdin.write(stdin);
+        return renderSessionDelta(session, `[bash] \u5DF2\u5199\u5165 session ${session.id} stdin`);
+      }
+      if (action === "stop") {
+        if (session.status === "running") {
+          session.child.kill("SIGTERM");
+          finishSession(session, "stopped", null, "SIGTERM");
+        }
+        return renderSessionDelta(session, `[bash] \u5DF2\u505C\u6B62 session ${session.id}`);
+      }
+      return renderSessionDelta(session, `[bash] \u5DF2\u68C0\u67E5 session ${session.id}`);
+    }
+    if (action !== "run") {
+      return `[bash] \u9519\u8BEF: \u4E0D\u652F\u6301\u7684 action: ${action}`;
+    }
     const command = input.command;
     const explicitCwd = input.cwd || void 0;
-    const timeout = input.timeout || 3e4;
+    const timeout = input.timeout || DEFAULT_TIMEOUT_MS;
     if (!command || command.trim() === "") {
       return `[bash] \u9519\u8BEF: command \u4E0D\u80FD\u4E3A\u7A7A`;
     }
@@ -42967,41 +43068,56 @@ var bashTool = {
     if (!shell) {
       return `[bash] \u9519\u8BEF: \u6267\u884C\u73AF\u5883\u7F3A\u5C11\u53EF\u7528 shell\uFF08\u5DF2\u68C0\u67E5 ${SHELL_CANDIDATES2.join(", ")}\uFF09\u3002\u8BF7\u5148\u68C0\u67E5\u5BB9\u5668\u955C\u50CF/rootfs/\u6302\u8F7D\u662F\u5426\u521D\u59CB\u5316\u5B8C\u6210\u3002`;
     }
-    return new Promise((resolve11) => {
+    return new Promise(async (resolve11) => {
       const options = {
-        timeout,
-        maxBuffer: 1024 * 1024,
-        // 1MB
-        env: { ...process.env, PAGER: "cat" },
-        shell
+        env: { ...process.env, PAGER: "cat" }
       };
       if (cwd) options.cwd = cwd;
-      (0, import_node_child_process.exec)(command, options, (error, stdout, stderr) => {
-        let output = "";
-        if (stdout) {
-          const trimmed = stdout.length > MAX_OUTPUT_LENGTH ? stdout.slice(0, MAX_OUTPUT_LENGTH) + `
-... (\u8F93\u51FA\u622A\u65AD\uFF0C\u5171 ${stdout.length} \u5B57\u7B26)` : stdout;
-          output += trimmed;
-        }
-        if (stderr) {
-          const trimmed = stderr.length > MAX_OUTPUT_LENGTH ? stderr.slice(0, MAX_OUTPUT_LENGTH) + `
-... (stderr \u622A\u65AD\uFF0C\u5171 ${stderr.length} \u5B57\u7B26)` : stderr;
-          output += (output ? "\n" : "") + `[stderr]
-${trimmed}`;
-        }
-        if (error) {
-          if (error.killed) {
-            output += `
-[bash] \u547D\u4EE4\u8D85\u65F6\uFF08${timeout}ms\uFF09\uFF0C\u5DF2\u7EC8\u6B62`;
-          } else if (!stderr) {
-            output += (output ? "\n" : "") + `[bash] \u9519\u8BEF: ${error.message}`;
-          }
-        }
-        if (!output) {
-          output = "[bash] \u547D\u4EE4\u6267\u884C\u6210\u529F\uFF08\u65E0\u8F93\u51FA\uFF09";
-        }
-        resolve11(output);
+      const child = (0, import_node_child_process.spawn)(shell, ["-c", command], {
+        ...options,
+        stdio: ["pipe", "pipe", "pipe"]
       });
+      const id = (0, import_node_crypto7.randomUUID)().slice(0, 8);
+      const session = {
+        id,
+        command,
+        child,
+        output: "",
+        readOffset: 0,
+        status: "running",
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        cleanupTimer: setTimeout(() => {
+          const current = sessions.get(id);
+          if (!current) return;
+          if (current.status === "running") {
+            current.child.kill("SIGTERM");
+            finishSession(current, "stopped", null, "SIGTERM");
+          }
+          sessions.delete(id);
+        }, DEFAULT_SESSION_TTL_MS)
+      };
+      sessions.set(id, session);
+      child.stdout.on("data", (chunk) => appendSessionOutput(session, chunk, "stdout"));
+      child.stderr.on("data", (chunk) => appendSessionOutput(session, chunk, "stderr"));
+      child.on("error", (err) => {
+        session.output += `[bash] \u9519\u8BEF: ${err.message}`;
+        finishSession(session, "failed");
+      });
+      child.on("close", (code, signal) => {
+        finishSession(session, code === 0 ? "completed" : "failed", code, signal);
+      });
+      const waitResult = await waitForClose(session, Math.max(0, timeout));
+      if (waitResult === "timeout" && session.status === "running") {
+        resolve11(renderSessionDelta(session, `[bash] \u547D\u4EE4\u4ECD\u5728\u8FD0\u884C\uFF0C\u5DF2\u4FDD\u7559\u540E\u53F0\u4F1A\u8BDD\u3002\u540E\u7EED\u4F7F\u7528 action=check \u548C session_id=${session.id} \u8BFB\u53D6\u8FDB\u5C55\uFF1B\u4F7F\u7528 action=stop \u53EF\u505C\u6B62\u3002`));
+        return;
+      }
+      clearTimeout(session.cleanupTimer);
+      sessions.delete(id);
+      let output = session.output;
+      if (!output) {
+        output = session.status === "completed" ? "[bash] \u547D\u4EE4\u6267\u884C\u6210\u529F\uFF08\u65E0\u8F93\u51FA\uFF09" : "[bash] \u547D\u4EE4\u6267\u884C\u5931\u8D25\uFF08\u65E0\u8F93\u51FA\uFF09";
+      }
+      resolve11(truncateOutput(output));
     });
   }
 };
@@ -43575,7 +43691,7 @@ var readDreamHistoryLimit = () => {
 var import_node_fs5 = require("node:fs");
 var import_node_os2 = require("node:os");
 var import_node_path12 = require("node:path");
-var import_node_crypto7 = require("node:crypto");
+var import_node_crypto8 = require("node:crypto");
 var SkillForgeEngine = class {
   proposalStorage;
   draftRoot;
@@ -43604,7 +43720,7 @@ var SkillForgeEngine = class {
     if (pending.some((p) => p.skillName === skillName)) {
       return null;
     }
-    const id = (0, import_node_crypto7.randomBytes)(4).toString("hex");
+    const id = (0, import_node_crypto8.randomBytes)(4).toString("hex");
     const draftDir = (0, import_node_path12.join)(this.draftRoot, userId, id);
     (0, import_node_fs5.mkdirSync)(draftDir, { recursive: true });
     (0, import_node_fs5.writeFileSync)((0, import_node_path12.join)(draftDir, "SKILL.md"), skillMd, "utf-8");
@@ -43852,7 +43968,7 @@ var skillForgeDrop = (engine) => ({
 });
 
 // src/memory/MemoryEngine.ts
-var import_node_crypto8 = require("node:crypto");
+var import_node_crypto9 = require("node:crypto");
 var MemoryEngine = class {
   storage;
   recallIndexStorage;
@@ -43880,7 +43996,7 @@ var MemoryEngine = class {
     }
     const now = Date.now();
     const memory = {
-      id: (0, import_node_crypto8.randomBytes)(4).toString("hex"),
+      id: (0, import_node_crypto9.randomBytes)(4).toString("hex"),
       userId,
       title,
       content,
@@ -44533,7 +44649,7 @@ var microCompactMessages = (messages, config2) => {
 };
 
 // src/agent/events.ts
-var import_node_crypto9 = require("node:crypto");
+var import_node_crypto10 = require("node:crypto");
 var rowToEvent = (row) => ({
   id: row.id,
   userId: row.userId,
@@ -44550,7 +44666,7 @@ var rowToEvent = (row) => ({
 var recordAgentEvent = (input) => {
   const db3 = createSqliteDB();
   const now = Date.now();
-  const id = `evt_${(0, import_node_crypto9.randomUUID)().slice(0, 12)}`;
+  const id = `evt_${(0, import_node_crypto10.randomUUID)().slice(0, 12)}`;
   const payloadJson = JSON.stringify(input.payload);
   db3.prepare(`
         INSERT INTO agent_events (
@@ -44682,7 +44798,7 @@ var assistantMessageFromResponse = (response) => ({
   ...response.model ? { model: response.model } : {}
 });
 var llmRequestIdForTurn = (request, messages, system, tools) => {
-  const hash = (0, import_node_crypto10.createHash)("sha256").update(request.requestId).update("\0").update(system).update("\0").update(JSON.stringify(messages)).update("\0").update(JSON.stringify(tools.map((tool) => tool.name).sort())).digest("hex").slice(0, 40);
+  const hash = (0, import_node_crypto11.createHash)("sha256").update(request.requestId).update("\0").update(system).update("\0").update(JSON.stringify(messages)).update("\0").update(JSON.stringify(tools.map((tool) => tool.name).sort())).digest("hex").slice(0, 40);
   return `dreq_${hash}`;
 };
 var getDefaultAgentConfig = (tools, systemPrompt) => {
@@ -50651,6 +50767,13 @@ var dateKeyInShanghai = (timestamp) => new Date(timestamp).toLocaleString("sv-SE
   month: "2-digit",
   day: "2-digit"
 }).replace(/-/g, "");
+var recentDateKeysInShanghaiForTest = (now, days = 7) => {
+  const keys = [];
+  for (let i = days - 1; i >= 0; i--) {
+    keys.push(dateKeyInShanghai(now - i * 864e5));
+  }
+  return keys;
+};
 var messageToAgentLogEntry = (message, index) => ({
   index,
   role: message.role,
@@ -50679,8 +50802,7 @@ var collectConversationMessages = async (userId, limit = 300) => {
   const storage = createRuntimeStorage(storageConf);
   const now = Date.now();
   const byDate = [];
-  for (let i = 0; i < 7; i++) {
-    const dateStr = dateKeyInShanghai(now - i * 864e5);
+  for (const dateStr of recentDateKeysInShanghaiForTest(now, 7)) {
     const messages = await getMessages(storage, userId, limit, dateStr);
     if (messages.length > 0) {
       byDate.push(...messages.map((message) => ({ message, sourceKey: dateStr })));
@@ -50973,7 +51095,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.14" : "unknown",
+    version: true ? "1.8.15" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version