@hypercarrier/rarebit 0.1.0-alpha.4 → 0.1.0-alpha.6

package/scripts/e2e-recall-pi083.mjs

@@ -1,257 +1,59 @@
 import assert from "node:assert/strict";
-import { access, mkdtemp, readFile, rm } from "node:fs/promises";
+import { execFileSync, spawnSync } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { setTimeout as delay } from "node:timers/promises";
-import { pathToFileURL } from "node:url";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
 
-import registerPiRarebit from "../src/extension.mjs";
+const root = fileURLToPath(new URL("..", import.meta.url));
+const piVersion = "0.83.0";
+const work = await mkdtemp(join(tmpdir(), "rarebit-pi083-recall-"));
 
-async function waitFor(predicate, label, timeout = 2_000) {
-  const end = Date.now() + timeout;
-  while (!predicate()) {
-    if (Date.now() >= end) throw new Error(`Timed out waiting for ${label}`);
-    await delay(5);
-  }
+function run(command, args, cwd = root) {
+  return execFileSync(command, args, { cwd, encoding: "utf8" });
 }
 
-function expectedRecallMarkdown(conversationPath, detailedPath, request) {
-  return `# Rarebit Recall
-
-*Use these local private evidence files to recover historical context for this turn.*
-
-## How to use this bundle
-
-1. Treat **Current request** below as the exact current user request.
-2. Read **Conversation** first for meaning.
-3. Use **Detailed evidence** only for source, Session, branch, or lineage facts.
-4. Answer the current request using this evidence.
-
-## Local private evidence files
-
-**Conversation** — \`rarebit_conversation/v1\`
-
-\`\`\`text
-${conversationPath}
-\`\`\`
-
-**Detailed evidence** — \`rarebit_message_recall/v1\`
-
-\`\`\`text
-${detailedPath}
-\`\`\`
-
-## Current request
-
-\`\`\`text
-${request}
-\`\`\``;
-}
-
-function conversationPathFrom(message) {
-  const match = message.match(
-    /\*\*Conversation\*\* — `rarebit_conversation\/v1`\n\n```text\n([^\n]*rarebit-conversation\.json)\n```/,
-  );
-  assert.ok(match, "Recall Markdown must contain the fenced conversation path");
-  return match[1];
-}
-
-function detailedPathFrom(message) {
-  const match = message.match(
-    /\*\*Detailed evidence\*\* — `rarebit_message_recall\/v1`\n\n```text\n([^\n]*rarebit-evidence\.json)\n```/,
-  );
-  assert.ok(match, "Recall Markdown must contain the fenced detailed path");
-  return match[1];
-}
-
-const root =
-  process.env.PI_CODING_AGENT_ROOT ??
-  resolve(
-    dirname(process.execPath),
-    "../lib/node_modules/@earendil-works/pi-coding-agent",
-  );
-const packageJson = JSON.parse(
-  await readFile(join(root, "package.json"), "utf8"),
-);
-assert.equal(
-  packageJson.version,
-  "0.83.0",
-  `Pi 0.83.0 is required; found ${packageJson.version}`,
-);
-const pi = await import(pathToFileURL(join(root, "dist/index.js")).href);
-const faux = await import(
-  pathToFileURL(
-    join(root, "node_modules/@earendil-works/pi-ai/dist/providers/faux.js"),
-  ).href
-);
-
-const temp = await mkdtemp(join(tmpdir(), "hc-rarebit-pi083-recall-"));
-const sessions = join(temp, "sessions");
-const manager = pi.SessionManager.create(temp, sessions);
-const runtime = await pi.ModelRuntime.create({ modelsPath: null });
-const provider = faux.fauxProvider({
-  provider: "recall-faux",
-  models: [{ id: "recall-faux" }],
-});
-runtime.registerNativeProvider(provider.provider);
-let releaseBusy;
-let busyEntered;
-let fourthContext;
-const busyRelease = new Promise((resolve) => {
-  releaseBusy = resolve;
-});
-const busyEntry = new Promise((resolve) => {
-  busyEntered = resolve;
-});
-provider.setResponses([
-  faux.fauxAssistantMessage("seed complete"),
-  faux.fauxAssistantMessage("idle complete"),
-  async () => {
-    busyEntered();
-    return busyRelease.then(() => faux.fauxAssistantMessage("busy complete"));
-  },
-  (context) => {
-    fourthContext = context;
-    return faux.fauxAssistantMessage("steered complete");
-  },
-]);
-const settings = pi.SettingsManager.inMemory({
-  compaction: { enabled: false },
-});
-const loader = new pi.DefaultResourceLoader({
-  cwd: temp,
-  agentDir: temp,
-  settingsManager: settings,
-  noSkills: true,
-  noPromptTemplates: true,
-  noThemes: true,
-  noContextFiles: true,
-  extensionFactories: [registerPiRarebit],
-});
-await loader.reload();
-const { session } = await pi.createAgentSession({
-  cwd: temp,
-  agentDir: temp,
-  model: provider.getModel(),
-  modelRuntime: runtime,
-  noTools: "all",
-  resourceLoader: loader,
-  sessionManager: manager,
-  settingsManager: settings,
-});
-const recallDirectories = [];
 try {
-  await session.prompt("seed persistent Session");
-  await session.agent.waitForIdle();
-  await session.prompt("/rarebit recall exact idle request", {
-    streamingBehavior: "steer",
+  const packed = JSON.parse(
+    run("npm", ["pack", "--json", "--ignore-scripts", "--pack-destination", work]),
+  )[0];
+  const tarball = join(work, packed.filename);
+  run("npm", ["init", "-y"], work);
+  run(
+    "npm",
+    [
+      "install",
+      "--ignore-scripts",
+      tarball,
+      `@earendil-works/pi-coding-agent@${piVersion}`,
+    ],
+    work,
+  );
+  const installedRoot = join(
+    work,
+    "node_modules",
+    "@earendil-works",
+    "pi-coding-agent",
+  );
+  const recall = join(
+    work,
+    "node_modules",
+    "@hypercarrier",
+    "rarebit",
+    "scripts",
+    "e2e-recall-pi0842.mjs",
+  );
+  const result = spawnSync(process.execPath, [recall], {
+    cwd: work,
+    encoding: "utf8",
+    env: {
+      ...process.env,
+      PI_CODING_AGENT_ROOT: installedRoot,
+      RAREBIT_EXPECTED_PI_VERSION: piVersion,
+    },
   });
-  await waitFor(
-    () => provider.state.callCount === 2,
-    "idle Recall provider call",
-  );
-  await session.agent.waitForIdle();
-  const userEntries = manager
-    .getBranch()
-    .filter((entry) => JSON.stringify(entry).includes("exact idle request"));
-  assert.equal(userEntries.length, 1);
-  const message = userEntries[0].message ?? userEntries[0];
-  const idleMessageText = message.content[0].text;
-  const idleConversationPath = conversationPathFrom(idleMessageText);
-  const idleDetailedPath = detailedPathFrom(idleMessageText);
-  assert.equal(
-    idleMessageText,
-    expectedRecallMarkdown(
-      idleConversationPath,
-      idleDetailedPath,
-      "exact idle request",
-    ),
-  );
-  recallDirectories.push(dirname(idleConversationPath));
-  await access(idleConversationPath);
-  await access(idleDetailedPath);
-  assert.equal(
-    manager
-      .getBranch()
-      .some(
-        (entry) =>
-          entry.customType === "rarebit.recall" ||
-          entry.message?.customType === "rarebit.recall",
-      ),
-    false,
-  );
-
-  assert.equal(provider.state.callCount, 2);
-  const queueUpdates = [];
-  session.subscribe((event) => {
-    if (event.type === "queue_update") queueUpdates.push(event);
-  });
-  const busyRun = session.prompt("busy seed");
-  await busyEntry;
-  await session.prompt("/rarebit recall exact busy request", {
-    streamingBehavior: "steer",
-  });
-  await waitFor(
-    () => queueUpdates.some((event) => event.steering?.length === 1),
-    "busy Recall steering queue",
-  );
-  const queued = queueUpdates.find((event) => event.steering?.length === 1);
-  assert.equal(queued.steering.length, 1);
-  assert.equal(queued.followUp?.length ?? 0, 0);
-  const queuedMessage = queued.steering[0];
-  const busyMessageText =
-    typeof queuedMessage === "string"
-      ? queuedMessage
-      : (queuedMessage.content?.[0]?.text ?? queuedMessage.content);
-  const busyConversationPath = conversationPathFrom(busyMessageText);
-  const busyDetailedPath = detailedPathFrom(busyMessageText);
-  assert.equal(
-    busyMessageText,
-    expectedRecallMarkdown(
-      busyConversationPath,
-      busyDetailedPath,
-      "exact busy request",
-    ),
-  );
-  recallDirectories.push(dirname(busyConversationPath));
-  await access(busyConversationPath);
-  await access(busyDetailedPath);
-  releaseBusy();
-  await busyRun;
-  await session.agent.waitForIdle();
-  assert.equal(provider.state.callCount, 4);
-  const recallCount = (texts) =>
-    texts.filter((text) => text === busyMessageText).length;
-  const fourthUserTexts = (fourthContext?.messages ?? [])
-    .filter((message) => message.role === "user")
-    .map((message) => message.content?.[0]?.text ?? "");
-  assert.equal(recallCount(fourthUserTexts), 1);
-  const persistedUserTexts = manager
-    .getBranch()
-    .filter((entry) => (entry.message ?? entry).role === "user")
-    .map((entry) => (entry.message ?? entry).content?.[0]?.text ?? "");
-  assert.equal(recallCount(persistedUserTexts), 1);
-  assert.equal(
-    manager
-      .getBranch()
-      .some(
-        (entry) =>
-          entry.customType === "rarebit.recall" ||
-          entry.message?.customType === "rarebit.recall",
-      ),
-    false,
-  );
-  console.log(
-    `Pi ${packageJson.version} Recall E2E passed: idle and busy steer Markdown messages; no custom receipt.`,
-  );
+  assert.equal(result.status, 0, `${result.stdout}\n${result.stderr}`);
+  process.stdout.write(`Pi ${piVersion} Recall E2E passed from the packed artifact.\n`);
 } finally {
-  releaseBusy?.();
-  await Promise.all(
-    recallDirectories.map((directory) =>
-      rm(directory, { recursive: true, force: true }),
-    ),
-  );
-  session.dispose();
-  runtime.unregisterProvider("recall-faux");
-  await rm(temp, { recursive: true, force: true });
+  await rm(work, { recursive: true, force: true });
 }

package/scripts/e2e-recall-pi0842.mjs

@@ -0,0 +1,259 @@
+import assert from "node:assert/strict";
+import { access, mkdtemp, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+import registerPiRarebit from "../src/extension.mjs";
+
+async function waitFor(predicate, label, timeout = 2_000) {
+  const end = Date.now() + timeout;
+  while (!predicate()) {
+    if (Date.now() >= end) throw new Error(`Timed out waiting for ${label}`);
+    await delay(5);
+  }
+}
+
+function expectedRecallMarkdown(conversationPath, detailedPath, request) {
+  return `# Rarebit Recall
+
+*Use these local private evidence files to recover historical context for this turn.*
+
+## How to use this bundle
+
+1. Treat **Current request** below as the exact current user request.
+2. Read **Conversation** first for meaning.
+3. Use **Detailed evidence** only for source, Session, branch, or lineage facts.
+4. Answer the current request using this evidence.
+
+## Local private evidence files
+
+**Conversation** — \`rarebit_conversation/v1\`
+
+\`\`\`text
+${conversationPath}
+\`\`\`
+
+**Detailed evidence** — \`rarebit_message_recall/v1\`
+
+\`\`\`text
+${detailedPath}
+\`\`\`
+
+## Current request
+
+\`\`\`text
+${request}
+\`\`\``;
+}
+
+function conversationPathFrom(message) {
+  const match = message.match(
+    /\*\*Conversation\*\* — `rarebit_conversation\/v1`\n\n```text\n([^\n]*rarebit-conversation\.json)\n```/,
+  );
+  assert.ok(match, "Recall Markdown must contain the fenced conversation path");
+  return match[1];
+}
+
+function detailedPathFrom(message) {
+  const match = message.match(
+    /\*\*Detailed evidence\*\* — `rarebit_message_recall\/v1`\n\n```text\n([^\n]*rarebit-evidence\.json)\n```/,
+  );
+  assert.ok(match, "Recall Markdown must contain the fenced detailed path");
+  return match[1];
+}
+
+const bundledPiRoot = resolve(
+  dirname(fileURLToPath(import.meta.url)),
+  "../node_modules/@earendil-works/pi-coding-agent",
+);
+const root =
+  process.env.PI_CODING_AGENT_ROOT ??
+  bundledPiRoot;
+const expectedPiVersion = process.env.RAREBIT_EXPECTED_PI_VERSION ?? "0.84.2";
+const packageJson = JSON.parse(
+  await readFile(join(root, "package.json"), "utf8"),
+);
+assert.equal(
+  packageJson.version,
+  expectedPiVersion,
+  `Pi ${expectedPiVersion} is required; found ${packageJson.version}`,
+);
+const pi = await import(pathToFileURL(join(root, "dist/index.js")).href);
+const faux = await import(
+  pathToFileURL(
+    join(root, "node_modules/@earendil-works/pi-ai/dist/providers/faux.js"),
+  ).href
+);
+
+const temp = await mkdtemp(join(tmpdir(), "rarebit-pi0842-recall-"));
+const sessions = join(temp, "sessions");
+const manager = pi.SessionManager.create(temp, sessions);
+const runtime = await pi.ModelRuntime.create({ modelsPath: null });
+const provider = faux.fauxProvider({
+  provider: "recall-faux",
+  models: [{ id: "recall-faux" }],
+});
+runtime.registerNativeProvider(provider.provider);
+let releaseBusy;
+let busyEntered;
+let fourthContext;
+const busyRelease = new Promise((resolve) => {
+  releaseBusy = resolve;
+});
+const busyEntry = new Promise((resolve) => {
+  busyEntered = resolve;
+});
+provider.setResponses([
+  faux.fauxAssistantMessage("seed complete"),
+  faux.fauxAssistantMessage("idle complete"),
+  async () => {
+    busyEntered();
+    return busyRelease.then(() => faux.fauxAssistantMessage("busy complete"));
+  },
+  (context) => {
+    fourthContext = context;
+    return faux.fauxAssistantMessage("steered complete");
+  },
+]);
+const settings = pi.SettingsManager.inMemory({
+  compaction: { enabled: false },
+});
+const loader = new pi.DefaultResourceLoader({
+  cwd: temp,
+  agentDir: temp,
+  settingsManager: settings,
+  noSkills: true,
+  noPromptTemplates: true,
+  noThemes: true,
+  noContextFiles: true,
+  extensionFactories: [registerPiRarebit],
+});
+await loader.reload();
+const { session } = await pi.createAgentSession({
+  cwd: temp,
+  agentDir: temp,
+  model: provider.getModel(),
+  modelRuntime: runtime,
+  noTools: "all",
+  resourceLoader: loader,
+  sessionManager: manager,
+  settingsManager: settings,
+});
+const recallDirectories = [];
+try {
+  await session.prompt("seed persistent Session");
+  await session.agent.waitForIdle();
+  await session.prompt("/rarebit recall exact idle request", {
+    streamingBehavior: "steer",
+  });
+  await waitFor(
+    () => provider.state.callCount === 2,
+    "idle Recall provider call",
+  );
+  await session.agent.waitForIdle();
+  const userEntries = manager
+    .getBranch()
+    .filter((entry) => JSON.stringify(entry).includes("exact idle request"));
+  assert.equal(userEntries.length, 1);
+  const message = userEntries[0].message ?? userEntries[0];
+  const idleMessageText = message.content[0].text;
+  const idleConversationPath = conversationPathFrom(idleMessageText);
+  const idleDetailedPath = detailedPathFrom(idleMessageText);
+  assert.equal(
+    idleMessageText,
+    expectedRecallMarkdown(
+      idleConversationPath,
+      idleDetailedPath,
+      "exact idle request",
+    ),
+  );
+  recallDirectories.push(dirname(idleConversationPath));
+  await access(idleConversationPath);
+  await access(idleDetailedPath);
+  assert.equal(
+    manager
+      .getBranch()
+      .some(
+        (entry) =>
+          entry.customType === "rarebit.recall" ||
+          entry.message?.customType === "rarebit.recall",
+      ),
+    false,
+  );
+
+  assert.equal(provider.state.callCount, 2);
+  const queueUpdates = [];
+  session.subscribe((event) => {
+    if (event.type === "queue_update") queueUpdates.push(event);
+  });
+  const busyRun = session.prompt("busy seed");
+  await busyEntry;
+  await session.prompt("/rarebit recall exact busy request", {
+    streamingBehavior: "steer",
+  });
+  await waitFor(
+    () => queueUpdates.some((event) => event.steering?.length === 1),
+    "busy Recall steering queue",
+  );
+  const queued = queueUpdates.find((event) => event.steering?.length === 1);
+  assert.equal(queued.steering.length, 1);
+  assert.equal(queued.followUp?.length ?? 0, 0);
+  const queuedMessage = queued.steering[0];
+  const busyMessageText =
+    typeof queuedMessage === "string"
+      ? queuedMessage
+      : (queuedMessage.content?.[0]?.text ?? queuedMessage.content);
+  const busyConversationPath = conversationPathFrom(busyMessageText);
+  const busyDetailedPath = detailedPathFrom(busyMessageText);
+  assert.equal(
+    busyMessageText,
+    expectedRecallMarkdown(
+      busyConversationPath,
+      busyDetailedPath,
+      "exact busy request",
+    ),
+  );
+  recallDirectories.push(dirname(busyConversationPath));
+  await access(busyConversationPath);
+  await access(busyDetailedPath);
+  releaseBusy();
+  await busyRun;
+  await session.agent.waitForIdle();
+  assert.equal(provider.state.callCount, 4);
+  const recallCount = (texts) =>
+    texts.filter((text) => text === busyMessageText).length;
+  const fourthUserTexts = (fourthContext?.messages ?? [])
+    .filter((message) => message.role === "user")
+    .map((message) => message.content?.[0]?.text ?? "");
+  assert.equal(recallCount(fourthUserTexts), 1);
+  const persistedUserTexts = manager
+    .getBranch()
+    .filter((entry) => (entry.message ?? entry).role === "user")
+    .map((entry) => (entry.message ?? entry).content?.[0]?.text ?? "");
+  assert.equal(recallCount(persistedUserTexts), 1);
+  assert.equal(
+    manager
+      .getBranch()
+      .some(
+        (entry) =>
+          entry.customType === "rarebit.recall" ||
+          entry.message?.customType === "rarebit.recall",
+      ),
+    false,
+  );
+  console.log(
+    `Pi ${packageJson.version} Recall E2E passed: idle and busy steer Markdown messages; no custom receipt.`,
+  );
+} finally {
+  releaseBusy?.();
+  await Promise.all(
+    recallDirectories.map((directory) =>
+      rm(directory, { recursive: true, force: true }),
+    ),
+  );
+  session.dispose();
+  runtime.unregisterProvider("recall-faux");
+  await rm(temp, { recursive: true, force: true });
+}

package/scripts/verify-package.mjs

@@ -13,16 +13,19 @@ const npm = (args, cwd = root) => run("npm", args, cwd);
 const required = [
   "package/README.md", "package/RUNBOOK.md", "package/VISUAL-LANGUAGE.md",
   "package/AGENTS.md", "package/CHANGELOG.md", "package/LICENSE",
-  "package/SECURITY.md", "package/bin/rarebit.mjs",
-  "package/src/index.mjs", "package/src/types.d.ts",
+  "package/SECURITY.md", "package/bin/rarebit.mjs", "package/bin/piq.mjs",
+  "package/src/index.mjs", "package/src/rarebit-fork-lineage.mjs", "package/src/rarebit-fork.mjs", "package/src/types.d.ts",
   "package/schemas/rarebit.schema.json", "package/test/rarebit-cli.test.mjs",
-  "package/scripts/e2e-recall-pi083.mjs", "package/scripts/verify-package.mjs",
+  "package/scripts/e2e-recall-pi083.mjs", "package/scripts/e2e-recall-pi0842.mjs", "package/scripts/verify-package.mjs",
 ];
 const forbiddenPath = /(^|\/)(\.git|node_modules|\.github|hc-rarebit\.mjs)(\/|$)|HyperCarrier|timeline|pi-team/i;
-const allowedBare = new Set(["@earendil-works/pi-ai"]);
+const allowedBare = new Set(["@earendil-works/pi-ai", "@earendil-works/pi-coding-agent"]);
 const packageFor = (specifier) => specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0];
 const packageJson = JSON.parse(await readFile(join(root, "package.json"), "utf8"));
-assert.equal(packageJson.version, "0.1.0-alpha.4", "release version mismatch");
+assert.equal(packageJson.version, "0.1.0-alpha.6", "release version mismatch");
+assert.equal(packageJson.peerDependencies?.["@earendil-works/pi-ai"], ">=0.83.0", "Pi AI peer range mismatch");
+for (const peer of ["@earendil-works/pi-ai", "@earendil-works/pi-coding-agent"])
+  assert.equal(packageJson.peerDependenciesMeta?.[peer]?.optional, true, `${peer} peer must remain optional`);
 
 const packed = JSON.parse(npm(["pack", "--json", "--ignore-scripts"]))[0];
 const tarball = join(root, packed.filename);
@@ -34,7 +37,7 @@ assert(!entries.includes("package/bin/hc-rarebit.mjs"), "legacy CLI is packed");
 const sourceFiles = entries.filter((path) => path.endsWith(".mjs") && !path.startsWith("package/test/"));
 for (const entry of sourceFiles) {
   const text = run("tar", ["-xOf", tarball, entry]);
-  for (const match of text.matchAll(/(?:from\s*|import\s*\()\s*["']([^"']+)["']/g)) {
+  for (const match of text.matchAll(/(?:\bfrom\s+|import\s*\()\s*["']([^"']+)["']/g)) {
     const specifier = match[1];
     if (!specifier.startsWith(".") && !specifier.startsWith("node:") && !allowedBare.has(packageFor(specifier))) {
       throw new Error(`undeclared runtime import ${specifier} in ${entry}`);
@@ -51,10 +54,10 @@ try {
   npm(["init", "-y"], temp);
   npm(["install", "--ignore-scripts", "--omit=dev", tarball], temp);
   const installed = "@hypercarrier/rarebit";
-  for (const subpath of ["", "/core", "/session", "/service", "/artifact-state", "/visual-language", "/extension"]) {
+  for (const subpath of ["", "/core", "/session", "/service", "/artifact-state", "/fork", "/fork-lineage", "/visual-language", "/extension"]) {
     run(process.execPath, ["--input-type=module", "-e", `await import(${JSON.stringify(installed + subpath)})`], temp);
   }
-  const imports = ["", "/core", "/session", "/service", "/artifact-state", "/visual-language", "/extension"]
+  const imports = ["", "/core", "/session", "/service", "/artifact-state", "/fork", "/fork-lineage", "/visual-language", "/extension"]
     .map((subpath) => `import ${JSON.stringify(installed + subpath)};`).join("\n");
   await writeFile(join(temp, "imports.mts"), imports);
   run(join(root, "node_modules/.bin/tsc"), ["--noEmit", "--module", "NodeNext", "--moduleResolution", "NodeNext", "--target", "ES2022", "--skipLibCheck", "imports.mts"], temp);