@bunshin-cc/bunshin 0.3.2 → 0.4.0

package/dist/bin.js

@@ -2674,6 +2674,17 @@ ${d.text.replace(/\n*$/, "\n")}`),
   ];
   return parts.join("\n");
 }
+function removeBlock(file) {
+  const text2 = readText(file);
+  if (text2 === null) return false;
+  const start = text2.indexOf(BLOCK_BEGIN);
+  const end = text2.indexOf(BLOCK_END);
+  if (start < 0 || end < start) return false;
+  const rest = (text2.slice(0, start).replace(/\s*$/, "") + "\n" + text2.slice(end + BLOCK_END.length).replace(/^\s*/, "")).trim();
+  if (rest) writeTextAtomic(file, rest + "\n");
+  else fs5.unlinkSync(file);
+  return true;
+}
 function writeBlock(file, block2) {
   const text2 = readText(file) ?? "";
   const start = text2.indexOf(BLOCK_BEGIN);
@@ -2984,9 +2995,9 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
       }
     }
   }
-  const blockDocs = plan.instructions.map((s) => ({ id: s.id, version: s.version, text: next[s.id]?.pending ? readBlock(p.claudeMd)?.get(s.id) ?? s.body : s.body }));
+  const blockDocs = config.instructionsFile ? plan.instructions.map((s) => ({ id: s.id, version: s.version, text: next[s.id]?.pending ? readBlock(p.claudeMd)?.get(s.id) ?? s.body : s.body })) : [];
   if (harnesses.has("claude-code") && (blockDocs.length || readBlock(p.claudeMd))) {
-    if (writeBlock(p.claudeMd, renderBlock(blockDocs, ""))) report.written++;
+    if (blockDocs.length ? writeBlock(p.claudeMd, renderBlock(blockDocs, "")) : removeBlock(p.claudeMd)) report.written++;
   }
   if (harnesses.has("codex") && (blockDocs.length || plan.skills.length || readBlock(p.agentsMd))) {
     if (writeBlock(p.agentsMd, renderBlock(blockDocs, skillIndex(plan.skills, p)))) report.written++;
@@ -3352,7 +3363,7 @@ function repoCommit(root) {
 }
 function listDocs(root) {
   const listed = git(root, ["ls-files", "-co", "--exclude-standard", "-z"], 3e3);
-  if (listed !== null) return [...new Set(listed.split("\0").filter(Boolean).filter(isDoc))].filter((rel) => fs7.existsSync(path6.join(root, rel))).sort();
+  if (listed !== null) return [...new Set(listed.split("\0").filter(Boolean).filter(isDoc))].filter((rel) => fs7.existsSync(path6.join(root, rel)) && !deployedSkill(root, rel)).sort();
   const out = [];
   let visited = 0;
   const walk = (dir, rel, depth) => {
@@ -3365,10 +3376,10 @@ function listDocs(root) {
     }
     for (const e of entries) {
       if (e.isDirectory()) {
-        if (!SKIP_DIRS.has(e.name)) walk(path6.join(dir, e.name), rel ? `${rel}/${e.name}` : e.name, depth + 1);
+        if (!SKIP_DIRS.has(e.name) && !fs7.existsSync(path6.join(dir, e.name, ".git"))) walk(path6.join(dir, e.name), rel ? `${rel}/${e.name}` : e.name, depth + 1);
       } else if (e.isFile()) {
         const r = rel ? `${rel}/${e.name}` : e.name;
-        if (isDoc(r)) out.push(r);
+        if (isDoc(r) && !deployedSkill(root, r)) out.push(r);
       }
     }
   };
@@ -3448,7 +3459,7 @@ function relativeToRoot(root, file, cwd = root) {
   }
   return null;
 }
-var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc;
+var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc, deployedSkill;
 var init_repo = __esm({
   "src/v2/repo.ts"() {
     "use strict";
@@ -3462,6 +3473,7 @@ var init_repo = __esm({
       if (parts.some((p) => SKIP_DIRS.has(p))) return false;
       return DOC_NAMES.has(parts[parts.length - 1].toLowerCase());
     };
+    deployedSkill = (root, rel) => /(^|\/)SKILL\.md$/i.test(rel) && fs7.existsSync(path6.join(root, path6.posix.dirname(rel), ".bunshin.json"));
   }
 });
 
@@ -4515,6 +4527,7 @@ __export(commands_exports, {
   cmdRecall: () => cmdRecall,
   cmdReflectFork: () => cmdReflectFork,
   cmdReview: () => cmdReview,
+  cmdReviewDecide: () => cmdReviewDecide,
   cmdSuggest: () => cmdSuggest,
   cmdSync: () => cmdSync,
   robotAttrsFromFlags: () => robotAttrsFromFlags,
@@ -4556,7 +4569,7 @@ function cmdReview(store, args, cwd, out, err) {
 `);
     }
     out(`
-bunshin review apply <id> | submit <id> | skip <id> | apply-all
+bunshin review apply <id> | submit <id> | skip <id> | apply-all   (owners: approve <id> | reject <id> [--note])
 `);
     return 0;
   }
