@mclawnet/agent 0.6.30 → 0.6.32

package/dist/__tests__/hub-connection-preserve-recovery.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=hub-connection-preserve-recovery.test.d.ts.map

package/dist/__tests__/hub-connection-preserve-recovery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hub-connection-preserve-recovery.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/hub-connection-preserve-recovery.test.ts"],"names":[],"mappings":""}

package/dist/backend-adapter.d.ts

@@ -46,6 +46,13 @@ export interface SpawnOptions {
     mcpConfigPath?: string;
     /** Memory system role ID. When set, SessionManager auto-injects memory prompt + MCP config */
     roleId?: string;
+    /**
+     * Optional first user input. When set, SessionManager uses this as the
+     * semantic-retrieval query for `buildMemorySection` (Pipeline A) so the
+     * injected memory section is relevant to what the user is about to ask.
+     * Falls back to an empty query (importance-top-K) when omitted.
+     */
+    initialUserInput?: string;
     /** Extra directories to mount via --add-dir */
     additionalDirs?: string[];
     /** Optional allowlist of tool names to forward to the backend (PR3.5). */

package/dist/backend-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-adapter.d.ts","sourceRoot":"","sources":["../src/backend-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"backend-adapter.d.ts","sourceRoot":"","sources":["../src/backend-adapter.ts"],"names":[],"mappings":"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"}

package/dist/{chunk-LXSWV3VS.js → chunk-QPLG5WHL.js}

@@ -15,7 +15,7 @@ import {
   MAX_RECONNECT_MS,
   WS_CLOSE_INVALID_TOKEN
 } from "@mclawnet/shared";
-import { listRecoverableSwarms, recoverSwarm, listRoles, loadRole, listRecoverableSwarmIds, deleteSwarmSnapshot, listTemplates, loadTemplate } from "@mclawnet/swarm";
+import { listRecoverableSwarms, recoverSwarm, listRoles, loadRole, listRecoverableSwarmIds, listTemplates, loadTemplate } from "@mclawnet/swarm";
 
 // src/fs-handler.ts
 import { readdir } from "fs/promises";
@@ -470,6 +470,7 @@ async function handleSwarmControl(coord, msg, opts) {
 
 // src/hub-connection.ts
 import { createLogger as createLogger2, previewFields } from "@mclawnet/logger";
+import { DEFAULT_ASSISTANT_ROLE_ID } from "@mclawnet/memory";
 var log2 = createLogger2({ module: "agent" });
 var HubConnection = class {
   ws = null;
@@ -598,10 +599,16 @@ var HubConnection = class {
       }
       if (this.authState === "authenticated") {
         this.lastAckAt = Date.now();
+        if (data && data.type === "heartbeat_ack") {
+          return;
+        }
         if (this.handleSessionMessage(data)) return;
         this.onMessage?.(data);
       }
     });
