@clawmem-ai/clawmem 0.1.7 → 0.1.9

package/src/memory.ts

@@ -1,101 +1,266 @@
 // Memory CRUD, sha256 dedup, and AI-driven memory extraction.
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
-import { LABEL_MEMORY_ACTIVE, LABEL_MEMORY_STALE, MEMORY_TITLE_PREFIX, extractLabelNames, labelVal } from "./config.js";
+import { LABEL_MEMORY_STALE, MEMORY_TITLE_PREFIX, extractLabelNames, labelVal } from "./config.js";
 import type { GitHubIssueClient } from "./github-client.js";
 import { normalizeMessages } from "./transcript.js";
-import type { ClawMemPluginConfig, NormalizedMessage, ParsedMemoryIssue, SessionMirrorState, TranscriptSnapshot } from "./types.js";
+import type { ClawMemPluginConfig, MemoryDraft, MemoryListOptions, MemorySchema, NormalizedMessage, ParsedMemoryIssue, SessionMirrorState, TranscriptSnapshot } from "./types.js";
 import { fmtTranscript, localDate, sha256, subKey } from "./utils.js";
 import { parseFlatYaml, stringifyFlatYaml } from "./yaml.js";
 
-type MemoryDecision = { save: string[]; stale: string[] };
+type MemoryDecision = { save: MemoryDraft[]; stale: string[] };
+type SearchIndex = { title: string; detail: string; kind?: string; topics: string[] };
 
 export class MemoryStore {
   constructor(private readonly client: GitHubIssueClient, private readonly api: OpenClawPluginApi, private readonly config: ClawMemPluginConfig) {}
 
   async search(query: string, limit: number): Promise<ParsedMemoryIssue[]> {
-    const memories = await this.list("active");
-    const q = query.trim().toLowerCase();
-    const tokens = q.split(/[^a-z0-9]+/i).filter((t) => t.length > 1);
-    return memories
-      .map((m) => {
-        const hay = `${m.title}\n${m.detail}`.toLowerCase();
-        let score = hay.includes(q) ? 10 : 0;
-        for (const t of tokens) if (hay.includes(t)) score += 1;
-        return { m, score };
+    const q = normalizeSearch(query);
+    if (!q) return [];
+    try {
+      const results = await this.searchViaBackend(query, limit);
+      if (results.length > 0) return results;
+    } catch (error) {
+      this.api.logger?.warn?.(`clawmem: backend memory search failed, falling back to local lexical ranking: ${String(error)}`);
+    }
+    return this.searchLocally(q, limit);
+  }
+
+  async listSchema(): Promise<MemorySchema> {
+    const kinds = new Set<string>();
+    const topics = new Set<string>();
+    for (let page = 1; page <= 20; page++) {
+      const batch = await this.client.listLabels({ page, perPage: 100 });
+      for (const label of batch) {
+        const name = typeof label?.name === "string" ? label.name.trim() : "";
+        if (name.startsWith("kind:")) {
+          const kind = labelVal([name], "kind:");
+          if (kind) kinds.add(kind);
+        }
+        if (name.startsWith("topic:")) {
+          const topic = labelVal([name], "topic:");
+          if (topic) topics.add(topic);
+        }
+      }
+      if (batch.length < 100) break;
+    }
+    for (const memory of await this.listByStatus("all")) {
+      if (memory.kind) kinds.add(memory.kind);
+      for (const topic of memory.topics ?? []) topics.add(topic);
+    }
+    return { kinds: [...kinds].sort(), topics: [...topics].sort() };
+  }
+
+  async get(memoryId: string, status: "active" | "stale" | "all" = "all"): Promise<ParsedMemoryIssue | null> {
+    const id = memoryId.trim();
+    if (!id) throw new Error("memoryId is empty");
+    return (await this.listByStatus(status)).find((m) => m.memoryId === id || String(m.issueNumber) === id) ?? null;
+  }
+
+  async listMemories(options: MemoryListOptions = {}): Promise<ParsedMemoryIssue[]> {
+    const status = options.status ?? "active";
+    const kind = normalizeOptionalLabelValue(options.kind, "kind:");
+    const topic = normalizeOptionalLabelValue(options.topic, "topic:");
+    const limit = Math.min(200, Math.max(1, options.limit ?? 20));
+    return (await this.listByStatus(status))
+      .filter((memory) => {
+        if (kind && memory.kind !== kind) return false;
+        if (topic && !(memory.topics ?? []).includes(topic)) return false;
+        return true;
       })
-      .filter((e) => e.score > 0)
-      .sort((a, b) => b.score - a.score || b.m.issueNumber - a.m.issueNumber)
-      .slice(0, limit)
-      .map((e) => e.m);
+      .sort((a, b) => b.issueNumber - a.issueNumber)
+      .slice(0, limit);
   }
 
-  async syncFromConversation(session: SessionMirrorState, snapshot: TranscriptSnapshot): Promise<void> {
+  async store(draft: MemoryDraft, sessionId = "manual"): Promise<{ created: boolean; memory: ParsedMemoryIssue }> {
+    const normalized = normalizeDraft(draft);
+    const detail = norm(normalized.detail);
+    const allActive = await this.listByStatus("active");
+    const hash = sha256(detail);
+    const existing = allActive.find((m) => (m.memoryHash || sha256(norm(m.detail))) === hash);
+    if (existing) {
+      const memory = await this.mergeSchema(existing, normalized);
+      return { created: false, memory };
+    }
+
+    const date = localDate();
+    const labels = memLabels(sessionId, normalized.kind, normalized.topics);
+    const title = `${MEMORY_TITLE_PREFIX}${trunc(detail, 72)}`;
+    const body = stringifyFlatYaml([["memory_hash", hash], ["date", date], ["detail", detail]]);
+    await this.client.ensureLabels(labels);
+    const issue = await this.client.createIssue({ title, body, labels });
+    return {
+      created: true,
+      memory: {
+        issueNumber: issue.number,
+        title,
+        memoryId: String(issue.number),
+        memoryHash: hash,
+        sessionId,
+        date,
+        detail,
+        ...(normalized.kind ? { kind: normalized.kind } : {}),
+        ...(normalized.topics && normalized.topics.length > 0 ? { topics: normalized.topics } : {}),
+        status: "active",
+      },
+    };
+  }
+
+  async update(memoryId: string, patch: { detail?: string; kind?: string; topics?: string[] }): Promise<ParsedMemoryIssue | null> {
+    const current = await this.get(memoryId, "all");
+    if (!current) return null;
+    const nextDetail = typeof patch.detail === "string" && patch.detail.trim() ? norm(patch.detail) : current.detail;
+    const nextKind = patch.kind !== undefined ? normalizeLabelValue(patch.kind, "kind:") : current.kind;
+    const nextTopics = patch.topics !== undefined
+      ? uniqueNormalized(patch.topics.map((topic) => normalizeLabelValue(topic, "topic:")).filter(Boolean) as string[])
+      : uniqueNormalized(current.topics ?? []);
+    const nextHash = sha256(nextDetail);
+    const duplicate = (await this.listByStatus("active")).find((memory) => {
+      if (memory.issueNumber === current.issueNumber) return false;
+      return (memory.memoryHash || sha256(norm(memory.detail))) === nextHash;
+    });
+    if (duplicate) throw new Error(`another active memory already stores this detail as [${duplicate.memoryId}]`);
+    const nextTitle = `${MEMORY_TITLE_PREFIX}${trunc(nextDetail, 72)}`;
+    const nextBody = stringifyFlatYaml([["memory_hash", nextHash], ["date", current.date], ["detail", nextDetail]]);
+    const nextLabels = memLabels(current.sessionId, nextKind, nextTopics);
+    await this.client.ensureLabels(nextLabels);
+    await this.client.updateIssue(current.issueNumber, { title: nextTitle, body: nextBody });
+    await this.client.syncManagedLabels(current.issueNumber, nextLabels);
+    return {
+      ...current,
+      title: nextTitle,
+      memoryHash: nextHash,
+      detail: nextDetail,
+      ...(nextKind ? { kind: nextKind } : {}),
+      ...(nextTopics.length > 0 ? { topics: nextTopics } : {}),
+    };
+  }
+
+  async forget(memoryId: string): Promise<ParsedMemoryIssue | null> {
+    const id = memoryId.trim();
+    if (!id) throw new Error("memoryId is empty");
+    const mem = await this.get(id, "active");
+    if (!mem) return null;
+    await this.client.syncManagedLabels(mem.issueNumber, memLabels(mem.sessionId, mem.kind, mem.topics));
+    await this.client.updateIssue(mem.issueNumber, { state: "closed" });
+    return { ...mem, status: "stale" };
+  }
+
+  async syncFromConversation(session: SessionMirrorState, snapshot: TranscriptSnapshot): Promise<boolean> {
     try {
       const decision = await this.generateDecision(session, snapshot);
       const { savedCount, staledCount } = await this.applyDecision(session.sessionId, decision);
       if (savedCount > 0 || staledCount > 0)
         this.api.logger.info?.(`clawmem: synced memories for ${session.sessionId} (saved=${savedCount}, stale=${staledCount})`);
+      return true;
     } catch (error) {
       this.api.logger.warn(`clawmem: memory capture failed: ${String(error)}`);
+      return false;
     }
   }
 
-  private async list(status: "active" | "stale" | "all"): Promise<ParsedMemoryIssue[]> {
+  private async listByStatus(status: "active" | "stale" | "all"): Promise<ParsedMemoryIssue[]> {
     const labels = ["type:memory"];
-    if (status === "active") labels.push(LABEL_MEMORY_ACTIVE);
-    else if (status === "stale") labels.push(LABEL_MEMORY_STALE);
+    const state = status === "active" ? "open" : "all";
     const out: ParsedMemoryIssue[] = [];
     for (let page = 1; page <= 20; page++) {
-      const batch = await this.client.listIssues({ labels, state: "all", page, perPage: 100 });
-      for (const issue of batch) { const p = this.parseIssue(issue); if (p) out.push(p); }
+      const batch = await this.client.listIssues({ labels, state, page, perPage: 100 });
+      for (const issue of batch) {
+        const parsed = this.parseIssue(issue);
+        if (!parsed) continue;
+        if (status !== "all" && parsed.status !== status) continue;
+        out.push(parsed);
+      }
       if (batch.length < 100) break;
     }
     return out;
   }
 
-  private parseIssue(issue: { number: number; title?: string; body?: string; labels?: Array<{ name?: string } | string> }): ParsedMemoryIssue | null {
+  private async searchViaBackend(query: string, limit: number): Promise<ParsedMemoryIssue[]> {
+    const repo = this.client.repo();
+    if (!repo) return [];
+    const qualified = buildMemorySearchQuery(query, repo);
+    const batch = await this.client.searchIssues(qualified, { perPage: Math.min(100, Math.max(limit * 3, 20)) });
+    return batch
+      .map((issue) => this.parseIssue(issue))
+      .filter((memory): memory is ParsedMemoryIssue => memory !== null && memory.status === "active")
+      .slice(0, limit);
+  }
+
+  private async searchLocally(normalizedQuery: string, limit: number): Promise<ParsedMemoryIssue[]> {
+    const memories = await this.listByStatus("active");
+    return memories
+      .map((m) => ({ m, score: scoreMemoryMatch(m, normalizedQuery) }))
+      .filter((e) => e.score > 0)
+      .sort((a, b) => b.score - a.score || b.m.issueNumber - a.m.issueNumber)
+      .slice(0, limit)
+      .map((e) => e.m);
+  }
+
+  private parseIssue(issue: { number: number; title?: string; body?: string; state?: string; labels?: Array<{ name?: string } | string> }): ParsedMemoryIssue | null {
     const labels = extractLabelNames(issue.labels);
     if (!labels.includes("type:memory")) return null;
-    const sessionId = labelVal(labels, "session:"), date = labelVal(labels, "date:");
+    const sessionId = labelVal(labels, "session:"), kind = labelVal(labels, "kind:");
     const topics = labels.filter((l) => l.startsWith("topic:")).map((l) => l.slice(6).trim()).filter(Boolean);
     const rawBody = (issue.body ?? "").trim();
     const body = rawBody ? parseFlatYaml(rawBody) : {};
     const detail = body.detail?.trim() || rawBody;
-    if (!sessionId || !date || !detail) return null;
+    const status = issue.state === "closed" || labels.includes(LABEL_MEMORY_STALE) ? "stale" : "active";
+    if (!detail) return null;
     return {
       issueNumber: issue.number, title: issue.title?.trim() || "",
       memoryId: body.memory_id?.trim() || String(issue.number),
       memoryHash: body.memory_hash?.trim() || undefined,
-      sessionId, date, detail,
+      sessionId: sessionId || "legacy",
+      date: body.date?.trim() || "1970-01-01",
+      detail,
+      ...(kind ? { kind } : {}),
       ...(topics.length > 0 ? { topics } : {}),
-      status: labels.includes(LABEL_MEMORY_STALE) ? "stale" : "active",
+      status,
     };
   }
 
   private async applyDecision(sessionId: string, decision: MemoryDecision): Promise<{ savedCount: number; staledCount: number }> {
-    const allActive = await this.list("active");
+    const allActive = await this.listByStatus("active");
     const activeById = new Map(allActive.map((m) => [m.memoryId, m]));
-    const existingHashes = new Set(allActive.map((m) => m.memoryHash || sha256(norm(m.detail))));
+    const activeByHash = new Map(allActive.map((m) => [m.memoryHash || sha256(norm(m.detail)), m]));
     let savedCount = 0;
     for (const raw of decision.save) {
-      const detail = norm(raw);
+      const draft = normalizeDraft(raw);
+      const detail = norm(draft.detail);
       if (!detail) continue;
       const hash = sha256(detail);
-      if (existingHashes.has(hash)) continue;
-      const date = localDate(), labels = memLabels(sessionId, date, "active");
+      const existing = activeByHash.get(hash);
+      if (existing) {
+        const merged = await this.mergeSchema(existing, draft);
+        activeByHash.set(hash, merged);
+        continue;
+      }
+      const labels = memLabels(sessionId, draft.kind, draft.topics);
+      const date = localDate();
       const title = `${MEMORY_TITLE_PREFIX}${trunc(detail, 72)}`;
-      const body = stringifyFlatYaml([["memory_hash", hash], ["detail", detail]]);
+      const body = stringifyFlatYaml([["memory_hash", hash], ["date", date], ["detail", detail]]);
       await this.client.ensureLabels(labels);
-      await this.client.createIssue({ title, body, labels });
-      existingHashes.add(hash);
+      const issue = await this.client.createIssue({ title, body, labels });
+      activeByHash.set(hash, {
+        issueNumber: issue.number,
+        title,
+        memoryId: String(issue.number),
+        memoryHash: hash,
+        sessionId,
+        date,
+        detail,
+        ...(draft.kind ? { kind: draft.kind } : {}),
+        ...(draft.topics && draft.topics.length > 0 ? { topics: draft.topics } : {}),
+        status: "active",
+      });
       savedCount++;
     }
     let staledCount = 0;
     for (const id of [...new Set(decision.stale.map((s) => s.trim()).filter(Boolean))]) {
       const mem = activeById.get(id);
       if (!mem) continue;
-      await this.client.ensureLabels([LABEL_MEMORY_STALE]);
-      await this.client.syncManagedLabels(mem.issueNumber, memLabels(mem.sessionId, mem.date, "stale"));
+      await this.client.syncManagedLabels(mem.issueNumber, memLabels(mem.sessionId, mem.kind, mem.topics));
+      await this.client.updateIssue(mem.issueNumber, { state: "closed" });
       staledCount++;
     }
     return { savedCount, staledCount };
@@ -103,17 +268,29 @@ export class MemoryStore {
 
   private async generateDecision(session: SessionMirrorState, snapshot: TranscriptSnapshot): Promise<MemoryDecision> {
     if (snapshot.messages.length === 0) return { save: [], stale: [] };
-    const recent = (await this.list("active")).sort((a, b) => b.issueNumber - a.issueNumber).slice(0, 20);
-    const existingBlock = recent.length === 0 ? "None." : recent.map((m) => `[${m.memoryId}] ${m.detail}`).join("\n");
+    const recent = (await this.listByStatus("active")).sort((a, b) => b.issueNumber - a.issueNumber).slice(0, 20);
+    const existingBlock = recent.length === 0 ? "None." : recent.map((m) => {
+      const schema = [m.kind ? `kind=${m.kind}` : "", ...(m.topics ?? []).map((topic) => `topic=${topic}`)].filter(Boolean).join(", ");
+      return `[${m.memoryId}] ${schema ? `${schema} | ` : ""}${m.detail}`;
+    }).join("\n");
+    const schema = await this.listSchema();
+    const schemaBlock = [
+      `Existing kinds: ${schema.kinds.length > 0 ? schema.kinds.join(", ") : "None."}`,
+      `Existing topics: ${schema.topics.length > 0 ? schema.topics.join(", ") : "None."}`,
+    ].join("\n");
     const subagent = this.api.runtime.subagent;
     const sessionKey = subKey(session, "memory");
     const message = [
       "Extract durable memories from the conversation below.",
-      'Return JSON only in the form {"save":["..."],"stale":["memory-id"]}.',
-      "Use save for stable, reusable facts, preferences, decisions, constraints, and ongoing context worth remembering later.",
+      'Return JSON only in the form {"save":[{"detail":"...","kind":"...","topics":["..."]}],"stale":["memory-id"]}.',
+      "Use save for stable, reusable facts, preferences, decisions, constraints, workflows, and ongoing context worth remembering later.",
       "Use stale for existing memory IDs only when the conversation clearly supersedes or invalidates them.",
+      "Infer kind and topics when they would help future retrieval. Reuse existing kinds and topics when possible.",
+      "If no existing kind fits, you may propose a new short kind label. Keep kinds concise and reusable.",
+      "Topics should be short reusable tags, not sentences. Prefer 0-3 topics per memory.",
       "Do not save temporary requests, startup boilerplate, tool chatter, summaries about internal helper sessions, or one-off operational details.",
       "Prefer empty arrays when nothing durable should be remembered.",
+      "", "<existing-schema>", schemaBlock, "</existing-schema>",
       "", "<existing-active-memories>", existingBlock, "</existing-active-memories>",
       "", "<conversation>", fmtTranscript(snapshot.messages), "</conversation>",
     ].join("\n");
@@ -121,7 +298,7 @@ export class MemoryStore {
       const run = await subagent.run({
         sessionKey, message, deliver: false, lane: "clawmem-memory",
         idempotencyKey: sha256(`${session.sessionId}:${snapshot.messages.length}:memory-decision`),
-        extraSystemPrompt: "You extract durable memory updates from OpenClaw conversations. Output JSON only with string arrays save and stale.",
+        extraSystemPrompt: "You extract durable memory updates from OpenClaw conversations. Output JSON only with save objects containing detail, optional kind, and optional topics, plus stale string ids.",
       });
       const wait = await subagent.waitForRun({ runId: run.runId, timeoutMs: this.config.summaryWaitTimeoutMs });
       if (wait.status === "timeout") throw new Error("memory decision subagent timed out");
@@ -132,18 +309,149 @@ export class MemoryStore {
       return parseDecision(text);
     } finally { subagent.deleteSession({ sessionKey, deleteTranscript: true }).catch(() => {}); }
   }
+
+  private async mergeSchema(memory: ParsedMemoryIssue, draft: MemoryDraft): Promise<ParsedMemoryIssue> {
+    const normalized = normalizeDraft(draft);
+    const nextKind = normalized.kind ?? memory.kind;
+    const currentTopics = uniqueNormalized(memory.topics ?? []);
+    const nextTopics = uniqueNormalized([...currentTopics, ...(normalized.topics ?? [])]);
+    const sameKind = (memory.kind ?? "") === (nextKind ?? "");
+    const sameTopics = JSON.stringify(currentTopics) === JSON.stringify(nextTopics);
+    if (sameKind && sameTopics) return memory;
+    const labels = memLabels(memory.sessionId, nextKind, nextTopics);
+    await this.client.ensureLabels(labels);
+    await this.client.syncManagedLabels(memory.issueNumber, labels);
+    return {
+      ...memory,
+      ...(nextKind ? { kind: nextKind } : {}),
+      ...(nextTopics.length > 0 ? { topics: nextTopics } : {}),
+    };
+  }
 }
 
-function memLabels(sessionId: string, date: string, status: "active" | "stale"): string[] {
-  return ["type:memory", `session:${sessionId}`, `date:${date}`, status === "active" ? LABEL_MEMORY_ACTIVE : LABEL_MEMORY_STALE];
+function memLabels(sessionId: string, kind?: string, topics?: string[]): string[] {
+  return [
+    "type:memory",
+    `session:${sessionId}`,
+    ...(kind ? [`kind:${kind}`] : []),
+    ...((topics ?? []).map((topic) => `topic:${topic}`)),
+  ];
 }
 function norm(v: string): string { return v.replace(/\s+/g, " ").trim(); }
 function trunc(v: string, max: number): string { const s = norm(v); return s.length <= max ? s : `${s.slice(0, max - 1).trimEnd()}…`; }
+function normalizeSearch(v: string): string {
+  return v.normalize("NFKC").toLowerCase().replace(/\s+/g, " ").trim();
+}
+function buildSearchIndex(memory: ParsedMemoryIssue): SearchIndex {
+  return {
+    title: normalizeSearch(memory.title),
+    detail: normalizeSearch(memory.detail),
+    ...(memory.kind ? { kind: normalizeSearch(memory.kind) } : {}),
+    topics: (memory.topics ?? []).map(normalizeSearch).filter(Boolean),
+  };
+}
+function searchTokens(v: string): string[] {
+  const seen = new Set<string>();
+  for (const token of v.split(/[^0-9\p{L}]+/u)) {
+    if (token.length > 1) seen.add(token);
+  }
+  for (const chunk of v.match(/[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}]{2,}/gu) ?? []) {
+    for (let i = 0; i < chunk.length; i++) {
+      seen.add(chunk[i]!);
+      if (i + 1 < chunk.length) seen.add(chunk.slice(i, i + 2));
+    }
+  }
+  return [...seen];
+}
+function charBigrams(v: string): Set<string> {
+  const compact = v.replace(/\s+/g, "");
+  if (compact.length < 2) return new Set(compact ? [compact] : []);
+  const out = new Set<string>();
+  for (let i = 0; i < compact.length - 1; i++) out.add(compact.slice(i, i + 2));
+  return out;
+}
+function overlapRatio(left: Set<string>, right: Set<string>): number {
+  if (left.size === 0 || right.size === 0) return 0;
+  let hits = 0;
+  for (const token of left) if (right.has(token)) hits++;
+  return hits / Math.max(left.size, right.size);
+}
+function buildMemorySearchQuery(query: string, repo: string): string {
+  const parts = [query.trim(), `repo:${repo}`, "is:issue", "state:open", 'label:"type:memory"'].filter(Boolean);
+  return parts.join(" ");
+}
+export function scoreMemoryMatch(memory: ParsedMemoryIssue, rawQuery: string): number {
+  const query = normalizeSearch(rawQuery);
+  if (!query) return 0;
+  const idx = buildSearchIndex(memory);
+  const tokens = searchTokens(query);
+  const queryTokenSet = new Set(tokens);
+  const titleTokenSet = new Set(searchTokens(idx.title));
+  const detailTokenSet = new Set(searchTokens(idx.detail));
+  const kindTokenSet = new Set(searchTokens(idx.kind ?? ""));
+  const topicTokenSet = new Set(idx.topics.flatMap(searchTokens));
+  let score = 0;
+
+  if (idx.title.includes(query)) score += 18;
+  if (idx.detail.includes(query)) score += 12;
+  if (idx.kind?.includes(query)) score += 8;
+  for (const topic of idx.topics) if (topic.includes(query)) score += 10;
+
+  for (const token of tokens) {
+    if (idx.title.includes(token)) score += 4;
+    if (idx.detail.includes(token)) score += 2;
+    if (idx.kind?.includes(token)) score += 3;
+    if (idx.topics.some((topic) => topic.includes(token))) score += 3;
+  }
+
+  score += overlapRatio(queryTokenSet, titleTokenSet) * 10;
+  score += overlapRatio(queryTokenSet, detailTokenSet) * 6;
+  score += overlapRatio(queryTokenSet, kindTokenSet) * 6;
+  score += overlapRatio(queryTokenSet, topicTokenSet) * 8;
+
+  const queryBigrams = charBigrams(query);
+  score += overlapRatio(queryBigrams, charBigrams(idx.title)) * 6;
+  score += overlapRatio(queryBigrams, charBigrams(idx.detail)) * 3;
+
+  return score;
+}
+function normalizeDraft(input: MemoryDraft): MemoryDraft {
+  const detail = norm(input.detail);
+  if (!detail) throw new Error("memory detail is empty");
+  const kind = normalizeLabelValue(input.kind, "kind:");
+  const topics = uniqueNormalized((input.topics ?? []).map((topic) => normalizeLabelValue(topic, "topic:")).filter(Boolean) as string[]);
+  return {
+    detail,
+    ...(kind ? { kind } : {}),
+    ...(topics.length > 0 ? { topics } : {}),
+  };
+}
+function normalizeLabelValue(value: string | undefined, prefix: string): string | undefined {
+  if (!value) return undefined;
+  const raw = value.trim().replace(new RegExp(`^${prefix}`, "i"), "");
+  const normalized = raw.normalize("NFKC")
+    .toLowerCase()
+    .replace(/[\s_]+/g, "-")
+    .replace(/[^\p{L}\p{N}-]+/gu, "-")
+    .replace(/-{2,}/g, "-")
+    .replace(/^-+|-+$/g, "");
+  return normalized || undefined;
+}
+function normalizeOptionalLabelValue(value: string | undefined, prefix: string): string | undefined {
+  try {
+    return normalizeLabelValue(value, prefix);
+  } catch {
+    return undefined;
+  }
+}
+function uniqueNormalized(values: string[]): string[] {
+  return [...new Set(values.map((value) => value.trim()).filter(Boolean))].sort();
+}
 function parseDecision(raw: string): MemoryDecision {
   const tryParse = (s: string): MemoryDecision | null => {
     try {
       const p = JSON.parse(s) as Record<string, unknown>;
-      return { save: Array.isArray(p.save) ? p.save.filter((v): v is string => typeof v === "string") : [],
+      return { save: Array.isArray(p.save) ? p.save.map(parseSaveItem).filter((v): v is MemoryDraft => Boolean(v)) : [],
                stale: Array.isArray(p.stale) ? p.stale.filter((v): v is string => typeof v === "string") : [] };
     } catch { return null; }
   };
@@ -155,3 +463,20 @@ function parseDecision(raw: string): MemoryDecision {
     throw new Error("memory decision subagent returned invalid JSON");
   })();
 }
+function parseSaveItem(value: unknown): MemoryDraft | null {
+  if (typeof value === "string") {
+    const detail = norm(value);
+    return detail ? { detail } : null;
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const record = value as Record<string, unknown>;
+  const detail = typeof record.detail === "string" ? norm(record.detail) : "";
+  if (!detail) return null;
+  const kind = typeof record.kind === "string" ? record.kind : undefined;
+  const topics = Array.isArray(record.topics) ? record.topics.filter((v): v is string => typeof v === "string") : undefined;
+  try {
+    return normalizeDraft({ detail, ...(kind ? { kind } : {}), ...(topics ? { topics } : {}) });
+  } catch {
+    return null;
+  }
+}