@@ -4598,6 +4611,29 @@ bunshin review apply <id> | submit <id> | skip <id> | apply-all
 `);
   return 1;
 }
+async function cmdReviewDecide(store, args, out, err) {
+  const sub = args._[1];
+  const id = args._[2];
+  if (!id) {
+    err(`bunshin review ${sub}: a suggestion id is required (see the console's Review, or bunshin review list --all)
+`);
+    return 1;
+  }
+  const config = store.config();
+  if (!canCall(config)) {
+    err(`bunshin review ${sub}: this project is not connected to Bunshin
+`);
+    return 1;
+  }
+  const note = str(args.flags.note);
+  const res = await v2api(config, "POST", `/suggestions/${encodeURIComponent(id)}/review`, {
+    approve: sub === "approve",
+    ...note ? { note } : {}
+  });
+  out(`${res.suggestion.id}: ${res.suggestion.status}${res.suggestion.decision?.reason ? ` (${res.suggestion.decision.reason})` : ""}
+`);
+  return 0;
+}
 async function cmdRecall(store, args, cwd, out, err) {
   const abstract = args._.slice(1).join(" ").trim() || str(args.flags.abstract) || "";
   if (!abstract) {
@@ -7102,8 +7138,8 @@ async function cmdImport2(store, args, cwd, out, err) {
     if (batches.length > 1) out(`  batch ${i + 1}/${batches.length}: ${last.versions.length} versions${last.skipped.length ? `, ${last.skipped.length} already imported` : ""}
 `);
   }
-  const lib = last?.versions.at(-1)?.version;
-  out(`Imported into the library: ${written} document revisions${lib ? `, now lib@${lib}` : ""}; ${last?.documents ?? 0} documents active in ${pack}.
+  const lib2 = last?.versions.at(-1)?.version;
+  out(`Imported into the library: ${written} document revisions${lib2 ? `, now lib@${lib2}` : ""}; ${last?.documents ?? 0} documents active in ${pack}.
 `);
   if (history) out("Old commit pins resolve with `bunshin library checkout --git <sha>`.\n");
   const propose = args.flags["propose-rewrites"];
@@ -7291,8 +7327,8 @@ function sinceCutoff(since) {
 }
 function parsePin(text2) {
   const t = text2.trim();
-  const lib = /lib@(\d+)/.exec(t) ?? /^(\d+)$/.exec(t);
-  if (lib) return { version: Number(lib[1]) };
+  const lib2 = /lib@(\d+)/.exec(t) ?? /^(\d+)$/.exec(t);
+  if (lib2) return { version: Number(lib2[1]) };
   const sha2 = /\b([0-9a-f]{7,40})\b/i.exec(t);
   return sha2 ? { git: sha2[1].toLowerCase() } : {};
 }
@@ -7801,6 +7837,94 @@ init_v22();
 init_transcript();
 init_api();
 init_deploy();
+
+// src/v2/live.ts
+init_api();
+var LIVE_REFRESH_MS = 5 * 6e4;
+var MAX_DIFF_LINES = 80;
+var instructionDocs = (bundle) => (bundle?.sections ?? []).filter((s) => s.delivery === "always" && s.status === "active");
+var skillDocs = (bundle) => (bundle?.sections ?? []).filter((s) => !!s.skill && s.status === "active");
+function baselineOf(bundle) {
+  return {
+    ...bundle?.libraryVersion !== void 0 ? { library: bundle.libraryVersion } : {},
+    skills: Object.fromEntries(skillDocs(bundle).map((s) => [s.id, { version: s.version, name: s.skill.name }])),
+    instructions: Object.fromEntries(instructionDocs(bundle).map((s) => [s.id, s.body]))
+  };
+}
+var lib = (v) => v === void 0 ? "the library" : `lib@${v}`;
+function renderInstructions(bundle) {
+  const docs = instructionDocs(bundle);
+  if (!docs.length) return "";
+  return [
+    `## Standing instructions (your organization, from Bunshin ${lib(bundle?.libraryVersion)})`,
+    "Follow these as you would CLAUDE.md. Bunshin re-delivers them after /clear and compaction, and tells you when they change.",
+    "",
+    ...docs.map((d) => d.body.trim())
+  ].join("\n");
+}
+function lineDiff(before, after, max = MAX_DIFF_LINES) {
+  const a = before.split("\n");
+  const b = after.split("\n");
+  if (a.length * b.length > 4e6) return [`(the text changed substantially; ${b.length} lines now)`];
+  const dp = Array.from({ length: a.length + 1 }, () => new Uint32Array(b.length + 1));
+  for (let i2 = a.length - 1; i2 >= 0; i2--) for (let j2 = b.length - 1; j2 >= 0; j2--) dp[i2][j2] = a[i2] === b[j2] ? dp[i2 + 1][j2 + 1] + 1 : Math.max(dp[i2 + 1][j2], dp[i2][j2 + 1]);
+  const out = [];
+  let i = 0;
+  let j = 0;
+  while (i < a.length || j < b.length) {
+    if (i < a.length && j < b.length && a[i] === b[j]) {
+      i++;
+      j++;
+    } else if (j < b.length && (i === a.length || dp[i][j + 1] >= dp[i + 1][j])) {
+      if (b[j].trim()) out.push(`+ ${b[j]}`);
+      j++;
+    } else {
+      if (a[i].trim()) out.push(`- ${a[i]}`);
+      i++;
+    }
+  }
+  return out.length > max ? [...out.slice(0, max), `\u2026 ${out.length - max} more changed lines`] : out;
+}
+function changesSince(base, bundle, skillPath) {
+  const next = baselineOf(bundle);
+  if (!bundle || next.library === base.library) return { text: "", next: base };
+  const lines = [];
+  const now = instructionDocs(bundle);
+  for (const d of now) {
+    const old = base.instructions[d.id];
+    if (old === d.body) continue;
+    if (old === void 0) {
+      lines.push(`New standing instructions ("${d.title}"):`, d.body.trim(), "");
+      continue;
+    }
+    const diff = lineDiff(old, d.body);
+    if (diff.length) lines.push(`Standing instructions changed ("${d.title}"); follow the new text:`, ...diff, "");
+  }
+  for (const id of Object.keys(base.instructions)) if (!now.some((d) => d.id === id)) lines.push(`Standing instructions withdrawn (${id}): stop following them.`, "");
+  const skillLines = [];
+  for (const s of skillDocs(bundle)) {
+    const old = base.skills[s.id];
+    const where = skillPath(s.skill.name);
+    const read = where ? `re-read \`${where}\` before using it` : `load it with \`bunshin load ${s.id}\` before using it`;
+    if (!old) skillLines.push(`- new skill \`${s.skill.name}\`: ${s.skill.description.replace(/\s+/g, " ").trim()} (${where ? `\`${where}\`` : `\`bunshin load ${s.id}\``})`);
+    else if (old.version !== s.version) skillLines.push(`- \`${s.skill.name}\` updated (v${old.version} \u2192 v${s.version}): ${read}`);
+  }
+  for (const [id, old] of Object.entries(base.skills)) if (!next.skills[id]) skillLines.push(`- \`${old.name}\` was retired: don't use it`);
+  if (skillLines.length) lines.push("Skills:", ...skillLines);
+  if (!lines.length) return { text: "", next };
+  return { text: [`## Bunshin: the library changed during this session (${lib(base.library)} \u2192 ${lib(next.library)})`, ...lines].join("\n").trim(), next };
+}
+function refreshInBackground(v2, store, detach2, cwd, now = Date.now()) {
+  if (!canCall(store.config())) return false;
+  const state = v2.readSyncState();
+  const last = Math.max(Date.parse(state.lastAttemptAt ?? "") || 0, Date.parse(state.lastSyncAt ?? "") || 0);
+  if (now - last < LIVE_REFRESH_MS) return false;
+  v2.writeSyncState({ ...state, lastAttemptAt: new Date(now).toISOString() });
+  detach2(["--root", store.root, "sync", "--quiet"], { cwd });
+  return true;
+}
+
+// src/v2/hooks.ts
 init_reflect2();
 init_repo();
 
