@mclawnet/agent 0.6.29 → 0.6.31

package/dist/__tests__/hub-connection-reconnect.test.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"hub-connection-reconnect.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/hub-connection-reconnect.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-Y4J44CKF.js → chunk-U5CD3OZ3.js}

@@ -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;
@@ -559,13 +560,13 @@ var HubConnection = class {
   }
   connect() {
     if (this.destroyed) return;
-    if (this.ws || this.reconnectTimer) return;
+    if (this.reconnectTimer) return;
+    if (this.ws && (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.OPEN)) {
+      return;
+    }
     this.cleanupConnection();
     this.authState = "pending";
-    this.ws = new WebSocket(this.hubUrl);
-    this.ws.on("open", () => {
-      this.reconnectDelay = DEFAULT_RECONNECT_MS;
-    });
+    this.ws = new WebSocket(this.hubUrl, { handshakeTimeout: 1e4 });
     this.ws.on("message", (raw) => {
       let data;
       try {
@@ -589,6 +590,7 @@ var HubConnection = class {
         log2.info({ agentId: data.agentId }, "registered with hub");
         this.authState = "authenticated";
         this.agentId = data.agentId ?? null;
+        this.reconnectDelay = DEFAULT_RECONNECT_MS;
         this.startHeartbeat();
         this.onConnectCb?.(this.agentId);
         this.tryRecoverSwarms();
@@ -597,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();
@@ -616,6 +624,18 @@ var HubConnection = class {
     this.ws.on("error", (err) => {
       log2.error({ err }, "ws connection error");
       this.onError?.(err);
+      if (this.ws) {
+        const dying = this.ws;
+        this.ws = null;
+        try {
+          dying.removeAllListeners();
+          dying.terminate();
+        } catch {
+        }
+        this.stopHeartbeat();
+        this.authState = "pending";
+        this.scheduleReconnect();
+      }
     });
   }
   send(data) {
@@ -1001,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",
@@ -1016,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");
@@ -1056,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",
@@ -1088,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;
@@ -1148,6 +1174,10 @@ var HubConnection = class {
         return;
       }
       this.send({ type: "heartbeat", ts: Date.now() });
+      try {
+        this.ws?.ping();
+      } catch {
+      }
     }, this.heartbeatInterval);
   }
   stopHeartbeat() {
@@ -1236,12 +1266,15 @@ var HubConnection = class {
   scheduleReconnect() {
     if (this.destroyed) return;
     if (this.reconnectTimer) return;
-    log2.warn({ delayMs: this.reconnectDelay }, "reconnecting to hub...");
+    const cap = Math.min(this.reconnectDelay, this.maxReconnectDelay);
+    const base = Math.min(DEFAULT_RECONNECT_MS, cap);
+    const delay = Math.floor(base + Math.random() * Math.max(0, cap - base));
+    log2.warn({ delayMs: delay, capMs: cap }, "reconnecting to hub...");
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = null;
       this.connect();
-    }, this.reconnectDelay);
-    this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectDelay);
+    }, delay);
+    this.reconnectDelay = Math.min(cap * 2, this.maxReconnectDelay);
   }
   cleanup() {
     this.cleanupConnection();
@@ -1678,7 +1711,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
@@ -2040,6 +2078,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;
@@ -2071,6 +2116,13 @@ var SessionManager = class {
   // correctly routed to the "spawn new + --resume" branch instead of trying
   // to write to a process we are about to kill.
   aborting = /* @__PURE__ */ new Set();
+  // Sessions whose exit was triggered by an explicit close/abort/closeAll —
+  // used by the onExit hook to label the resulting exit event as `expected`
+  // (so SwarmCoordinator can skip flipping the role to `crashed`). The set is
+  // populated *before* `adapter.stop()` runs and drained inside the onExit
+  // handler. A leftover entry would only matter if a session id were reused,
+  // which createSession already forbids (line 193 throws on duplicate).
+  expectedExits = /* @__PURE__ */ new Set();
   idleSweepTimer = null;
   // PR-A: effective sweeper config. Initialized from env at construct time
   // and overridable per-instance via startIdleSweeper(overrides) — the
@@ -2106,6 +2158,14 @@ var SessionManager = class {
   onSessionError;
   onSessionStarted;
   onBeforeClose;
+  /**
+   * Fires whenever the underlying child process exits — both expected
+   * (closeSession/abortSession) and unexpected (crash, OOM, external SIGKILL).
+   * `expected` lets the listener distinguish so a swarm coordinator can flip
+   * the role to `crashed` only on unplanned exits. Wired in start.ts to route
+   * swarm-role exits to SwarmCoordinator.handleRoleCrashed.
+   */
+  onSessionExit;
   // PR-A: classifies a sessionId as 'chat' or 'swarm-role'. Injected by
   // start.ts via SwarmCoordinator.isSwarmSession to keep SessionManager
   // independent of the swarm package. Defaults to 'chat' if absent — safe
@@ -2119,6 +2179,7 @@ var SessionManager = class {
     this.onSessionError = options.onSessionError;
     this.onSessionStarted = options.onSessionStarted;
     this.onBeforeClose = options.onBeforeClose;
+    this.onSessionExit = options.onSessionExit;
     this.classify = options.classify ?? (() => "chat");
     this.checkpointPath = options.checkpointPath ?? null;
     this.checkpointDebounceMs = options.checkpointDebounceMs ?? 5e3;
@@ -2130,19 +2191,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();
@@ -2160,6 +2228,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);
@@ -2257,13 +2331,37 @@ ${notice.text}`;
       }
       this.adapter.onExit?.(process2, (code) => {
         if (this.sessions.get(options.sessionId) === process2) {
+          const expected = this.expectedExits.delete(options.sessionId);
           this.sessions.delete(options.sessionId);
           this.sessionMeta.delete(options.sessionId);
           this.activelyExecuting.delete(options.sessionId);
           this.conversationBuffer.delete(options.sessionId);
           this.scheduleCheckpoint();
-          log5.warn({ sessionId: options.sessionId, exitCode: code }, "backend process exited unexpectedly, evicted from session map");
-          this.onSessionError(options.sessionId, `backend process exited (code=${code ?? "null"})`);
+          if (!expected) {
+            log5.warn({ sessionId: options.sessionId, exitCode: code }, "backend process exited unexpectedly, evicted from session map");
+            this.onSessionError(options.sessionId, `backend process exited (code=${code ?? "null"})`);
+          } else {
+            log5.debug({ sessionId: options.sessionId, exitCode: code }, "backend process exited as expected");
+          }
+          try {
+            this.onSessionExit?.(options.sessionId, {
+              code: code ?? null,
+              expected,
+              ...expected ? {} : { reason: `exit code=${code ?? "null"}` }
+            });
+          } catch (err) {
+            log5.warn({ err, sessionId: options.sessionId }, "onSessionExit listener threw");
+          }
+        } else {
+          const expected = this.expectedExits.delete(options.sessionId);
+          try {
+            this.onSessionExit?.(options.sessionId, {
+              code: code ?? null,
+              expected
+            });
+          } catch (err) {
+            log5.warn({ err, sessionId: options.sessionId }, "onSessionExit listener threw");
+          }
         }
       });
       return process2.id;
@@ -2288,10 +2386,44 @@ ${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;
     this.aborting.add(sessionId);
+    this.expectedExits.add(sessionId);
     this.conversationBuffer.delete(sessionId);
     this.sessions.delete(sessionId);
     this.sessionMeta.delete(sessionId);
@@ -2312,6 +2444,7 @@ ${notice.text}`;
       });
     }
     this.conversationBuffer.delete(sessionId);
