@staix/agent-mem 0.20.1 → 0.20.2

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-mem",
-  "version": "0.20.1",
+  "version": "0.20.2",
   "description": "Bounded project memory tools and seven deterministic capture hooks, without a resident worker.",
   "mcpServers": {
     "agent-mem": {

package/README.md

@@ -2,7 +2,7 @@
 
 Curated memory with append-only JSONL logs, a derived SQLite index, short- and long-term tiers, a typed graph, goals with leases, and git sync between machines. Extracted from [agent-hub](https://github.com/STAIxBWLB/agent-hub), with compatible storage and entry IDs.
 
-Version: 0.20.1. Requires Bun 1.4.2 or later; no runtime dependencies.
+Version: 0.20.2. Requires Bun 1.4.2 or later; no runtime dependencies.
 
 ## Quick start
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staix/agent-mem",
-  "version": "0.20.1",
+  "version": "0.20.2",
   "description": "Curated, shared memory for coding agents: append-only logs, a derived index, tiers and a typed graph.",
   "license": "MIT",
   "type": "module",

package/src/cli.ts

@@ -248,6 +248,8 @@ function markedSetupApplyError(parsed: ReturnType<typeof parseCommand>, error: u
     cause = "native_result_mismatch"; next = "Review the installed client's configuration format and version, then rerun setup preview."; partial = false;
   } else if (text === "setup receipt version is unsupported; run setup or undo with the release that wrote it") {
     cause = "setup_receipt_version_unsupported"; next = "Run setup or undo with the amem release that wrote the receipt."; partial = false;
+  } else if (text === "setup receipt was written from an Orca Claude profile; rerun setup from that Orca profile") {
+    cause = "setup_receipt_orca_profile"; next = "The receipt was written from an Orca Claude profile; rerun setup from that Orca profile."; partial = false;
   } else if (/^setup-owned .+ changed; refusing to overwrite it$/.test(text) || text === "Pi amem-session extension already exists and is not this setup's file"
     || text === "previous-runtime hook settings are customized; review hook configuration before retrying setup"
     || /^setup receipt (?:does not match this installation|target mismatch|invalid|directory ownership invalid)$/.test(text)) {

package/src/setup-paths.ts

@@ -67,7 +67,10 @@ export function resolveSetupPaths(env: SetupEnvironment = process.env, givenHome
     paths[target][index] = to;
     redirects.push({ target, from, to, reason: "Orca re-syncs this managed file from the personal source" });
   };
-  if (orcaHome(claude, "claude", env, home)) redirect("claude", 1, join(home, ".claude", "settings.json"));
+  if (orcaHome(claude, "claude", env, home)) {
+    redirect("claude", 0, join(home, ".claude.json"));
+    redirect("claude", 1, join(home, ".claude", "settings.json"));
+  }
   if (orcaHome(codex, "codex", env, home)) {
     redirect("codex", 0, join(home, ".codex", "config.toml"));
     redirect("codex", 1, join(home, ".codex", "hooks.json"));

package/src/setup.ts

@@ -214,6 +214,9 @@ function receipt(c: ReturnType<typeof context>, target: SetupTarget, requireRunt
   if (value.target !== target || typeof value.intent !== "string" || !/^[a-f0-9]{64}$/.test(value.intent) || requireRuntime && value.intent !== intent(c, target) || !["prepared", "applied"].includes(String(value.phase)) || !Array.isArray(value.changes) || value.changes.length !== c.paths[target].length && !(target === "jcode" && value.changes.length === 1)) throw Error("setup receipt does not match this installation");
   for (let i = 0; i < value.changes.length; i++) {
     const change = record(value.changes[i]); const currentPath = c.paths[target][i], legacyRedirect = c.redirects.some(row => row.target === target && row.from === change.path && row.to === currentPath);
+    if (target === "claude" && i === 0 && typeof change.path === "string" && change.path !== currentPath && !legacyRedirect
+      && resolveSetupPaths({ ...c.env, CLAUDE_CONFIG_DIR: dirname(change.path) }, c.home).redirects.some(row => row.from === change.path && row.to === currentPath))
+      throw Error("setup receipt was written from an Orca Claude profile; rerun setup from that Orca profile");
     if (change.path !== currentPath && !legacyRedirect || change.key !== `${target}:${i}`) throw Error("setup receipt target mismatch");
     for (const key of ["before", "after", ...(change.start !== undefined ? ["start"] : [])]) {
       const v = record(change[key]);
@@ -418,6 +421,8 @@ function prepare(c: ReturnType<typeof context>, target: SetupTarget, options: Se
   // Only a same-file before-image can restore a target. A newly authoritative personal source owns its current bytes.
   // Mapped per current path: a pre-#203 jcode receipt covers mcp.json only, so config.toml starts from its live image.
   const restored = c.paths[target].map((path, index) => { const change = prior?.changes[index];
+    // Validate ownership at the historical path before adopting a new source, without publishing to the copy.
+    if (prior && change && change.path !== path) restoreChange(prior, change, index, read(change.path));
     return prior && change && change.path === path ? restoreChange(prior, change, index, expected[index]!) : expected[index]!; });
   if (prior?.phase === "applied" && prior.intent === intent(c, target) && prior.changes.every((change, index) => managedAfter(target, index, change.before, change.after, expected[index]!))) return { value: prior, expected, unchanged: true };
   const changes: Change[] = c.paths[target].map((path, i) => ({ key: `${target}:${i}`, path, before: restored[i]!, after: restored[i]!, start: expected[i]! }));