@@ -7948,6 +8072,10 @@ async function onSessionStart(ctx) {
     }
   }
   const bundle = v2.readBundle();
+  v2.updateSession(id, ctx.cwd, (s) => {
+    s.live = baselineOf(bundle);
+  });
+  const instructions = renderInstructions(bundle);
   const lines = [];
   for (const d of (bundle?.digest ?? []).slice(0, 5)) lines.push(`- ${d}`);
   const proposed = v2.listSuggestions().filter((s) => s.status === "proposed").length;
@@ -7957,9 +8085,37 @@ async function onSessionStart(ctx) {
     lines.push(`Open question${questions.length === 1 ? "" : "s"} for your team (ask the user when it fits; answer with \`bunshin questions answer <id> "<choice>"\`):`);
     for (const q of questions) lines.push(`- [${q.id}] ${q.question}${q.options.length ? ` Options: ${q.options.join(" | ")}` : ""}`);
   }
-  if (!lines.length) return {};
-  return additional("SessionStart", `## Bunshin
-${lines.join("\n")}`);
+  const parts = [instructions, lines.length ? `## Bunshin
+${lines.join("\n")}` : ""].filter(Boolean);
+  if (!parts.length) return {};
+  return additional("SessionStart", parts.join("\n\n"));
+}
+function liveUpdate(v2, ctx, session) {
+  try {
+    refreshInBackground(v2, ctx.store, ctx.detach, ctx.cwd);
+    const bundle = v2.readBundle();
+    if (!session.live) {
+      v2.updateSession(session.sessionId, ctx.cwd, (s) => {
+        s.live = baselineOf(bundle);
+      });
+      return "";
+    }
+    const config = ctx.store.config();
+    const deployed = deployEnabled(config, localView(v2, config, ctx.cwd).ctx);
+    const paths = deployed ? deployPaths() : null;
+    const root = paths ? config.harness === "codex" ? paths.codexSkills : paths.claudeSkills : null;
+    const skillPath = (name) => root ? `${root}/${name}/SKILL.md` : null;
+    const { text: text2, next } = changesSince(session.live, bundle, skillPath);
+    if (next !== session.live) {
+      v2.updateSession(session.sessionId, ctx.cwd, (s) => {
+        s.live = next;
+      });
+    }
+    if (text2) v2.log("v2-live-update", { session: session.sessionId, from: session.live.library ?? null, to: next.library ?? null });
+    return text2;
+  } catch {
+    return "";
+  }
 }
 function hintLine(titles, harness) {
   const quoted = titles.map((t) => `"${t}"`).join(", ");
@@ -7976,7 +8132,13 @@ function onPrompt(ctx) {
     s.lastPrompt = prompt.slice(0, 4e3);
     s.lastActivityAt = now;
   });
