duclaw-cli 1.8.2 → 1.8.3

package/dist/bundle.js

@@ -30242,7 +30242,7 @@ function printHelp() {
 `);
 }
 function printVersion() {
-  console.log(`duclaw-cli v${true ? "1.8.2" : "unknown"}`);
+  console.log(`duclaw-cli v${true ? "1.8.3" : "unknown"}`);
 }
 function getDuclawTemplate() {
   return {
@@ -45312,10 +45312,24 @@ var executeJob = async (job) => {
     const resultFilePath = saveResultToFile(job, result);
     console.log(`[cron\u6267\u884C\u5B8C\u6210] \u5B9A\u65F6\u4EFB\u52A1\u6267\u884C\u7ED3\u679C: ${resultFilePath}`);
     updateJobLastRunTime(job.id);
+    return { ok: true, resultFilePath };
   } catch (error) {
-    console.error(`[cron] \u4EFB\u52A1\u6267\u884C\u5931\u8D25: ${job.id} - ${error}`);
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`[cron] \u4EFB\u52A1\u6267\u884C\u5931\u8D25: ${job.id} - ${message}`);
+    return { ok: false, error: message };
   }
 };
+var runJobById = async (jobId) => {
+  const job = listJobs().find((item) => item.id === jobId);
+  if (!job) {
+    return { ok: false, error: "job_not_found" };
+  }
+  if (!job.enabled) {
+    return { ok: false, error: "job_disabled", job };
+  }
+  const result = await executeJob(job);
+  return { ...result, job };
+};
 var executeAgentJob = async (job) => {
   const { registry: registry2, executor } = getCronTools();
   const tools = getAllTools(registry2);
@@ -49998,6 +50012,23 @@ cronRoutes.get("/cron/jobs/:id/history", (c) => {
     return c.json({ error: err.message || "Failed to get job history" }, 500);
   }
 });
+cronRoutes.post("/cron/jobs/:id/run", async (c) => {
+  const id = c.req.param("id");
+  try {
+    const result = await runJobById(id);
+    if (!result.ok) {
+      const status = result.error === "job_not_found" ? 404 : 400;
+      return c.json({ error: result.error || "Failed to run job" }, status);
+    }
+    return c.json({
+      ok: true,
+      jobId: result.job?.id ?? id,
+      resultFilePath: result.resultFilePath
+    });
+  } catch (err) {
+    return c.json({ error: err.message || "Failed to run job" }, 500);
+  }
+});
 
 // src/server/routes/mailbox.ts
 var mailboxRoutes = new Hono2();
@@ -50276,7 +50307,16 @@ var extractMemoryUserIdsFromKeys = (keys) => {
 };
 var collectCompactSummaries = async (userId) => {
   if (isFileBackedRuntime()) {
-    return [];
+    const { compactSummaryStorage: compactSummaryStorage2 } = getSharedDeps();
+    const records2 = [];
+    const prefix2 = `agent:compact:summary:${userId}:`;
+    for (const key of extractFileBackedStorageKeysForTest(getDuclawDataDir())) {
+      if (!key.startsWith(prefix2)) continue;
+      const logicalKey = key.startsWith("agent:") ? key.slice("agent:".length) : key;
+      const value = await compactSummaryStorage2.get(logicalKey);
+      if (value?.length) records2.push(...value);
+    }
+    return records2.sort((a, b) => b.createdAt - a.createdAt);
   }
   const client2 = await getRedisClient();
   const { compactSummaryStorage } = getSharedDeps();
@@ -50291,6 +50331,61 @@ var collectCompactSummaries = async (userId) => {
   }
   return records.sort((a, b) => b.createdAt - a.createdAt);
 };
+var isMailboxScopedUserId = (userId) => userId === "manager" || userId.includes("::") || userId.startsWith("cron-") || userId.startsWith("kanban:goal:");
+var collectManagerRelatedUserIds = (userId) => {
+  if (isMailboxScopedUserId(userId)) return [userId];
+  try {
+    const db3 = createSqliteDB();
+    const rows = db3.prepare(
+      `SELECT DISTINCT to_mailbox_id AS toMailboxId, from_mailbox_id AS fromMailboxId
+             FROM mailbox
+             WHERE origin_user_id = ?
+             ORDER BY to_mailbox_id ASC, from_mailbox_id ASC`
+    ).all(userId);
+    const ids = /* @__PURE__ */ new Set([userId]);
+    for (const row of rows) {
+      addPlausibleUserId(ids, row.toMailboxId || void 0);
+      addPlausibleUserId(ids, row.fromMailboxId || void 0);
+    }
+    ids.delete("manager");
+    return Array.from(ids);
+  } catch (err) {
+    console.warn(`[memoryRoutes] \u83B7\u53D6 Main Manager \u5173\u8054\u4E0A\u4E0B\u6587\u5931\u8D25 userId=${userId}: ${err.message}`);
+    return [userId];
+  }
+};
+var collectMemoryScopeUserIds = (userId) => collectManagerRelatedUserIds(userId);
+var aggregateMemorySummaries = async (userId, localConversationUserIds) => {
+  const { memoryEngine, dreamStorage, dreamStateStorage, topicStorage } = getSharedDeps();
+  const relatedUserIds = collectMemoryScopeUserIds(userId);
+  const details = await Promise.all(relatedUserIds.map(async (scopeUserId) => {
+    const [memories, dreamContent, dreamState, topics] = await Promise.all([
+      memoryEngine.list(scopeUserId),
+      dreamStorage.get(`dream:latest:${scopeUserId}`),
+      dreamStateStorage.get(`dream:state:${scopeUserId}`),
+      topicStorage.get(`topics:${scopeUserId}`)
+    ]);
+    return {
+      userId: scopeUserId,
+      memoryCount: memories.length,
+      hasDream: !!dreamContent,
+      hasConversation: (topics?.length ?? 0) > 0 || localConversationUserIds.has(scopeUserId),
+      lastDreamAt: dreamState?.lastDreamAt ?? null,
+      lastActivityAt: dreamState?.lastActivityAt ?? null
+    };
+  }));
+  const memoryCount = details.reduce((sum, detail) => sum + detail.memoryCount, 0);
+  return {
+    userId,
+    memoryCount,
+    hasMemory: memoryCount > 0,
+    hasDream: details.some((detail) => detail.hasDream),
+    hasConversation: details.some((detail) => detail.hasConversation),
+    lastDreamAt: Math.max(0, ...details.map((detail) => detail.lastDreamAt ?? 0)) || null,
+    lastActivityAt: Math.max(0, ...details.map((detail) => detail.lastActivityAt ?? 0)) || null,
+    relatedUserIds: relatedUserIds.length > 1 ? relatedUserIds : void 0
+  };
+};
 var collectUserIds = async () => {
   const userIds = /* @__PURE__ */ new Set();
   const localConversationUserIds = collectLocalConversationUserIds();
@@ -50312,26 +50407,10 @@ var collectUserIds = async () => {
 var memoryRoutes = new Hono2();
 memoryRoutes.get("/memory/users", async (c) => {
   try {
-    const { memoryEngine, dreamStorage, dreamStateStorage, topicStorage } = getSharedDeps();
     const { userIds, localConversationUserIds } = await collectUserIds();
-    const summaries = await Promise.all(userIds.map(async (userId) => {
-      const [memories, dreamContent, dreamState, topics] = await Promise.all([
-        memoryEngine.list(userId),
-        dreamStorage.get(`dream:latest:${userId}`),
-        dreamStateStorage.get(`dream:state:${userId}`),
-        topicStorage.get(`topics:${userId}`)
-      ]);
-      const summary = {
-        userId,
-        memoryCount: memories.length,
-        hasMemory: memories.length > 0,
-        hasDream: !!dreamContent,
-        hasConversation: (topics?.length ?? 0) > 0 || localConversationUserIds.has(userId),
-        lastDreamAt: dreamState?.lastDreamAt ?? null,
-        lastActivityAt: dreamState?.lastActivityAt ?? null
-      };
-      return summary;
-    }));
+    const summaries = await Promise.all(userIds.map(
+      (userId) => aggregateMemorySummaries(userId, localConversationUserIds)
+    ));
     summaries.sort(
       (a, b) => (b.lastActivityAt ?? 0) - (a.lastActivityAt ?? 0) || a.userId.localeCompare(b.userId)
     );
@@ -50345,7 +50424,9 @@ memoryRoutes.get("/memory", async (c) => {
   if (!userId) return c.json({ error: "userId is required" }, 400);
   try {
     const { memoryEngine } = getSharedDeps();
-    const memories = await memoryEngine.list(userId);
+    const memories = (await Promise.all(
+      collectMemoryScopeUserIds(userId).map((scopeUserId) => memoryEngine.list(scopeUserId))
+    )).flat();
     return c.json(sortMemories(memories));
   } catch (err) {
     return c.json({ error: err.message || "Failed to list memories" }, 500);
@@ -50408,16 +50489,27 @@ memoryRoutes.get("/memory/dream", async (c) => {
   if (!userId) return c.json({ error: "userId is required" }, 400);
   try {
     const { dreamStorage, dreamHistoryStorage, dreamStateStorage } = getSharedDeps();
-    const [dreamContent, dreamHistory, state] = await Promise.all([
-      dreamStorage.get(`dream:latest:${userId}`),
-      dreamHistoryStorage.get(`dream:history:${userId}`),
-      dreamStateStorage.get(`dream:state:${userId}`)
-    ]);
+    const scoped = await Promise.all(collectMemoryScopeUserIds(userId).map(async (scopeUserId) => {
+      const [dreamContent2, dreamHistory2, state2] = await Promise.all([
+        dreamStorage.get(`dream:latest:${scopeUserId}`),
+        dreamHistoryStorage.get(`dream:history:${scopeUserId}`),
+        dreamStateStorage.get(`dream:state:${scopeUserId}`)
+      ]);
+      return { userId: scopeUserId, dreamContent: dreamContent2 || "", dreamHistory: dreamHistory2 || [], state: state2 || null };
+    }));
+    const dreamContent = scoped.filter((item) => item.dreamContent.trim()).map((item) => scoped.length > 1 ? `## ${item.userId}
+${item.dreamContent}` : item.dreamContent).join("\n\n");
+    const dreamHistory = scoped.flatMap((item) => item.dreamHistory.map((entry) => ({
+      ...entry,
+      content: scoped.length > 1 ? `[${item.userId}]
+${entry.content}` : entry.content
+    }))).sort((a, b) => b.createdAt - a.createdAt);
+    const state = scoped.map((item) => item.state).filter((item) => !!item).sort((a, b) => b.lastActivityAt - a.lastActivityAt)[0] ?? null;
     return c.json({
       userId,
-      dreamContent: dreamContent || "",
-      dreamHistory: dreamHistory || [],
-      state: state || null
+      dreamContent,
+      dreamHistory,
+      state
     });
   } catch (err) {
     return c.json({ error: err.message || "Failed to get dream summary" }, 500);
@@ -50427,7 +50519,9 @@ memoryRoutes.get("/memory/compact", async (c) => {
   const userId = requireUserId(c.req.query("userId"));
   if (!userId) return c.json({ error: "userId is required" }, 400);
   try {
-    const summaries = await collectCompactSummaries(userId);
+    const summaries = (await Promise.all(
+      collectMemoryScopeUserIds(userId).map((scopeUserId) => collectCompactSummaries(scopeUserId))
+    )).flat().sort((a, b) => b.createdAt - a.createdAt);
     return c.json({
       userId,
       summaries
@@ -50444,19 +50538,25 @@ memoryRoutes.get("/memory/recall", async (c) => {
   const limit = Math.min(Number(c.req.query("limit")) || 20, 50);
   try {
     const { recallIndexStorage } = getSharedDeps();
+    const scopeUserIds = collectMemoryScopeUserIds(userId);
     if (query) {
-      const result = await searchRecallIndex(recallIndexStorage, userId, query, date, limit);
+      const scopedResults = await Promise.all(scopeUserIds.map(
+        (scopeUserId) => searchRecallIndex(recallIndexStorage, scopeUserId, query, date, limit)
+      ));
+      const matches = scopedResults.flatMap((result) => result.matches).sort((a, b) => b.score - a.score).slice(0, limit);
       return c.json({
         userId,
         query,
-        total: result.total,
-        entries: result.matches.map((match2) => ({
+        total: scopedResults.reduce((sum, result) => sum + result.total, 0),
+        entries: matches.map((match2) => ({
           ...match2.entry,
           score: match2.score
         }))
       });
     }
-    const entries = await recallIndexStorage.get(`recall:index:${userId}`) || [];
+    const entries = (await Promise.all(
+      scopeUserIds.map((scopeUserId) => recallIndexStorage.get(`recall:index:${scopeUserId}`))
+    )).flatMap((items) => items ?? []);
     const filtered = date ? entries.filter((entry) => entry.date === date) : entries;
     filtered.sort((a, b) => b.createdAt - a.createdAt);
     return c.json({
@@ -50474,10 +50574,18 @@ memoryRoutes.get("/memory/context", async (c) => {
   if (!userId) return c.json({ error: "userId is required" }, 400);
   try {
     const { memoryEngine, dreamStorage } = getSharedDeps();
-    const [memoryContextBlock, dreamContent] = await Promise.all([
-      memoryEngine.buildContextBlock(userId),
-      dreamStorage.get(`dream:latest:${userId}`)
-    ]);
+    const scoped = await Promise.all(collectMemoryScopeUserIds(userId).map(async (scopeUserId) => {
+      const [memoryContextBlock2, dreamContent2] = await Promise.all([
+        memoryEngine.buildContextBlock(scopeUserId),
+        dreamStorage.get(`dream:latest:${scopeUserId}`)
+      ]);
+      return { userId: scopeUserId, memoryContextBlock: memoryContextBlock2, dreamContent: dreamContent2 };
+    }));
+    const memoryContextBlock = scoped.filter((item) => item.memoryContextBlock.trim()).map((item) => scoped.length > 1 ? `<main-manager-context-source userId="${item.userId}">
+${item.memoryContextBlock}
+</main-manager-context-source>` : item.memoryContextBlock).join("\n\n");
+    const dreamContent = scoped.filter((item) => item.dreamContent?.trim()).map((item) => scoped.length > 1 ? `## ${item.userId}
+${item.dreamContent}` : item.dreamContent).join("\n\n");
     const dreamContextBlock = dreamContent ? [
       "<memory-context>",
       "\u4EE5\u4E0B\u662F\u4F60\u901A\u8FC7\u505A\u68A6\u4FDD\u7559\u7684\u8DE8\u5929\u8BB0\u5FC6\u3002\u8BB0\u4F4F\u8FD9\u4E9B\u4FE1\u606F\uFF0C\u4F46\u4E0D\u8981\u4E3B\u52A8\u63D0\u53CA\u2014\u2014\u9664\u975E\u7528\u6237\u7684\u8BDD\u9898\u76F8\u5173\u3002",
@@ -50550,7 +50658,7 @@ var systemRoutes = new Hono2();
 var startTime = Date.now();
 systemRoutes.get("/system/info", (c) => {
   return c.json({
-    version: true ? "1.8.2" : "unknown",
+    version: true ? "1.8.3" : "unknown",
     uptime: Math.floor((Date.now() - startTime) / 1e3),
     env: process.env.NODE_ENV || "development",
     nodeVersion: process.version
@@ -50651,8 +50759,12 @@ async function main() {
   } else {
     console.log(`[main] Core Channel Gateway \u5DF2\u8DF3\u8FC7\uFF0C\u5F53\u524D\u5916\u90E8\u6D88\u606F\u5165\u53E3\u7531 SaaS \u5C42\u63A5\u7BA1`);
   }
-  startScheduler();
-  console.log(`[main] \u5B9A\u65F6\u4EFB\u52A1\u8C03\u5EA6\u5668\u5DF2\u542F\u52A8`);
+  if (process.env.DUCLAW_CRON_SCHEDULER === "saas") {
+    console.log(`[main] \u5B9A\u65F6\u4EFB\u52A1\u8C03\u5EA6\u5668\u5DF2\u8DF3\u8FC7\uFF0C\u5F53\u524D\u7531 SaaS \u5C42\u63A5\u7BA1`);
+  } else {
+    startScheduler();
+    console.log(`[main] \u5B9A\u65F6\u4EFB\u52A1\u8C03\u5EA6\u5668\u5DF2\u542F\u52A8`);
+  }
   startMailboxPoller();
   console.log(`[main] \u591A\u667A\u80FD\u4F53\u90AE\u7BB1\u8F6E\u8BE2\u5DF2\u542F\u52A8`);
   const kanbanPort = Number(process.env.KANBAN_PORT || 3e3);