@clawmem-ai/clawmem 0.1.5 → 0.1.7

package/README.md

@@ -36,7 +36,7 @@ openclaw plugins install @clawmem-ai/clawmem
 openclaw gateway restart
 ```
 
-After restart, clawmem auto-provisions a private repo on `git.clawmem.ai` and writes `token` + `repo` back into your config. Memories start accumulating from the next session.
+After restart, clawmem provisions per-agent memory repos on `git.clawmem.ai` as each agent is first used, then writes that agent's `token` + `repo` back into your config under `plugins.entries.clawmem.config.agents.<agentId>`. Memories start accumulating from that agent's next session.
 
 ---
 
@@ -53,7 +53,7 @@ Before the workflow can publish successfully, configure the package on npmjs.com
 Release flow:
 
 1. Bump `package.json` to the version you want to ship.
-2. Create and push a matching tag such as `0.1.5`.
+2. Create and push a matching tag such as `0.1.6`.
 3. GitHub Actions runs `.github/workflows/release.yml` and publishes with OIDC. No long-lived `NPM_TOKEN` secret is required.
 
 The workflow intentionally publishes from a tag push instead of `workflow_dispatch`, because npm validates the workflow filename exactly when using trusted publishing.
@@ -239,9 +239,15 @@ Minimal config (after auto-provisioning):
         enabled: true,
         config: {
           baseUrl: "https://git.clawmem.ai/api/v3",
-          repo: "owner/repo",
-          token: "<token>",
-          authScheme: "token"
+          authScheme: "token",
+          agents: {
+            main: {
+              baseUrl: "https://git.clawmem.ai/api/v3",
+              repo: "owner/main-memory",
+              token: "<token>",
+              authScheme: "token"
+            }
+          }
         }
       }
     }
@@ -260,6 +266,18 @@ Full config with all options:
         config: {
           baseUrl: "https://git.clawmem.ai/api/v3",
           authScheme: "token",
+          agents: {
+            main: {
+              baseUrl: "https://git.clawmem.ai/api/v3",
+              repo: "owner/main-memory",
+              token: "<token>",
+              authScheme: "token"
+            },
+            coder: {
+              repo: "owner/coder-memory",
+              token: "<token>"
+            }
+          },
           issueTitlePrefix: "Session: ",
           memoryTitlePrefix: "Memory: ",
           defaultLabels: ["source:openclaw"],

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "clawmem",
   "name": "ClawMem",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Mirror OpenClaw sessions into GitHub-compatible issues and comments.",
   "kind": "memory",
   "configSchema": {
@@ -25,6 +25,32 @@
         "type": "string",
         "enum": ["token", "bearer"]
       },
+      "agents": {
+        "type": "object",
+        "default": {},
+        "additionalProperties": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "baseUrl": {
+              "type": "string",
+              "minLength": 1
+            },
+            "repo": {
+              "type": "string",
+              "pattern": "^[^/]+/[^/]+$"
+            },
+            "token": {
+              "type": "string",
+              "minLength": 1
+            },
+            "authScheme": {
+              "type": "string",
+              "enum": ["token", "bearer"]
+            }
+          }
+        }
+      },
       "issueTitlePrefix": {
         "type": "string"
       },
@@ -94,16 +120,20 @@
     "repo": {
       "label": "Repository",
       "placeholder": "owner/repo",
-      "help": "Target repository that stores session issues. If left blank, clawmem will provision one automatically on first start."
+      "help": "Legacy single-route setting. New installs should use per-agent routes under agents.<agentId>."
     },
     "token": {
       "label": "API Token",
       "sensitive": true,
-      "help": "Token used for issue, comment, and label API calls. If left blank, clawmem will provision one automatically on first start."
+      "help": "Legacy single-route setting. New installs should use per-agent routes under agents.<agentId>."
     },
     "authScheme": {
       "label": "Auth Scheme",
-      "help": "Use 'token' for GitHub-style auth or 'bearer' for bearer tokens. Automatically provisioned credentials use 'token'."
+      "help": "Default auth scheme for per-agent routes. Automatically provisioned credentials use 'token'."
+    },
+    "agents": {
+      "label": "Agent Routes",
+      "help": "Per-agent ClawMem credentials keyed by agent id. Missing repo/token are provisioned automatically on first use."
     },
     "defaultLabels": {
       "label": "Default Labels",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawmem-ai/clawmem",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Mirror OpenClaw sessions into GitHub-compatible issues and comments.",
   "type": "module",
   "license": "MIT",

package/src/config.ts

@@ -1,6 +1,7 @@
 // Hardcoded label/prefix constants and plugin config resolution.
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
-import type { ClawMemPluginConfig } from "./types.js";
+import type { ClawMemAgentConfig, ClawMemPluginConfig, ClawMemResolvedRoute } from "./types.js";
+import { normalizeAgentId } from "./utils.js";
 
 export const SESSION_TITLE_PREFIX = "Session: ";
 export const MEMORY_TITLE_PREFIX = "Memory: ";
@@ -20,18 +21,46 @@ export function resolvePluginConfig(api: OpenClawPluginApi): ClawMemPluginConfig
   const num = (v: unknown, d: number) => typeof v === "number" && Number.isFinite(v) ? Math.floor(v) : d;
   const clamp = (v: number, lo: number, hi: number) => Math.min(hi, Math.max(lo, v));
   const baseUrl = (str(raw.baseUrl) ?? "https://git.clawmem.ai").replace(/\/+$/, "");
+  const rawAgents = raw.agents && typeof raw.agents === "object" && !Array.isArray(raw.agents)
+    ? (raw.agents as Record<string, unknown>)
+    : {};
+  const agents: Record<string, ClawMemAgentConfig> = {};
+  for (const [rawAgentId, rawAgentConfig] of Object.entries(rawAgents)) {
+    if (!rawAgentConfig || typeof rawAgentConfig !== "object" || Array.isArray(rawAgentConfig)) continue;
+    const agentId = normalizeAgentId(rawAgentId);
+    const agent = rawAgentConfig as Record<string, unknown>;
+    agents[agentId] = {
+      baseUrl: str(agent.baseUrl)?.replace(/\/+$/, ""),
+      repo: str(agent.repo),
+      token: str(agent.token),
+      authScheme: agent.authScheme === "bearer" ? "bearer" : agent.authScheme === "token" ? "token" : undefined,
+    };
+  }
   return {
     baseUrl: baseUrl.endsWith("/api/v3") ? baseUrl : `${baseUrl}/api/v3`,
-    repo: str(raw.repo), token: str(raw.token),
     authScheme: raw.authScheme === "bearer" ? "bearer" : "token",
+    agents,
     memoryRecallLimit: clamp(num(raw.memoryRecallLimit, 5), 1, 20),
     turnCommentDelayMs: num(raw.turnCommentDelayMs, 1000),
     summaryWaitTimeoutMs: clamp(num(raw.summaryWaitTimeoutMs, 120000), 1000, 600000),
   };
 }
 
-export function isPluginConfigured(config: ClawMemPluginConfig): boolean {
-  return Boolean(config.baseUrl && config.repo && config.token);
+export function resolveAgentRoute(config: ClawMemPluginConfig, agentId?: string): ClawMemResolvedRoute {
+  const id = normalizeAgentId(agentId);
+  const agent = config.agents[id] ?? {};
+  const baseUrl = (agent.baseUrl ?? config.baseUrl).replace(/\/+$/, "");
+  return {
+    agentId: id,
+    baseUrl: baseUrl.endsWith("/api/v3") ? baseUrl : `${baseUrl}/api/v3`,
+    repo: agent.repo?.trim() || undefined,
+    token: agent.token?.trim() || undefined,
+    authScheme: agent.authScheme === "bearer" ? "bearer" : config.authScheme,
+  };
+}
+
+export function isAgentConfigured(route: ClawMemResolvedRoute): boolean {
+  return Boolean(route.baseUrl && route.repo && route.token);
 }
 
 export function resolveLabelColor(label: string): string {

package/src/conversation.ts

@@ -2,7 +2,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
-import { AGENT_LABEL_PREFIX, DEFAULT_LABELS, LABEL_ACTIVE, LABEL_CLOSED, SESSION_TITLE_PREFIX } from "./config.js";
+import { AGENT_LABEL_PREFIX, DEFAULT_LABELS, LABEL_ACTIVE, LABEL_CLOSED, SESSION_TITLE_PREFIX, extractLabelNames } from "./config.js";
 import type { GitHubIssueClient } from "./github-client.js";
 import { normalizeMessages, readTranscriptSnapshot } from "./transcript.js";
 import type { ClawMemPluginConfig, NormalizedMessage, SessionMirrorState, TranscriptSnapshot } from "./types.js";
@@ -36,7 +36,17 @@ export class ConversationMirror {
   }
 
   async ensureIssue(session: SessionMirrorState, snapshot: TranscriptSnapshot): Promise<void> {
-    if (session.issueNumber) return;
+    if (session.issueNumber) {
+      const existing = await this.lookupBoundIssue(session);
+      if (existing && this.isBoundIssue(session, existing)) {
+        session.issueTitle = existing.title?.trim() || session.issueTitle;
+        return;
+      }
+      this.api.logger.warn(
+        `clawmem: issue binding for ${session.sessionId} is stale or mismatched (${session.issueNumber}); recreating`,
+      );
+      this.resetIssueBinding(session);
+    }
     const title = `${SESSION_TITLE_PREFIX}${session.sessionId}`;
     const labels = this.buildLabels(session, snapshot, false);
     const body = this.renderBody(session, snapshot, "pending", false);
@@ -143,9 +153,37 @@ export class ConversationMirror {
     } catch { /* directory unreadable */ }
     return null;
   }
+
+  private async lookupBoundIssue(session: SessionMirrorState): Promise<{ number: number; title?: string; labels?: Array<{ name?: string } | string> } | null> {
+    if (!session.issueNumber) return null;
+    try {
+      return await this.client.getIssue(session.issueNumber);
+    } catch (error) {
+      if (isNotFoundError(error)) return null;
+      throw error;
+    }
+  }
+
+  private isBoundIssue(session: SessionMirrorState, issue: { title?: string; labels?: Array<{ name?: string } | string> }): boolean {
+    const labels = extractLabelNames(issue.labels);
+    return labels.includes("type:conversation") && labels.includes(`session:${session.sessionId}`);
+  }
+
+  private resetIssueBinding(session: SessionMirrorState): void {
+    session.issueNumber = undefined;
+    session.issueTitle = undefined;
+    session.lastSummaryHash = undefined;
+    session.lastMirroredCount = 0;
+    session.turnCount = 0;
+    session.finalizedAt = undefined;
+  }
 }
 
 async function fexists(p: string): Promise<boolean> { try { return (await fs.promises.stat(p)).isFile(); } catch { return false; } }
+function isNotFoundError(error: unknown): boolean {
+  const text = String(error);
+  return text.includes("HTTP 404");
+}
 function parseSummary(raw: string): string {
   const tryParse = (s: string): string | null => {
     try { const p = JSON.parse(s) as { summary?: unknown }; return typeof p?.summary === "string" && p.summary.trim() ? p.summary.trim() : null; }

package/src/github-client.ts

@@ -1,12 +1,12 @@
 // GitHub Issues API client for clawmem. No label caching — idempotent create-if-absent.
 import { resolveLabelColor, labelDescription, extractLabelNames, isManagedLabel } from "./config.js";
-import type { AnonymousSessionResponse, ClawMemPluginConfig } from "./types.js";
+import type { AnonymousSessionResponse, ClawMemResolvedRoute } from "./types.js";
 
 type IssueResponse = { number: number; title?: string; body?: string; state?: string; labels?: Array<{ name?: string } | string> };
 type ReqOpts = { allowNotFound?: boolean; allowValidationError?: boolean; omitAuth?: boolean };
 
 export class GitHubIssueClient {
-  constructor(private readonly config: ClawMemPluginConfig, private readonly log: { warn?: (msg: string) => void }) {}
+  constructor(private readonly config: ClawMemResolvedRoute, private readonly log: { warn?: (msg: string) => void }) {}
 
   async createIssue(params: { title: string; body: string; labels: string[] }): Promise<IssueResponse> {
     return this.req<IssueResponse>(this.repoPath("issues"), { method: "POST", body: JSON.stringify(params) });

package/src/service.ts

@@ -1,6 +1,6 @@
 // Thin orchestrator: wires conversation mirroring, memory store, and plugin lifecycle.
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
-import { isPluginConfigured, resolvePluginConfig } from "./config.js";
+import { isAgentConfigured, resolveAgentRoute, resolvePluginConfig } from "./config.js";
 import { ConversationMirror } from "./conversation.js";
 import { GitHubIssueClient } from "./github-client.js";
 import { KeyedAsyncQueue } from "./keyed-async-queue.js";
@@ -8,34 +8,29 @@ import { MemoryStore } from "./memory.js";
 import { loadState, resolveStatePath, saveState } from "./state.js";
 import { readTranscriptSnapshot } from "./transcript.js";
 import type { ClawMemPluginConfig, PluginState, SessionMirrorState, TranscriptSnapshot } from "./types.js";
+import { inferAgentIdFromTranscriptPath, normalizeAgentId, sessionScopeKey } from "./utils.js";
 
 type TurnPayload = { sessionId?: string; sessionKey?: string; agentId?: string; messages: unknown[] };
 type FinalizePayload = { sessionId?: string; sessionKey?: string; sessionFile?: string; agentId?: string; reason?: string; messages?: unknown[] };
 
 class ClawMemService {
   private readonly config: ClawMemPluginConfig;
-  private readonly client: GitHubIssueClient;
-  private readonly conv: ConversationMirror;
-  private readonly mem: MemoryStore;
   private readonly queue = new KeyedAsyncQueue();
   private readonly stateQueue = new KeyedAsyncQueue();
   private readonly pending = new Set<Promise<unknown>>();
   private readonly syncTimers = new Map<string, ReturnType<typeof setTimeout>>();
   private statePath = "";
-  private state: PluginState = { version: 1, sessions: {} };
+  private state: PluginState = { version: 2, sessions: {} };
   private unsubTranscript?: () => void;
   private loadPromise: Promise<void> | null = null;
-  private configPromise: Promise<boolean> | null = null;
+  private readonly configPromises = new Map<string, Promise<boolean>>();
 
   constructor(private readonly api: OpenClawPluginApi) {
     this.config = resolvePluginConfig(api);
-    this.client = new GitHubIssueClient(this.config, api.logger);
-    this.conv = new ConversationMirror(this.client, api, this.config);
-    this.mem = new MemoryStore(this.client, api, this.config);
   }
 
   register(): void {
-    this.api.on("before_agent_start", async (ev) => this.handleRecall(ev.prompt));
+    this.api.on("before_agent_start", async (ev, ctx) => this.handleRecall(ev.prompt, ctx.agentId));
     this.api.on("agent_end", (ev, ctx) => this.scheduleTurn({ sessionId: ctx.sessionId, sessionKey: ctx.sessionKey, agentId: ctx.agentId, messages: ev.messages }));
     this.api.on("before_reset", (ev, ctx) => this.enqueueFinalize({ sessionId: ctx.sessionId, sessionKey: ctx.sessionKey, sessionFile: ev.sessionFile, agentId: ctx.agentId, reason: ev.reason, messages: ev.messages }));
     this.api.on("session_end", (ev, ctx) => this.enqueueFinalize({ sessionId: ev.sessionId ?? ctx.sessionId, sessionKey: ev.sessionKey ?? ctx.sessionKey, agentId: ctx.agentId, reason: "session_end" }));
@@ -45,12 +40,17 @@ class ClawMemService {
       start: async (ctx) => {
         this.statePath = resolveStatePath(ctx.stateDir);
         await this.ensureLoaded();
-        const ok = await this.ensureConfigured();
         this.unsubTranscript = this.api.runtime.events.onSessionTranscriptUpdate((u) => {
           void this.track(this.handleTranscript(u.sessionFile)).catch((e) => this.warn("transcript update", e));
         });
-        if (ok) this.api.logger.info?.(`clawmem: mirroring sessions to ${this.config.repo} via ${this.config.baseUrl}`);
-        else this.api.logger.warn(`clawmem: missing repo/token and automatic provisioning failed via ${this.config.baseUrl}; sync will retry on the next use`);
+        const configuredCount = Object.keys(this.config.agents).filter((agentId) => {
+          return isAgentConfigured(resolveAgentRoute(this.config, agentId));
+        }).length;
+        this.api.logger.info?.(
+          configuredCount > 0
+            ? `clawmem: ready with ${configuredCount} configured agent route(s); missing routes will provision on first use via ${this.config.baseUrl}`
+            : `clawmem: ready; agent routes will provision on first use via ${this.config.baseUrl}`,
+        );
       },
       stop: async () => {
         this.unsubTranscript?.();
@@ -61,11 +61,13 @@ class ClawMemService {
     });
   }
 
-  private async handleRecall(prompt: unknown): Promise<{ prependContext: string } | void> {
+  private async handleRecall(prompt: unknown, agentId?: string): Promise<{ prependContext: string } | void> {
     if (typeof prompt !== "string" || prompt.trim().length < 5) return;
-    if (!(await this.ensureConfigured())) return;
+    const routeAgentId = normalizeAgentId(agentId);
+    if (!(await this.ensureConfigured(routeAgentId))) return;
     try {
-      const memories = await this.mem.search(prompt, this.config.memoryRecallLimit);
+      const { mem } = this.getServices(routeAgentId);
+      const memories = await mem.search(prompt, this.config.memoryRecallLimit);
       if (memories.length === 0) return;
       const text = memories.map((m) => `- ${m.detail}`).join("\n");
       return { prependContext: `<relevant-memories>\nThe following active memories may be relevant to this conversation:\n${text}\n</relevant-memories>` };
@@ -75,67 +77,84 @@ class ClawMemService {
   private async handleTranscript(sessionFile: string): Promise<void> {
     let snap: TranscriptSnapshot;
     try { snap = await readTranscriptSnapshot(sessionFile); } catch (e) { this.warn("transcript read", e); return; }
-    if (!snap.sessionId || !this.conv.shouldMirror(snap.sessionId, snap.messages)) return;
-    if (!(await this.ensureConfigured())) return;
-    await this.enqueueSession(snap.sessionId, async () => {
-      const s = this.getOrCreate(snap.sessionId!);
+    if (!snap.sessionId) return;
+    const agentId = this.resolveTranscriptAgentId(snap.sessionId, sessionFile);
+    if (!agentId) {
+      this.api.logger.info?.(
+        `clawmem: skipping transcript sync for ${snap.sessionId} because agent ownership could not be inferred from ${sessionFile}`,
+      );
+      return;
+    }
+    const { conv } = this.getServices(agentId);
+    if (!conv.shouldMirror(snap.sessionId, snap.messages)) return;
+    if (!(await this.ensureConfigured(agentId))) return;
+    await this.enqueueSession(sessionScopeKey(snap.sessionId, agentId), async () => {
+      const s = this.getOrCreate(snap.sessionId!, agentId);
       s.sessionFile = sessionFile;
       s.updatedAt = new Date().toISOString();
-      await this.conv.ensureIssue(s, snap);
+      await conv.ensureIssue(s, snap);
       await this.persistState();
     });
   }
 
   private scheduleTurn(p: TurnPayload): void {
     if (!p.sessionId) return;
-    const prev = this.syncTimers.get(p.sessionId);
+    const scopeKey = sessionScopeKey(p.sessionId, p.agentId);
+    const prev = this.syncTimers.get(scopeKey);
     if (prev) clearTimeout(prev);
     const timer = setTimeout(() => {
-      this.syncTimers.delete(p.sessionId!);
-      void this.track(this.enqueueSession(p.sessionId!, () => this.syncTurn(p))).catch((e) => this.warn("turn sync", e));
+      this.syncTimers.delete(scopeKey);
+      void this.track(this.enqueueSession(scopeKey, () => this.syncTurn(p))).catch((e) => this.warn("turn sync", e));
     }, this.config.turnCommentDelayMs);
     timer.unref?.();
-    this.syncTimers.set(p.sessionId, timer);
+    this.syncTimers.set(scopeKey, timer);
   }
 
   private async syncTurn(p: TurnPayload): Promise<void> {
-    if (!p.sessionId || !(await this.ensureConfigured())) return;
-    const s = this.getOrCreate(p.sessionId);
-    s.sessionKey = p.sessionKey ?? s.sessionKey; s.agentId = p.agentId ?? s.agentId; s.updatedAt = new Date().toISOString();
-    const snap = await this.conv.loadSnapshot(s, p.messages);
-    if (!this.conv.shouldMirror(s.sessionId, snap.messages) || snap.messages.length === 0) { await this.persistState(); return; }
-    await this.conv.ensureIssue(s, snap);
-    await this.conv.syncLabels(s, snap, false);
+    if (!p.sessionId) return;
+    const agentId = normalizeAgentId(p.agentId);
+    if (!(await this.ensureConfigured(agentId))) return;
+    const { conv } = this.getServices(agentId);
+    const s = this.getOrCreate(p.sessionId, agentId);
+    s.sessionKey = p.sessionKey ?? s.sessionKey; s.agentId = agentId; s.updatedAt = new Date().toISOString();
+    const snap = await conv.loadSnapshot(s, p.messages);
+    if (!conv.shouldMirror(s.sessionId, snap.messages) || snap.messages.length === 0) { await this.persistState(); return; }
+    await conv.ensureIssue(s, snap);
+    await conv.syncLabels(s, snap, false);
     const next = snap.messages.slice(s.lastMirroredCount);
-    if (next.length > 0) { const n = await this.conv.appendComments(s.issueNumber!, next); s.lastMirroredCount += n; s.turnCount += n; }
+    if (next.length > 0) { const n = await conv.appendComments(s.issueNumber!, next); s.lastMirroredCount += n; s.turnCount += n; }
     await this.persistState();
   }
 
   private enqueueFinalize(p: FinalizePayload): void {
     if (!p.sessionId) return;
-    const prev = this.syncTimers.get(p.sessionId);
-    if (prev) { clearTimeout(prev); this.syncTimers.delete(p.sessionId); }
-    void this.track(this.enqueueSession(p.sessionId, () => this.finalize(p))).catch((e) => this.warn("finalize", e));
+    const scopeKey = sessionScopeKey(p.sessionId, p.agentId);
+    const prev = this.syncTimers.get(scopeKey);
+    if (prev) { clearTimeout(prev); this.syncTimers.delete(scopeKey); }
+    void this.track(this.enqueueSession(scopeKey, () => this.finalize(p))).catch((e) => this.warn("finalize", e));
   }
 
   private async finalize(p: FinalizePayload): Promise<void> {
-    if (!p.sessionId || !(await this.ensureConfigured())) return;
-    const s = this.getOrCreate(p.sessionId);
+    if (!p.sessionId) return;
+    const agentId = normalizeAgentId(p.agentId);
+    if (!(await this.ensureConfigured(agentId))) return;
+    const { conv, mem } = this.getServices(agentId);
+    const s = this.getOrCreate(p.sessionId, agentId);
     if (s.finalizedAt) return;
     s.sessionKey = p.sessionKey ?? s.sessionKey; s.sessionFile = p.sessionFile ?? s.sessionFile;
-    s.agentId = p.agentId ?? s.agentId; s.updatedAt = new Date().toISOString();
-    const snap = await this.conv.loadSnapshot(s, p.messages ?? []);
-    if (!this.conv.shouldMirror(s.sessionId, snap.messages)) { await this.persistState(); return; }
+    s.agentId = agentId; s.updatedAt = new Date().toISOString();
+    const snap = await conv.loadSnapshot(s, p.messages ?? []);
+    if (!conv.shouldMirror(s.sessionId, snap.messages)) { await this.persistState(); return; }
     if (snap.messages.length === 0 && !s.issueNumber) { await this.persistState(); return; }
-    await this.conv.ensureIssue(s, snap);
+    await conv.ensureIssue(s, snap);
     const next = snap.messages.slice(s.lastMirroredCount);
     let allOk = true;
-    if (next.length > 0) { const n = await this.conv.appendComments(s.issueNumber!, next); s.lastMirroredCount += n; s.turnCount += n; allOk = n === next.length; }
+    if (next.length > 0) { const n = await conv.appendComments(s.issueNumber!, next); s.lastMirroredCount += n; s.turnCount += n; allOk = n === next.length; }
     let summary = "pending";
-    try { summary = await this.conv.generateSummary(s, snap); } catch (e) { summary = `failed: ${String(e)}`; }
-    await this.conv.syncLabels(s, snap, true);
-    await this.conv.syncBody(s, snap, summary, true);
-    await this.mem.syncFromConversation(s, snap);
+    try { summary = await conv.generateSummary(s, snap); } catch (e) { summary = `failed: ${String(e)}`; }
+    await conv.syncLabels(s, snap, true);
+    await conv.syncBody(s, snap, summary, true);
+    await mem.syncFromConversation(s, snap);
     if (allOk) s.finalizedAt = new Date().toISOString();
     await this.persistState();
   }
@@ -146,15 +165,41 @@ class ClawMemService {
     return this.queue.enqueue(sessionId, async () => { await this.ensureLoaded(); return task(); });
   }
   private track<T>(promise: Promise<T>): Promise<T> {
-    this.pending.add(promise); void promise.finally(() => this.pending.delete(promise)); return promise;
+    this.pending.add(promise);
+    // Avoid creating a second rejecting promise via finally(); OpenClaw treats
+    // unhandled rejections as fatal and exits the gateway process.
+    void promise.then(
+      () => this.pending.delete(promise),
+      () => this.pending.delete(promise),
+    );
+    return promise;
   }
-  private getOrCreate(sessionId: string): SessionMirrorState {
-    if (this.state.sessions[sessionId]) return this.state.sessions[sessionId];
+  private getOrCreate(sessionId: string, agentId?: string): SessionMirrorState {
+    const scopeKey = sessionScopeKey(sessionId, agentId);
+    if (this.state.sessions[scopeKey]) return this.state.sessions[scopeKey];
     const now = new Date().toISOString();
-    const s: SessionMirrorState = { sessionId, lastMirroredCount: 0, turnCount: 0, createdAt: now, updatedAt: now };
-    this.state.sessions[sessionId] = s;
+    const s: SessionMirrorState = {
+      sessionId,
+      agentId: normalizeAgentId(agentId),
+      lastMirroredCount: 0,
+      turnCount: 0,
+      createdAt: now,
+      updatedAt: now,
+    };
+    this.state.sessions[scopeKey] = s;
     return s;
   }
+  private resolveTranscriptAgentId(sessionId: string, sessionFile: string): string | null {
+    const fromPath = inferAgentIdFromTranscriptPath(sessionFile);
+    if (fromPath) return fromPath;
+    const knownAgents = new Set(
+      Object.values(this.state.sessions)
+        .filter((session) => session.sessionId === sessionId)
+        .map((session) => normalizeAgentId(session.agentId)),
+    );
+    if (knownAgents.size === 1) return [...knownAgents][0] ?? null;
+    return null;
+  }
   private async persistState(): Promise<void> {
     if (!this.statePath) this.statePath = resolveStatePath(this.api.runtime.state.resolveStateDir());
     await this.stateQueue.enqueue("state", () => saveState(this.statePath, this.state));
@@ -167,29 +212,60 @@ class ClawMemService {
     })();
     return this.loadPromise;
   }
-  private async ensureConfigured(): Promise<boolean> {
-    if (isPluginConfigured(this.config)) return true;
-    if (this.configPromise) return this.configPromise;
-    const p = this.bootstrap();
-    this.configPromise = p;
-    try { return await p; } finally { if (this.configPromise === p) this.configPromise = null; }
+  private async ensureConfigured(agentId?: string): Promise<boolean> {
+    const id = normalizeAgentId(agentId);
+    if (isAgentConfigured(resolveAgentRoute(this.config, id))) return true;
+    const pending = this.configPromises.get(id);
+    if (pending) return pending;
+    const p = this.bootstrap(id);
+    this.configPromises.set(id, p);
+    try { return await p; } finally { if (this.configPromises.get(id) === p) this.configPromises.delete(id); }
   }
-  private async bootstrap(): Promise<boolean> {
-    if (!this.config.baseUrl) { this.api.logger.warn("clawmem: cannot provision Git credentials without a baseUrl"); return false; }
+  private async bootstrap(agentId: string): Promise<boolean> {
+    const route = resolveAgentRoute(this.config, agentId);
+    if (!route.baseUrl) { this.api.logger.warn(`clawmem: cannot provision Git credentials for ${agentId} without a baseUrl`); return false; }
     try {
-      const sess = await this.client.createAnonymousSession();
-      await this.persistPluginConfig({ baseUrl: this.config.baseUrl, authScheme: "token", token: sess.token, repo: sess.repo_full_name });
-      this.config.authScheme = "token"; this.config.token = sess.token; this.config.repo = sess.repo_full_name;
-      this.api.logger.info?.(`clawmem: provisioned Git credentials for ${sess.repo_full_name} via ${this.config.baseUrl}`);
+      const client = new GitHubIssueClient(route, this.api.logger);
+      const sess = await client.createAnonymousSession();
+      await this.persistAgentConfig(agentId, { baseUrl: route.baseUrl, authScheme: "token", token: sess.token, repo: sess.repo_full_name });
+      this.config.agents[agentId] = { ...(this.config.agents[agentId] ?? {}), baseUrl: route.baseUrl, authScheme: "token", token: sess.token, repo: sess.repo_full_name };
+      this.api.logger.info?.(`clawmem: provisioned Git credentials for agent ${agentId} -> ${sess.repo_full_name} via ${route.baseUrl}`);
       return true;
-    } catch (error) { this.api.logger.warn(`clawmem: failed to provision Git credentials via ${this.config.baseUrl}: ${String(error)}`); return false; }
+    } catch (error) { this.api.logger.warn(`clawmem: failed to provision Git credentials for agent ${agentId} via ${route.baseUrl}: ${String(error)}`); return false; }
   }
-  private async persistPluginConfig(values: Partial<ClawMemPluginConfig>): Promise<void> {
+  private async persistAgentConfig(agentId: string, values: { baseUrl: string; authScheme: "token" | "bearer"; token: string; repo: string }): Promise<void> {
     const root = this.api.runtime.config.loadConfig();
     const plugins = root.plugins;
     const entries = plugins?.entries && typeof plugins.entries === "object" && !Array.isArray(plugins.entries) ? (plugins.entries as Record<string, unknown>) : {};
     const ex = asRecord(entries[this.api.id]), exCfg = asRecord(ex.config);
-    await this.api.runtime.config.writeConfigFile({ ...root, plugins: { ...(plugins ?? {}), entries: { ...entries, [this.api.id]: { ...ex, config: { ...exCfg, ...values } } } } });
+    const agents = exCfg.agents && typeof exCfg.agents === "object" && !Array.isArray(exCfg.agents) ? (exCfg.agents as Record<string, unknown>) : {};
+    const existingAgent = asRecord(agents[agentId]);
+    await this.api.runtime.config.writeConfigFile({
+      ...root,
+      plugins: {
+        ...(plugins ?? {}),
+        entries: {
+          ...entries,
+          [this.api.id]: {
+            ...ex,
+            config: {
+              ...exCfg,
+              agents: {
+                ...agents,
+                [agentId]: { ...existingAgent, ...values },
+              },
+            },
+          },
+        },
+      },
+    });
+  }
+  private getServices(agentId?: string): { conv: ConversationMirror; mem: MemoryStore } {
+    const client = new GitHubIssueClient(resolveAgentRoute(this.config, agentId), this.api.logger);
+    return {
+      conv: new ConversationMirror(client, this.api, this.config),
+      mem: new MemoryStore(client, this.api, this.config),
+    };
   }
   private warn(scope: string, error: unknown): void { this.api.logger.warn(`clawmem: ${scope} failed: ${String(error)}`); }
 }

package/src/state.ts

@@ -1,9 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
 import type { PluginState } from "./types.js";
+import { normalizeAgentId, sessionScopeKey } from "./utils.js";
 
 const EMPTY_STATE: PluginState = {
-  version: 1,
+  version: 2,
   sessions: {},
 };
 
@@ -42,19 +43,24 @@ function sanitizeState(value: unknown): PluginState {
       ? (raw.sessions as Record<string, unknown>)
       : {};
   const out: PluginState = {
-    version: 1,
+    version: 2,
     sessions: {},
   };
-  for (const [sessionId, sessionValue] of Object.entries(sessions)) {
-    if (!sessionValue || typeof sessionValue !== "object" || !sessionId.trim()) {
+  for (const [storedKey, sessionValue] of Object.entries(sessions)) {
+    if (!sessionValue || typeof sessionValue !== "object" || !storedKey.trim()) {
       continue;
     }
     const rawSession = sessionValue as Record<string, unknown>;
-    out.sessions[sessionId] = {
+    const sessionId = readString(rawSession.sessionId) ?? storedKey.trim();
+    if (!sessionId) {
+      continue;
+    }
+    const agentId = normalizeAgentId(readString(rawSession.agentId));
+    out.sessions[sessionScopeKey(sessionId, agentId)] = {
       sessionId,
       sessionKey: readString(rawSession.sessionKey),
       sessionFile: readString(rawSession.sessionFile),
-      agentId: readString(rawSession.agentId),
+      agentId,
       issueNumber: readNumber(rawSession.issueNumber),
       issueTitle: readString(rawSession.issueTitle),
       lastMirroredCount: readNumber(rawSession.lastMirroredCount) ?? 0,

package/src/types.ts

@@ -1,10 +1,28 @@
 // Shared types for the clawmem plugin.
+export type ClawMemAgentConfig = {
+  baseUrl?: string;
+  repo?: string;
+  token?: string;
+  authScheme?: "token" | "bearer";
+};
+
 export type ClawMemPluginConfig = {
-  baseUrl?: string; repo?: string; token?: string;
+  baseUrl: string;
   authScheme: "token" | "bearer";
-  memoryRecallLimit: number; turnCommentDelayMs: number;
+  agents: Record<string, ClawMemAgentConfig>;
+  memoryRecallLimit: number;
+  turnCommentDelayMs: number;
   summaryWaitTimeoutMs: number;
 };
+
+export type ClawMemResolvedRoute = {
+  agentId: string;
+  baseUrl: string;
+  repo?: string;
+  token?: string;
+  authScheme: "token" | "bearer";
+};
+
 export type AnonymousSessionResponse = { token: string; owner_login: string; repo_name: string; repo_full_name: string };
 export type SessionMirrorState = {
   sessionId: string; sessionKey?: string; sessionFile?: string; agentId?: string;
@@ -13,7 +31,7 @@ export type SessionMirrorState = {
   finalizedAt?: string; lastSummaryHash?: string; lastTurnHash?: string;
   createdAt?: string; updatedAt?: string;
 };
-export type PluginState = { version: 1; sessions: Record<string, SessionMirrorState> };
+export type PluginState = { version: 2; sessions: Record<string, SessionMirrorState> };
 export type NormalizedMessage = { role: string; text: string; toolName?: string; timestamp?: string; stopReason?: string };
 export type TranscriptSnapshot = { sessionId?: string; messages: NormalizedMessage[] };
 export type ParsedMemoryIssue = {

package/src/utils.ts

@@ -1,9 +1,29 @@
 // Shared utility helpers used by memory.ts and conversation.ts.
 import crypto from "node:crypto";
+import path from "node:path";
 import type { NormalizedMessage } from "./types.js";
 
+export const DEFAULT_AGENT_ID = "main";
+
 export function sha256(v: string): string { return crypto.createHash("sha256").update(v).digest("hex"); }
 
+export function normalizeAgentId(value: string | undefined | null): string {
+  const trimmed = (value ?? "").trim().toLowerCase();
+  if (!trimmed) return DEFAULT_AGENT_ID;
+  return trimmed.replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || DEFAULT_AGENT_ID;
+}
+
+export function sessionScopeKey(sessionId: string, agentId?: string): string {
+  return `${normalizeAgentId(agentId)}:${sessionId.trim()}`;
+}
+
+export function inferAgentIdFromTranscriptPath(filePath: string): string | undefined {
+  const parts = path.resolve(filePath).split(path.sep);
+  const idx = parts.lastIndexOf("agents");
+  if (idx < 0 || !parts[idx + 1] || parts[idx + 2] !== "sessions") return undefined;
+  return normalizeAgentId(parts[idx + 1]);
+}
+
 export function subKey(s: { sessionId: string; agentId?: string }, suffix: string): string {
   const san = (v: string) => v.replace(/[^a-zA-Z0-9_-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48) || "main";
   return `agent:${san(s.agentId || "main")}:subagent:clawmem-${suffix}-${san(s.sessionId)}`;