-  if (!prompt.trim()) return {};
+  const live = liveUpdate(v2, ctx, session);
+  const withLive = (out) => {
+    if (!live) return out;
+    const text2 = [live, out.hookSpecificOutput?.additionalContext ?? ""].filter(Boolean).join("\n\n");
+    return additional("UserPromptSubmit", text2);
+  };
+  if (!prompt.trim()) return withLive({});
   const config = ctx.store.config();
   const view = localView(v2, config, ctx.cwd);
   const injected = [...session.loaded, ...session.pushed];
@@ -7988,16 +8150,16 @@ function onPrompt(ctx) {
       addUnique(s.loaded, sec.id);
     });
     v2.log("v2-auto", { session: session.sessionId, section: sec.id, reason: res.reason });
-    return additional("UserPromptSubmit", renderSection(sec, "your prompt matches it", { ...res.anchor ? { anchor: res.anchor } : {}, deployed: !!sec.skill && deployEnabled(config, view.ctx) }));
+    return withLive(additional("UserPromptSubmit", renderSection(sec, "your prompt matches it", { ...res.anchor ? { anchor: res.anchor } : {}, deployed: !!sec.skill && deployEnabled(config, view.ctx) })));
   }
   const fresh = res.hint.filter((h) => !session.hinted?.includes(h.id)).slice(0, 3);
-  if (!fresh.length) return {};
+  if (!fresh.length) return withLive({});
   v2.updateSession(session.sessionId, ctx.cwd, (s) => {
     s.hinted = s.hinted ?? [];
     addUnique(s.hinted, ...fresh.map((h) => h.id));
     addUnique(s.served, ...fresh.map((h) => h.id));
   });
