duclaw-cli 1.9.16 → 1.9.17

package/dist/DuclawMac.app/Contents/Info.plist

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleExecutable</key>
+  <string>DuclawMac</string>
+  <key>CFBundleIdentifier</key>
+  <string>dev.duclaw.mac</string>
+  <key>CFBundleName</key>
+  <string>DuclawMac</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleTypeRole</key>
+      <string>Editor</string>
+      <key>CFBundleURLName</key>
+      <string>dev.duclaw.mac.auth</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>duclaw</string>
+      </array>
+    </dict>
+  </array>
+  <key>LSMinimumSystemVersion</key>
+  <string>14.0</string>
+  <key>NSPrincipalClass</key>
+  <string>NSApplication</string>
+</dict>
+</plist>

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.9.16" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.9.17" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -30516,6 +30516,18 @@ var getDuclawWorktreesDir = () => {
   return dir;
 };
 
+// src/runtime/runtimeMode.ts
+var LOCAL_MACOS_RUNTIME_PROVIDER = "local-macos";
+var isLocalMacOSRuntime = () => {
+  return process.env.DUCLAW_RUNTIME_PROVIDER === LOCAL_MACOS_RUNTIME_PROVIDER;
+};
+var isSpoolQueueRuntime = () => {
+  return process.env.DUCLAW_QUEUE_DRIVER === "spool" || process.env.DUCLAW_RUNTIME_PROVIDER === "e2b" || isLocalMacOSRuntime();
+};
+var isFileBackedRuntimeMode = () => {
+  return process.env.DUCLAW_STORAGE_DRIVER === "file" || isSpoolQueueRuntime();
+};
+
 // src/worker/spool.ts
 var STATES = ["pending", "processing", "done", "failed"];
 var safeSegment = (value) => {
@@ -30523,7 +30535,7 @@ var safeSegment = (value) => {
   return normalized || "default";
 };
 var isVolumeSpoolEnabled = () => {
-  return process.env.DUCLAW_QUEUE_DRIVER === "spool" || process.env.DUCLAW_RUNTIME_PROVIDER === "e2b";
+  return isSpoolQueueRuntime();
 };
 var getSpoolRoot = () => {
   return process.env.DUCLAW_SPOOL_ROOT || import_node_path.default.join(getDuclawHomeDir(), "mailbox", "inbox");
@@ -38584,7 +38596,7 @@ var createRedisStorage = (options = {}) => {
 
 // src/storage/runtimeStorage.ts
 var isFileBackedRuntime = () => {
-  return process.env.DUCLAW_STORAGE_DRIVER === "file" || process.env.DUCLAW_QUEUE_DRIVER === "spool" || process.env.DUCLAW_RUNTIME_PROVIDER === "e2b";
+  return isFileBackedRuntimeMode();
 };
 var createRuntimeStorage = (options = {}) => {
   if (isFileBackedRuntime()) {
@@ -47306,7 +47318,7 @@ ${getSkillMeta()}
   return agentConfig;
 };
 var createAgent = (config2 = getDefaultAgentConfig()) => {
-  const { systemPrompt, llm, storage, topicStorage, compactSummaryStorage, recallIndexStorage, toolExecutor, tools, backgroundManager, maxIterations = 50, dreamEngine, skillForgeEngine, memoryEngine } = config2;
+  const { systemPrompt, llm, storage, topicStorage, compactSummaryStorage, recallIndexStorage, toolExecutor, tools, backgroundManager, maxIterations = 50, dreamEngine, skillForgeEngine, memoryEngine, onLlmRequestId } = config2;
   const signals = /* @__PURE__ */ new Map();
   return async (request) => {
     if (config2.workspacePath && !request.defaultWorkDir) {
@@ -47614,12 +47626,14 @@ ${memoryInjection}` : "") + dreamInjection;
         const turnAbortController = new AbortController();
         activeTurnAbortController = turnAbortController;
         try {
+          const llmRequestId = llmRequestIdForTurn(request, messages, effectiveSystemPrompt, tools);
+          onLlmRequestId?.(llmRequestId);
           response = await llm.chat(
             messages,
             effectiveSystemPrompt,
             tools,
             {
-              requestId: llmRequestIdForTurn(request, messages, effectiveSystemPrompt, tools),
+              requestId: llmRequestId,
               signal: turnAbortController.signal
             }
           );
@@ -52602,6 +52616,12 @@ var import_crypto6 = require("crypto");
 var agentRoutes = new Hono2();
 var runningTasks = /* @__PURE__ */ new Map();
 var runningGoals = /* @__PURE__ */ new Map();
+var normalizeClientMessageId = (value) => {
+  if (typeof value !== "string") return null;
+  const trimmed = value.trim();
+  if (!trimmed || trimmed.length > 120) return null;
+  return /^[A-Za-z0-9_.:-]+$/.test(trimmed) ? trimmed : null;
+};
 var parseJsonObject = (raw2) => {
   const match2 = raw2.match(/\{[\s\S]*\}/);
   if (!match2) return null;
@@ -52611,7 +52631,7 @@ var parseJsonObject = (raw2) => {
     return null;
   }
 };
-async function deriveGoalSnapshot(goalId, userMessageText, agentReply) {
+async function deriveGoalSnapshot(goalId, userMessageText, agentReply, traceRequestId, onLlmRequestId) {
   const goal = getGoalById(goalId);
   if (!goal) return;
   loadEnv();
@@ -52655,7 +52675,14 @@ ${goal.tasks.map((task) => `- [${task.status}] ${task.subject}`).join("\n")}` :
     `- blockers \u53EA\u4FDD\u7559\u5F53\u524D\u771F\u5B9E\u963B\u585E\uFF0C\u6CA1\u6709\u5C31\u8FD4\u56DE []`
   ].join("\n");
   try {
-    const response = await llm.chat([userMessage(text(prompt))], "\u4F60\u662F\u4E00\u4E2A\u7ED3\u6784\u5316\u9879\u76EE\u6458\u8981\u52A9\u624B\u3002");
+    const snapshotRequestId = traceRequestId ? `dmeta_${traceRequestId}` : void 0;
+    if (snapshotRequestId) onLlmRequestId?.(snapshotRequestId);
+    const response = await llm.chat(
+      [userMessage(text(prompt))],
+      "\u4F60\u662F\u4E00\u4E2A\u7ED3\u6784\u5316\u9879\u76EE\u6458\u8981\u52A9\u624B\u3002",
+      void 0,
+      snapshotRequestId ? { requestId: snapshotRequestId } : void 0
+    );
     const json = parseJsonObject(extractText(response.content));
     if (!json) return;
     const updated = {
@@ -52933,7 +52960,7 @@ agentRoutes.get("/goals/:gid/tasks/:tid/logs", async (c) => {
 });
 agentRoutes.post("/goals/:gid/chat", async (c) => {
   const { gid } = c.req.param();
-  const { message } = await c.req.json();
+  const { message, clientMessageId } = await c.req.json();
   if (!message?.trim()) return c.json({ error: "Message is required" }, 400);
   const goal = getGoalById(gid);
   if (!goal) return c.json({ error: "Goal not found" }, 404);
@@ -52975,9 +53002,7 @@ agentRoutes.post("/goals/:gid/chat", async (c) => {
 `;
   prompt += `
 \u7528\u6237\u6D88\u606F\uFF1A${message}`;
-  const requestId = (0, import_crypto6.randomUUID)().slice(0, 8);
-  const goalState = { aborted: false, logs: [] };
-  runningGoals.set(runKey, goalState);
+  const requestId = normalizeClientMessageId(clientMessageId) ?? (0, import_crypto6.randomUUID)().slice(0, 8);
   const request = {
     platform: "kanban",
     userId: threadId,
@@ -52988,10 +53013,17 @@ agentRoutes.post("/goals/:gid/chat", async (c) => {
   const config2 = getDefaultAgentConfig();
   const replyChannel = refreshedContext?.syncReplyToOrigin && refreshedContext.originPlatform === "feishu" && refreshedContext.originUserId ? config2.channelPlugin : void 0;
   config2.channelPlugin = void 0;
+  const goalState = { aborted: false, logs: [], requestId, llmRequestIds: [] };
+  config2.onLlmRequestId = (llmRequestId) => {
+    if (!goalState.llmRequestIds.includes(llmRequestId)) {
+      goalState.llmRequestIds.push(llmRequestId);
+    }
+  };
+  runningGoals.set(runKey, goalState);
   const agent = createAgent(config2);
   agent(request).then(async (result) => {
     goalState.logs.push(`[\u5B8C\u6210] ${result.content.slice(0, 500)}`);
-    await deriveGoalSnapshot(gid, message, result.content);
+    await deriveGoalSnapshot(gid, message, result.content, requestId, config2.onLlmRequestId);
     markGoalDiscussed(gid);
     if (replyChannel && result.content) {
       try {
@@ -53011,7 +53043,7 @@ agentRoutes.post("/goals/:gid/chat", async (c) => {
   }).finally(() => {
     setTimeout(() => runningGoals.delete(runKey), 6e4);
   });
-  return c.json({ ok: true, message: "Goal chat started" });
+  return c.json({ ok: true, message: "Goal chat started", requestId });
 });
 agentRoutes.post("/goals/:gid/chat/refresh-summary", async (c) => {
   const { gid } = c.req.param();
@@ -53024,9 +53056,14 @@ agentRoutes.get("/goals/:gid/chat/status", (c) => {
   const { gid } = c.req.param();
   const state = runningGoals.get(`goal:${gid}`);
   if (!state) {
-    return c.json({ running: false, logs: [] });
+    return c.json({ running: false, logs: [], requestId: null, llmRequestIds: [] });
   }
-  return c.json({ running: true, logs: state.logs });
+  return c.json({
+    running: true,
+    logs: state.logs,
+    requestId: state.requestId ?? null,
+    llmRequestIds: state.llmRequestIds
+  });
 });
 agentRoutes.get("/goals/:gid/chat/logs", async (c) => {
   const { gid } = c.req.param();
@@ -53048,7 +53085,8 @@ agentRoutes.get("/goals/:gid/chat/logs", async (c) => {
   if (messages.length === 0) {
     messages = await getMessages(storage, threadId, 300);
   }
-  const isRunning = runningGoals.has(`goal:${gid}`);
+  const state = runningGoals.get(`goal:${gid}`);
+  const isRunning = Boolean(state);
   const logs = messages.map((msg, idx) => {
     const blocks = msg.content.map((block) => {
       if (block.type === "text") {
@@ -53088,7 +53126,12 @@ agentRoutes.get("/goals/:gid/chat/logs", async (c) => {
       blocks
     };
   });
-  return c.json({ logs, running: isRunning });
+  return c.json({
+    logs,
+    running: isRunning,
+    requestId: state?.requestId ?? null,
+    llmRequestIds: state?.llmRequestIds ?? []
+  });
 });
 
 // src/server/routes/departments.ts
@@ -54265,7 +54308,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.9.16" : "unknown",
+    version: true ? "1.9.17" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version

package/dist/macos/Duclaw.app/Contents/Info.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>25C56</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>Duclaw</string>
+	<key>CFBundleExecutable</key>
+	<string>Duclaw</string>
+	<key>CFBundleIdentifier</key>
+	<string>dev.duclaw.mac</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Duclaw</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.1.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>25F70</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>26.5</string>
+	<key>DTSDKBuild</key>
+	<string>25F70</string>
+	<key>DTSDKName</key>
+	<string>macosx26.5</string>
+	<key>DTXcode</key>
+	<string>2650</string>
+	<key>DTXcodeBuild</key>
+	<string>17F42</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.productivity</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>14.0</string>
+</dict>
+</plist>

package/dist/macos/Duclaw.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

package/dist/macos/Duclaw.app/Contents/_CodeSignature/CodeResources

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict>
+		<key>embedded.provisionprofile</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			VgPz5jeJ9Ssphsbc2XAFW5feJHbS98l0CXV4FDSBwfM=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>