+    this.expectedExits.add(sessionId);
     this.sessions.delete(sessionId);
     this.sessionMeta.delete(sessionId);
     this.activelyExecuting.delete(sessionId);
@@ -2328,6 +2461,7 @@ ${notice.text}`;
           });
         }
         this.conversationBuffer.delete(sessionId);
+        this.expectedExits.add(sessionId);
         this.sessions.delete(sessionId);
         this.sessionMeta.delete(sessionId);
         this.activelyExecuting.delete(sessionId);
@@ -2992,11 +3126,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,
@@ -3061,9 +3196,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) {
@@ -3075,7 +3210,7 @@ async function startAgent(options) {
     try {
       await distillConversation(
         messages,
-        "role-__assistant__",
+        DEFAULT_ASSISTANT_ROLE_ID2,
         memoryStore,
         embeddingService
       );
@@ -3086,7 +3221,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,
@@ -3140,6 +3275,15 @@ async function startAgent(options) {
         error
       });
     },
+    onSessionExit: (sessionId, info) => {
+      if (info.expected) return;
+      if (!swarmCoordinator?.isSwarmSession(sessionId)) return;
+      try {
+        swarmCoordinator.handleRoleCrashed(sessionId, info.reason ?? `exit code=${info.code ?? "null"}`);
+      } catch (err) {
+        log9.warn({ err, sessionId }, "swarmCoordinator.handleRoleCrashed threw");
+      }
+    },
     onBeforeClose,
     // PR-A: classify session kind for the idle sweeper. SessionManager stays
     // independent of the swarm package; we hand it a closure that defers to
@@ -3197,4 +3341,4 @@ export {
   FsBridge,
   startAgent
 };
-//# sourceMappingURL=chunk-Y4J44CKF.js.map
+//# sourceMappingURL=chunk-U5CD3OZ3.js.map