+    this.ws.on("pong", () => {
+      this.lastAckAt = Date.now();
+    });
     this.ws.on("close", (code, reason) => {
       log2.warn({ code, reason: reason.toString() }, "disconnected from hub");
       this.stopHeartbeat();
@@ -1014,10 +1021,12 @@ var HubConnection = class {
           workDir,
           resumeId,
           useBrainCore,
-          roleId: "role-__assistant__",
+          roleId: DEFAULT_ASSISTANT_ROLE_ID,
           maxOutputTokens
         }).then(() => {
-          sm.sendInput(sessionId, content);
+          sm.sendUserInput(sessionId, content).catch((err) => {
+            log2.warn({ err, sessionId }, "sendUserInput failed");
+          });
         }).catch((err) => {
           this.send({
             type: "session.error",
@@ -1029,7 +1038,9 @@ var HubConnection = class {
       if (sm.isHealthy(sessionId)) {
         log2.info({ sessionId }, "claude.execute: reusing healthy session");
         log2.debug({ sessionId, ...previewFields(content) }, "claude.execute: input");
-        sm.sendInput(sessionId, content);
+        sm.sendUserInput(sessionId, content).catch((err) => {
+          log2.warn({ err, sessionId }, "sendUserInput failed");
+        });
       } else if (sm.hasSession(sessionId) && claudeSessionId) {
         const recommendedMax = sm.getRecommendedMaxOutputTokens(sessionId);
         log2.warn({ sessionId, claudeSessionId }, "claude.execute: session unhealthy, recreating with --resume");
@@ -1069,12 +1080,12 @@ var HubConnection = class {
       return true;
     }
     if (msg.type === "session.create") {
-      log2.info({ sessionId: msg.sessionId, roleId: "role-__assistant__" }, "session.create with memory injection");
+      log2.info({ sessionId: msg.sessionId, roleId: DEFAULT_ASSISTANT_ROLE_ID }, "session.create with memory injection");
       this.sessionManager.createSession({
         sessionId: msg.sessionId,
         workDir: msg.workDir,
         resumeId: msg.resumeId,
-        roleId: "role-__assistant__"
+        roleId: DEFAULT_ASSISTANT_ROLE_ID
       }).then((claudeSessionId) => {
         this.send({
           type: "session.created",
@@ -1101,7 +1112,9 @@ var HubConnection = class {
         { sessionId: msg.sessionId, ...previewFields(msg.content) },
         "claude.input"
       );
-      this.sessionManager.sendInput(msg.sessionId, msg.content);
+      this.sessionManager.sendUserInput(msg.sessionId, msg.content).catch((err) => {
+        log2.warn({ err, sessionId: msg.sessionId }, "sendUserInput failed");
+      });
       return true;
     }
     return false;
@@ -1113,10 +1126,9 @@ var HubConnection = class {
       const allIds = listRecoverableSwarmIds();
       const snapshots = listRecoverableSwarms();
       const recoverableIds = new Set(snapshots.map((s) => s.id));
-      for (const { workDir, swarmId } of allIds) {
+      for (const { swarmId } of allIds) {
         if (!recoverableIds.has(swarmId)) {
-          deleteSwarmSnapshot(workDir, swarmId);
-          log2.info({ swarmId }, "cleaned up non-recoverable swarm snapshot");
+          log2.info({ swarmId }, "skipping non-recoverable swarm snapshot (kept on disk)");
         }
       }
       for (const snap of snapshots) {
@@ -1161,6 +1173,10 @@ var HubConnection = class {
         return;
       }
       this.send({ type: "heartbeat", ts: Date.now() });
+      try {
+        this.ws?.ping();
+      } catch {
+      }
     }, this.heartbeatInterval);
   }
   stopHeartbeat() {
@@ -1694,7 +1710,12 @@ function makeRealSwarmStarter(_deps) {
 
 // src/session-manager.ts
 import { createLogger as createLogger5, previewFields as previewFields2 } from "@mclawnet/logger";
-import { buildMemorySection } from "@mclawnet/memory";
+import {
+  buildMemorySection,
+  EmbeddingService,
+  createEmbeddingProviders,
+  initDatabase
+} from "@mclawnet/memory";
 import { MAX_TOKENS_LADDER, clampLadderIndex } from "@mclawnet/shared";
 
 // src/skill-loader.ts
@@ -2056,6 +2077,13 @@ function isPidAlive(pid) {
 }
 
 // src/session-manager.ts
+var sharedEmbeddingService = null;
+function getSharedEmbeddingService() {
+  if (sharedEmbeddingService) return sharedEmbeddingService;
+  const db = initDatabase();
+  sharedEmbeddingService = new EmbeddingService(db, createEmbeddingProviders());
+  return sharedEmbeddingService;
+}
 var log5 = createLogger5({ module: "agent/session-manager" });
 var DEFAULT_MAX_PROCESSES = 30;
 var MAX_PROCESSES = Number(process.env.CLAWNET_MAX_PROCESSES) || DEFAULT_MAX_PROCESSES;
@@ -2162,19 +2190,26 @@ var SessionManager = class {
     if (this.sessions.size >= MAX_PROCESSES) {
       throw new SessionLimitReachedError(this.snapshotPoolForError());
     }
-    if (options.roleId) {
+    if (options.workDir) {
       try {
-        const memorySection = buildMemorySection(options.roleId);
-        const roleHint = `
-
-[Memory Context] Your roleId is "${options.roleId}". Always use this roleId when calling memory_search, memory_store, memory_stats, or memory_reflect.`;
-        options.systemPrompt = options.systemPrompt ? `${memorySection}${roleHint}
+        const query = options.initialUserInput ?? "";
+        const memorySection = await buildMemorySection({
+          query,
+          workDir: options.workDir,
+          embeddingService: getSharedEmbeddingService()
+        });
+        options.systemPrompt = options.systemPrompt ? `${memorySection}
 
-${options.systemPrompt}` : `${memorySection}${roleHint}`;
-        log5.debug({ roleId: options.roleId, sessionId: options.sessionId }, "memory prompt + roleId hint injected");
+${options.systemPrompt}` : memorySection;
+        log5.debug({ workDir: options.workDir, sessionId: options.sessionId }, "memory prompt injected");
       } catch (err) {
-        log5.warn({ err, roleId: options.roleId }, "failed to build memory section, proceeding without");
+        log5.warn({ err, workDir: options.workDir }, "failed to build memory section, proceeding without");
       }
+    } else {
+      log5.warn(
+        { sessionId: options.sessionId, roleId: options.roleId },
+        "session created without workDir \u2014 memory injection skipped (all memories would be cross-workdir; pass workDir to enable scoped retrieval)"
+      );
     }
     try {
       const notice = getPendingNotification();
@@ -2192,6 +2227,12 @@ ${notice.text}`;
     } catch (err) {
       log5.debug({ err }, "failed to inject pending notification");
     }
+    if (this.classify(options.sessionId) === "chat") {
+      const ideaHint = `
+
+[Idea Capture] When you propose a concrete user-actionable idea, feature suggestion, or follow-up TODO, additionally emit a single tag like \`<idea title="short title" body="one-paragraph context"/>\` at the end of that paragraph. Keep it concise and use it sparingly \u2014 only for things the user would plausibly want to save and revisit. The tag itself will be hidden from the chat view.`;
+      options.systemPrompt = options.systemPrompt ? `${options.systemPrompt}${ideaHint}` : ideaHint.trimStart();
+    }
     try {
       const process2 = await this.adapter.spawn(options);
       this.sessions.set(options.sessionId, process2);
@@ -2344,6 +2385,39 @@ ${notice.text}`;
     );
     this.adapter.send(process2, input);
   }
+  /**
+   * User-input variant of sendInput: best-effort prepend a `<memory-context>`
+   * block sourced from semantic retrieval (Pipeline B). Falls back to plain
+   * sendInput if retrieval errors or exceeds the 200ms budget — we never
+   * block the user's turn on memory.
+   */
+  async sendUserInput(sessionId, content) {
+    const meta = this.sessionMeta.get(sessionId);
+    const workDir = meta?.workDir;
+    let prefixed = content;
+    try {
+      const section = await Promise.race([
+        buildMemorySection({
+          query: content,
+          workDir,
+          embeddingService: getSharedEmbeddingService()
+        }),
+        new Promise(
+          (resolve) => setTimeout(() => resolve(""), 200)
+        )
+      ]);
+      if (section && section.trim().length > 0) {
+        prefixed = `<memory-context>
+${section}
+</memory-context>
+
+${content}`;
+      }
+    } catch (err) {
+      log5.debug({ err, sessionId }, "sendUserInput: memory retrieval skipped");
+    }
+    this.sendInput(sessionId, prefixed);
+  }
   async abortSession(sessionId) {
     const process2 = this.sessions.get(sessionId);
     if (!process2) return;
@@ -3051,11 +3125,12 @@ function createSwarmAwareSessionStartedHandler(deps) {
 // src/start.ts
 import { createLogger as createLogger9 } from "@mclawnet/logger";
 import {
-  initDatabase,
+  initDatabase as initDatabase2,
   MemoryStore,
-  EmbeddingService,
-  createEmbeddingProviders,
-  distillConversation
+  EmbeddingService as EmbeddingService2,
+  createEmbeddingProviders as createEmbeddingProviders2,
+  distillConversation,
+  DEFAULT_ASSISTANT_ROLE_ID as DEFAULT_ASSISTANT_ROLE_ID2
 } from "@mclawnet/memory";
 import {
   SkillStore,
@@ -3120,9 +3195,9 @@ async function startAgent(options) {
   let skillStore = null;
   let memoryDb = null;
   try {
-    memoryDb = initDatabase(dbPath);
+    memoryDb = initDatabase2(dbPath);
     memoryStore = new MemoryStore(memoryDb);
-    embeddingService = new EmbeddingService(memoryDb, createEmbeddingProviders());
+    embeddingService = new EmbeddingService2(memoryDb, createEmbeddingProviders2());
     skillStore = new SkillStore(clawnetDir);
     evolutionPipeline = new EvolutionPipeline(clawnetDir);
   } catch (err) {
@@ -3134,7 +3209,7 @@ async function startAgent(options) {
     try {
       await distillConversation(
         messages,
-        "role-__assistant__",
+        DEFAULT_ASSISTANT_ROLE_ID2,
         memoryStore,
         embeddingService
       );
@@ -3145,7 +3220,7 @@ async function startAgent(options) {
       if (!skillStore || !evolutionPipeline) return;
       const skills = skillStore.scan();
       if (skills.length === 0) return;
-      const recent = memoryStore.getMemoriesByRole("role-__assistant__", "working");
+      const recent = memoryStore.getRecentMemoriesByRole(DEFAULT_ASSISTANT_ROLE_ID2, { limit: 50 });
       const refs = recent.map((m) => ({
         id: m.id,
         type: m.type,
@@ -3265,4 +3340,4 @@ export {
   FsBridge,
   startAgent
 };
-//# sourceMappingURL=chunk-LXSWV3VS.js.map
+//# sourceMappingURL=chunk-QPLG5WHL.js.map