-  return additional("UserPromptSubmit", hintLine(fresh.map((h) => h.title), config.harness));
+  return withLive(additional("UserPromptSubmit", hintLine(fresh.map((h) => h.title), config.harness)));
 }
 function toolPaths(input) {
   if (!input || typeof input !== "object") return [];
@@ -8013,16 +8175,21 @@ function onPreToolUse(ctx) {
   const session = touch(v2, ctx, (s) => {
     s.lastActivityAt = (/* @__PURE__ */ new Date()).toISOString();
   });
+  const live = liveUpdate(v2, ctx, session);
+  const withLive = (out) => {
+    if (!live) return out;
+    return additional("PreToolUse", [live, out.hookSpecificOutput?.additionalContext ?? ""].filter(Boolean).join("\n\n"));
+  };
   const raw = toolPaths(ctx.input.tool_input);
-  if (!raw.length) return {};
+  if (!raw.length) return withLive({});
   const config = ctx.store.config();
   const view = localView(v2, config, ctx.cwd);
   const paths = raw.map((p) => relativeToRoot(view.root, p, ctx.cwd)).filter((p) => !!p);
   const text2 = [session.task, session.lastPrompt].filter(Boolean).join("\n");
-  if (!paths.length && !text2) return {};
+  if (!paths.length && !text2) return withLive({});
   const seen = /* @__PURE__ */ new Set([...session.pushed, ...session.loaded]);
   const hits = push(view.sections, view.reader, { paths, text: text2 }).filter((h) => !seen.has(h.section.id)).slice(0, MAX_PUSH);
-  if (!hits.length) return {};
+  if (!hits.length) return withLive({});
   const ids = hits.map((h) => h.section.id);
   v2.updateSession(session.sessionId, ctx.cwd, (s) => {
     addUnique(s.pushed, ...ids);
@@ -8031,7 +8198,7 @@ function onPreToolUse(ctx) {
   });
   v2.log("v2-push", { session: session.sessionId, tool: ctx.input.tool_name, hits: hits.map((h) => `${h.section.id} ${h.trigger}`) });
   const deployed = deployEnabled(config, view.ctx);
-  return additional("PreToolUse", hits.map((h) => renderSection(h.section, h.trigger, { ...h.anchor ? { anchor: h.anchor } : {}, deployed: deployed && !!h.section.skill })).join("\n\n"));
+  return withLive(additional("PreToolUse", hits.map((h) => renderSection(h.section, h.trigger, { ...h.anchor ? { anchor: h.anchor } : {}, deployed: deployed && !!h.section.skill })).join("\n\n")));
 }
 function onStop(ctx) {
   const v2 = new V2Store(ctx.store);
@@ -8344,8 +8511,9 @@ Usage: bunshin <command> [options]
                                 print one document (or one part of it) and mark it loaded
   learn [focus...]              capture what this session learned now (fork reflection),
                                 apply it locally as a trial and submit it
-  review [list [--all]|apply <id>|submit <id>|skip <id>|apply-all]
-                                suggestions awaiting review (apply = local trial + submit)
+  review [list [--all]|apply <id>|submit <id>|skip <id>|apply-all|approve <id>|reject <id> [--note <text>]]
+                                suggestions awaiting review (apply = local trial + submit;
+                                approve / reject = owner decision: merge now, or keep it out)
   index [--upload] [--json]     parse SPEC.md / TESTING.md / SKILL.md into sections
   sync [--index] [--json]       upload episodes + suggestions (incl. in-place skill edits), pull
                                 the library, install skills / instructions / files, settle trials
@@ -8515,6 +8683,7 @@ Key saved privately outside the project.
       case "suggest":
         return (await Promise.resolve().then(() => (init_commands(), commands_exports))).cmdSuggest(store, args, cwd, out, err);
       case "review":
+        if (args._[1] === "approve" || args._[1] === "reject") return await (await Promise.resolve().then(() => (init_commands(), commands_exports))).cmdReviewDecide(store, args, out, err);
         return (await Promise.resolve().then(() => (init_commands(), commands_exports))).cmdReview(store, args, cwd, out, err);
       case "questions":
       case "question":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunshin-cc/bunshin",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Shared memory for company AI agents. Connect Codex, Claude Code, or Pi to Bunshin.",
   "type": "module",
   "bin": {