@bunshin-cc/bunshin 0.7.0 → 0.8.1

package/dist/bin.js

@@ -1074,6 +1074,112 @@ var init_permissions = __esm({
   }
 });
 
+// ../core/src/v2/sources.ts
+function sourceId(kind, name) {
+  return `${kind}:${name.trim()}`;
+}
+function parseSource(id) {
+  if (!id) return null;
+  const i = id.indexOf(":");
+  if (i < 0) return null;
+  const kind = id.slice(0, i);
+  const name = id.slice(i + 1);
+  if (!SOURCE_KINDS.includes(kind) || !NAME.test(name) || name.trim() !== name) return null;
+  return { kind, name };
+}
+function sourceName(id) {
+  return parseSource(id)?.name ?? id;
+}
+var SOURCE_KINDS, NAME;
+var init_sources = __esm({
+  "../core/src/v2/sources.ts"() {
+    "use strict";
+    SOURCE_KINDS = ["repo", "folder", "robot"];
+    NAME = /^[^\0-\x1f\x7f]{1,280}$/;
+  }
+});
+
+// ../core/src/v2/scopes.ts
+function emptyTree() {
+  return { version: 0, groups: [], sources: {} };
+}
+function isScopeLayer(layer) {
+  const k = layerKind(layer);
+  return k === "group" || k === "source";
+}
+function groupChain(tree, groupId) {
+  const byId = new Map(tree.groups.map((g) => [g.id, g]));
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  let cur = groupId ? byId.get(groupId) : void 0;
+  while (cur && !seen.has(cur.id)) {
+    seen.add(cur.id);
+    out.unshift(cur.id);
+    cur = cur.parent ? byId.get(cur.parent) : void 0;
+  }
+  return out;
+}
+function scopePath(tree, source) {
+  if (!source || !parseSource(source)) return [];
+  const placed = tree?.sources[source]?.group ?? null;
+  return [...(tree ? groupChain(tree, placed) : []).map(groupLayer), sourceLayer(source)];
+}
+function inBoundary(section, reader) {
+  return !isScopeLayer(section.layer) || reader.layers.includes(section.layer);
+}
+function parentScope(tree, layer) {
+  const k = layerKind(layer);
+  if (k === "source") {
+    const g = tree.sources[layerValue(layer)]?.group ?? null;
+    return g && tree.groups.some((x) => x.id === g) ? groupLayer(g) : "org";
+  }
+  if (k === "group") {
+    const g = tree.groups.find((x) => x.id === layerValue(layer));
+    return g?.parent && tree.groups.some((x) => x.id === g.parent) ? groupLayer(g.parent) : "org";
+  }
+  return null;
+}
+function ancestorScopes(tree, layer) {
+  const out = [];
+  for (let cur = parentScope(tree, layer); cur && !out.includes(cur); cur = parentScope(tree, cur)) out.push(cur);
+  return out;
+}
+function sourcesIn(tree, layer) {
+  if (layer === "org") return Object.keys(tree.sources);
+  if (layerKind(layer) === "source") return [layerValue(layer)];
+  if (layerKind(layer) !== "group") return [];
+  const gid = layerValue(layer);
+  return Object.keys(tree.sources).filter((sid) => groupChain(tree, tree.sources[sid].group).includes(gid));
+}
+function scopeLabel(layer, tree) {
+  const k = layerKind(layer);
+  if (layer === "org") return "everywhere";
+  if (k === "source") {
+    const sid = layerValue(layer);
+    return `${parseSource(sid)?.kind === "robot" ? "robot" : "project"} ${sourceName(sid)}`;
+  }
+  if (k === "group") return `group ${tree?.groups.find((g) => g.id === layerValue(layer))?.name ?? layerValue(layer)}`;
+  if (k === "user") return "personal";
+  return layer;
+}
+function scopeChoices(tree, source) {
+  const t = tree ?? emptyTree();
+  return scopePath(t, source).map((layer) => {
+    const n = sourcesIn(t, layer).length;
+    return { layer, label: layerKind(layer) === "source" ? `this ${scopeLabel(layer, t)} only` : `${scopeLabel(layer, t)} (${n} project${n === 1 ? "" : "s"})` };
+  });
+}
+var groupLayer, sourceLayer;
+var init_scopes = __esm({
+  "../core/src/v2/scopes.ts"() {
+    "use strict";
+    init_layers();
+    init_sources();
+    groupLayer = (id) => `group:${id}`;
+    sourceLayer = (id) => `source:${id}`;
+  }
+});
+
 // ../core/src/v2/layers.ts
 function layerKind(layer) {
   const kind = layer.split(":")[0];
@@ -1083,19 +1189,29 @@ function layerValue(layer) {
   const i = layer.indexOf(":");
   return i < 0 ? "" : layer.slice(i + 1);
 }
+function privateLayer(ctx) {
+  return ctx.kind === "robot" ? `robot:${ctx.id}` : `user:${ctx.userId}`;
+}
 function layersFor(ctx) {
-  if (ctx.kind === "robot" && ctx.robot) {
-    return ["fleet", `arm:${ctx.robot.armModel}`, `mount:${ctx.robot.mount}`, `robot:${ctx.id}`];
-  }
-  const team = ctx.person?.team ?? "";
-  const dept = department(team);
-  return ["org", ...dept ? [`dept:${dept}`] : [], ...team ? [`team:${team}`] : [], `user:${ctx.userId}`];
+  return ["org", privateLayer(ctx)];
 }
-function readerFor(ctx, ownerClearance) {
+function isLocalLayer(layer) {
+  const kind = layerKind(layer);
+  return kind === "user" || kind === "robot";
+}
+function withScope(layers, scope) {
+  const path28 = scopePath(scope?.tree, scope?.source);
+  if (!path28.length) return layers;
+  const i = layers.findIndex((l) => isLocalLayer(l));
+  return i < 0 ? [...layers, ...path28] : [...layers.slice(0, i), ...path28, ...layers.slice(i)];
+}
+function readerFor(ctx, ownerClearance, scope) {
+  if (ctx.kind === "robot" && !scope?.source) scope = { ...scope, source: `robot:${ctx.id}` };
+  const source = scope?.source ? { source: scope.source } : {};
   if (ctx.kind === "robot") {
     const rank = (c) => c === "private" ? 0 : CLEARANCE_RANK[c];
     const clearance = ownerClearance && rank(ownerClearance) < CLEARANCE_RANK.org ? ownerClearance : "org";
-    return { userId: ctx.userId, orgId: ctx.orgId, role: "robot", team: `fleet/${ctx.robot?.site ?? "site"}`, clearance, contextId: ctx.id, layers: layersFor(ctx), ...ctx.robot?.domain ? { domain: ctx.robot.domain } : {} };
+    return { userId: ctx.userId, orgId: ctx.orgId, role: "robot", team: `fleet/${ctx.robot?.site ?? "site"}`, clearance, contextId: ctx.id, layers: withScope(layersFor(ctx), scope), ...ctx.robot?.domain ? { domain: ctx.robot.domain } : {}, ...source };
   }
   return {
     userId: ctx.userId,
@@ -1104,7 +1220,8 @@ function readerFor(ctx, ownerClearance) {
     team: ctx.person?.team ?? "",
     clearance: ctx.person?.clearance ?? "team",
     contextId: ctx.id,
-    layers: layersFor(ctx)
+    layers: withScope(layersFor(ctx), scope),
+    ...source
   };
 }
 function explainSectionAccess(section, reader) {
@@ -1112,9 +1229,6 @@ function explainSectionAccess(section, reader) {
   const kind = layerKind(section.layer);
   if (kind === "user" && section.layer !== `user:${reader.userId}`) return { allowed: false, reason: "other-user" };
   if (kind === "robot" && section.layer !== `robot:${reader.contextId}`) return { allowed: false, reason: "other-robot" };
-  if ((kind === "arm" || kind === "mount") && reader.role === "robot" && !reader.layers.includes(section.layer)) {
-    return { allowed: false, reason: "other-hardware" };
-  }
   const access = explainAccess(
     {
       clearance: section.clearance,
@@ -1134,33 +1248,26 @@ function scopeAffinity(section, reader) {
 }
 function baseAffinity(section, reader) {
   const kind = layerKind(section.layer);
-  if (reader.layers.includes(section.layer)) {
-    const order = reader.role === "robot" ? FLEET_LAYER_ORDER : COMPANY_LAYER_ORDER;
-    return 0.5 + 0.5 * (order.indexOf(kind) / Math.max(1, order.length - 1));
-  }
-  if (kind === "team") {
-    const team = layerValue(section.layer);
-    if (department(team) === department(reader.team)) return 0.3;
-    return 0.05;
+  if (kind === "group" || kind === "source") {
+    if (!reader.layers.includes(section.layer)) return 0.05;
+    const path28 = reader.layers.filter((l) => {
+      const k = layerKind(l);
+      return k === "group" || k === "source";
+    });
+    return 0.6 + 0.4 * ((path28.indexOf(section.layer) + 1) / path28.length);
   }
-  if (kind === "dept") return 0.1;
-  return 0.2;
+  if (isLocalLayer(section.layer)) return reader.layers.includes(section.layer) ? 1 : 0;
+  return 0.5;
 }
 function reachesReader(section, reader) {
-  if (reader.layers.includes(section.layer) || section.kind === "guardrail") return true;
-  const kind = layerKind(section.layer);
-  if (kind === "org" || kind === "dept" || FLEET_LAYER_ORDER.includes(kind)) return canRead(section, reader);
-  if (kind !== "team") return false;
-  return [layerValue(section.layer), ...section.allowedTeams ?? []].some((t) => !!t && orgUnitUnder(reader.team, t));
+  return reader.layers.includes(section.layer) && canRead(section, reader);
 }
-var COMPANY_LAYER_ORDER, FLEET_LAYER_ORDER;
 var init_layers = __esm({
   "../core/src/v2/layers.ts"() {
     "use strict";
     init_permissions();
     init_text();
-    COMPANY_LAYER_ORDER = ["org", "dept", "team", "user"];
-    FLEET_LAYER_ORDER = ["fleet", "arm", "mount", "robot"];
+    init_scopes();
   }
 });
 
@@ -1344,6 +1451,9 @@ var init_document = __esm({
 });
 
 // ../core/src/v2/sections/markdown.ts
+function repoLayer(repo) {
+  return `source:${repo.includes("/") ? "repo" : "folder"}:${repo}`;
+}
 function repoSectionId(repo, path28, anchor = "") {
   return anchor ? `repo:${repo}/${path28}#${anchor}` : `repo:${repo}/${path28}`;
 }
@@ -1376,7 +1486,7 @@ function parseRepoDoc(doc, opts) {
     id: meta.id ? repoSectionId(doc.repo, doc.path, meta.id) : repoSectionId(doc.repo, doc.path),
     orgId: opts.orgId,
     kind,
-    layer: `team:${owner}`,
+    layer: opts.layer ?? repoLayer(doc.repo),
     title,
     body: doc.text,
     when,
@@ -1748,8 +1858,8 @@ function servable(sections, reader) {
   }
   return [...out.values()];
 }
-function recallable(sections, reader) {
-  return servable(sections, reader).filter((s) => s.delivery !== "always" && s.delivery !== "stop" && s.delivery !== "reflect");
+function recallable(sections, reader, opts = {}) {
+  return servable(sections, reader).filter((s) => s.delivery !== "always" && s.delivery !== "stop" && s.delivery !== "reflect" && (opts.across || inBoundary(s, reader)));
 }
 function passagesOfSection(s) {
   const hit = passageCache.get(s);
@@ -1797,6 +1907,7 @@ function passageDense(embedder, pool, q) {
 function sourceLabel(s) {
   if (s.storage.type === "repo") return `repo:${s.storage.repo}/${s.storage.path}`;
   if (s.storage.type === "harness") return `harness:${s.storage.path}`;
+  if (isScopeLayer(s.layer)) return s.layer;
   return s.owner.team || s.layer;
 }
 function push(sections, reader, query) {
@@ -1837,7 +1948,7 @@ function maxSim(embedder, q, lists) {
 function pull(sections, reader, query, opts = {}) {
   const embedders = opts.embedders ?? DEFAULT_EMBEDDERS;
   const exclude = new Set(opts.exclude ?? []);
-  const pool = recallable(sections, reader).filter((s) => !exclude.has(s.id));
+  const pool = recallable(sections, reader, opts).filter((s) => !exclude.has(s.id));
   if (!pool.length) return [];
   const limit = Math.max(1, Math.min(20, query.limit ?? 10));
   const signals = [];
@@ -1878,6 +1989,7 @@ function pull(sections, reader, query, opts = {}) {
     kind: section.kind,
     layer: section.layer,
     source: sourceLabel(section),
+    ...isScopeLayer(section.layer) && !reader.layers.includes(section.layer) ? { outside: true } : {},
     score: Math.round(score2 * 1e3) / 1e3,
     reasons,
     ...part.get(section.id) ? { part: part.get(section.id) } : {},
@@ -1946,9 +2058,9 @@ function renderSection(s, trigger, opts = {}) {
     `_Load the whole document, or one part, with bunshin_load {"section_id": "${s.id}"${part ? `, "anchor": "${opts.anchor}"` : ""}} (or \`bunshin load ${s.id}${part ? ` --anchor ${opts.anchor}` : ""}\`)._`
   ].join("\n");
 }
-function renderCandidates(c) {
+function renderCandidates(c, tree) {
   if (!c.length) return "No sections matched. Proceed with general knowledge; nothing here is required.";
-  return c.map((x, i) => `${i + 1}. [${x.source}] ${x.title} (id: ${x.id}${x.part ? `, best part: \xA7${x.part}` : ""}${x.size ? `, ${x.size} words` : ""})
+  return c.map((x, i) => `${i + 1}. [${isScopeLayer(x.source) ? scopeLabel(x.source, tree) : x.source}] ${x.title} (id: ${x.id}${x.part ? `, best part: \xA7${x.part}` : ""}${x.size ? `, ${x.size} words` : ""}${x.outside ? "; borrowed from outside this project's scope" : ""})
    when: ${x.when}`).join("\n");
 }
 var PASSAGE_CHARS, passageCache, words;
@@ -1957,6 +2069,7 @@ var init_engine = __esm({
     "use strict";
     init_text();
     init_layers();
+    init_scopes();
     init_document();
     init_text_index();
     PASSAGE_CHARS = 4e3;
@@ -1967,8 +2080,9 @@ var init_engine = __esm({
 
 // ../core/src/v2/guidelines.ts
 function reflectionGuidelines(sections, reader, opts = {}) {
+  const covering = opts.layer ? /* @__PURE__ */ new Set(["org", opts.layer, ...opts.tree ? ancestorScopes(opts.tree, opts.layer) : []]) : void 0;
   const pool = reader ? servable(sections, reader) : sections;
-  return pool.filter((s) => s.delivery === "reflect" && s.status === "active").filter((s) => !opts.layer || s.layer === "org" || opts.layer === s.layer || opts.layer.startsWith(`${s.layer}/`)).sort((a, b) => generality(a.layer) - generality(b.layer) || a.id.localeCompare(b.id)).map((s) => ({ id: s.id, title: s.title, layer: s.layer, body: s.body }));
+  return pool.filter((s) => s.delivery === "reflect" && s.status === "active" && (!reader || inBoundary(s, reader))).filter((s) => !covering || covering.has(s.layer)).sort((a, b) => generality(a.layer) - generality(b.layer) || a.id.localeCompare(b.id)).map((s) => ({ id: s.id, title: s.title, layer: s.layer, body: s.body }));
 }
 function guidelineRules(body) {
   const at = body.search(/^## /m);
@@ -2004,8 +2118,9 @@ var init_guidelines = __esm({
     init_types();
     init_layers();
     init_engine();
+    init_scopes();
     GUIDELINES_ANCHOR = "rules";
-    generality = (l) => ({ org: 0, dept: 1, fleet: 1, team: 2, arm: 3, mount: 3, robot: 4, user: 4 })[layerKind(l)] ?? 5;
+    generality = (l) => ({ org: 0, group: 1, source: 2, robot: 3, user: 3 })[layerKind(l)] ?? 4;
   }
 });
 
@@ -2191,7 +2306,7 @@ function redactDeep(value, opts = {}) {
   if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, redactDeep(v, opts)]));
   return value;
 }
-var REDACTED, MARKER_RE, isMarked, words2, KEY_FALSE, SCHEMA_KEY, PASS_WORD, PASS_STAT, nameCache, KEYWORD_VALUES, PLACEHOLDER_RE, CODE_RE, STRONG, HASH_WORD, COUNT_NAME, RESOURCE_TAIL, UUID_RE, PATH_RE, credentialish, CARD_DIGITS, ASSET_EXT, NOREPLY_RE, NAME, Q, VALUE, ARGS, STRONG_LAST, KEY_FILE, plainValue, PATTERNS;
+var REDACTED, MARKER_RE, isMarked, words2, KEY_FALSE, SCHEMA_KEY, PASS_WORD, PASS_STAT, nameCache, KEYWORD_VALUES, PLACEHOLDER_RE, CODE_RE, STRONG, HASH_WORD, COUNT_NAME, RESOURCE_TAIL, UUID_RE, PATH_RE, credentialish, CARD_DIGITS, ASSET_EXT, NOREPLY_RE, NAME2, Q, VALUE, ARGS, STRONG_LAST, KEY_FILE, plainValue, PATTERNS;
 var init_redact = __esm({
   "../core/src/redact.ts"() {
     "use strict";
@@ -2270,7 +2385,7 @@ var init_redact = __esm({
     CARD_DIGITS = new Uint8Array(64);
     ASSET_EXT = /^\.(?:m?js|cjs|jsx|tsx?|css|scss|map|json|html?|wasm|woff2?|ttf|otf|eot|png|jpe?g|gif|svg|webp|avif|ico|bmp|mp[34]|webm|wav|ogg|pdf|txt|md|zip|gz|br|tgz|tar|whl|jar|bin|dat|lock|log|ya?ml|xml|csv)\b/;
     NOREPLY_RE = /^(?:no[._-]?reply|donot[._-]?reply|do[._-]?not[._-]?reply|noreply\+?.*|git|hg)$/i;
-    NAME = String.raw`(?=[A-Za-z_$])(?=[\w.$-]{0,64}?(?:key|token|secret|pass|pwd|credential|auth|cookie|session|creds))[A-Za-z_$][\w.$-]{0,127}`;
+    NAME2 = String.raw`(?=[A-Za-z_$])(?=[\w.$-]{0,64}?(?:key|token|secret|pass|pwd|credential|auth|cookie|session|creds))[A-Za-z_$][\w.$-]{0,127}`;
     Q = String.raw`(?:\\\\){0,8}\\?["'\x60]`;
     VALUE = String.raw`(?:(${Q})(?!\s)(.{0,4096}?)\4|(${Q})?([^\s"'\x60\\,]{1,4096}))`;
     ARGS = String.raw`[^\n|;&]{0,256}?`;
@@ -2356,7 +2471,7 @@ var init_redact = __esm({
       },
       {
         kind: "assigned-secret",
-        re: new RegExp(String.raw`(?:(?<![\w.$-])|(?=["'\x60\\]))((?:\\\\){0,8}\\?["'\x60]?)(${NAME})\1(\??\s{0,64}(?::=|=>|==?|:(?=[\s"'\x60\\]|$))[ \t]{0,64})${VALUE}`, "gim"),
+        re: new RegExp(String.raw`(?:(?<![\w.$-])|(?=["'\x60\\]))((?:\\\\){0,8}\\?["'\x60]?)(${NAME2})\1(\??\s{0,64}(?::=|=>|==?|:(?=[\s"'\x60\\]|$))[ \t]{0,64})${VALUE}`, "gim"),
         retryFrom: (m) => m[1].length * 2 + m[2].length + m[3].length,
         replace: (m, R, at, all) => {
           const [whole, , name, , q1, inQuotes, q2, bare] = m;
@@ -2396,7 +2511,7 @@ var init_redact = __esm({
       // YAML block scalar: `TOKEN: |` and the indented lines under it.
       {
         kind: "assigned-secret",
-        re: new RegExp(String.raw`^([ \t]{0,64})((?:-[ \t]{1,16})?(["']?)(${NAME})\3[ \t]{0,16}:[ \t]{0,16}[|>][+-]?\d?[ \t]{0,16})((?:\n(?:[ \t]{0,64}\n){0,8}\1[ \t]{1,64}\S[^\n]{0,4096}){1,500})`, "gim"),
+        re: new RegExp(String.raw`^([ \t]{0,64})((?:-[ \t]{1,16})?(["']?)(${NAME2})\3[ \t]{0,16}:[ \t]{0,16}[|>][+-]?\d?[ \t]{0,16})((?:\n(?:[ \t]{0,64}\n){0,8}\1[ \t]{1,64}\S[^\n]{0,4096}){1,500})`, "gim"),
         replace: (m, R) => {
           const [, indent, head, , name, body] = m;
           if (!secretName(name)) return null;
@@ -2668,7 +2783,15 @@ ${input.pendingNew.map((p) => `- ${p}`).join("\n")}
 Already captured this session (do not repeat): ${input.captured.length ? input.captured.join(", ") : "none"}
 
 Layers you may target: ${input.layers.join(", ")}.
-${input.profileId ? `- How THIS person works, prefers or wants things done (a steering or approach lesson about them,
+${input.scopes?.length ? `
+Where a lesson applies (put each at the narrowest scope it holds for; when unsure, the narrowest):
+${[...input.scopes].reverse().map((x) => `- ${x.layer}: ${x.label}`).join("\n")}
+- org: everywhere in this workspace
+A fact, command or habit of this project \u2192 this project. True of every project in a group alike \u2192
+that group. True anywhere this workspace works \u2192 org. Lessons that come up again in other scopes
+are widened by the nightly generalization pass, so a narrow scope is never a loss. Name it as
+"layer" in the target of a new document (an edit keeps the document's own scope).
+` : ""}${input.profileId ? `- How THIS person works, prefers or wants things done (a steering or approach lesson about them,
   not about the task) \u2192 op "append" to their profile ${input.profileId}, anchor "how-i-work".
   A lesson for anyone doing the task belongs in the task's document instead.
 ` : ""}- Knowledge about one repo that its team owns \u2192 that repo's section (repo:... ids).
@@ -2952,6 +3075,8 @@ var init_reconcile = __esm({
     init_document();
     init_markdown();
     init_text_index();
+    init_scopes();
+    init_sources();
     init_types();
   }
 });
@@ -2993,13 +3118,25 @@ var init_profile = __esm({
   }
 });
 
-// ../core/src/v2/sources.ts
-function sourceId(kind, name) {
-  return `${kind}:${name.trim()}`;
-}
-var init_sources = __esm({
-  "../core/src/v2/sources.ts"() {
+// ../core/src/v2/generalize.ts
+var init_generalize = __esm({
+  "../core/src/v2/generalize.ts"() {
+    "use strict";
+    init_layers();
+    init_guidelines();
+    init_reflect();
+    init_scopes();
+  }
+});
+
+// ../core/src/v2/adopt.ts
+var init_adopt = __esm({
+  "../core/src/v2/adopt.ts"() {
     "use strict";
+    init_text();
+    init_layers();
+    init_scopes();
+    init_sources();
   }
 });
 
@@ -3025,6 +3162,9 @@ var init_v2 = __esm({
     init_profile();
     init_guidelines();
     init_sources();
+    init_scopes();
+    init_generalize();
+    init_adopt();
   }
 });
 
@@ -3123,72 +3263,354 @@ var init_api = __esm({
   }
 });
 
-// ../core/src/types.ts
-var init_types2 = __esm({
-  "../core/src/types.ts"() {
-    "use strict";
+// src/v2/repo.ts
+import fs6 from "node:fs";
+import path5 from "node:path";
+import { execFileSync } from "node:child_process";
+function git(cwd, args, timeout = 1500) {
+  try {
+    return execFileSync("git", ["-C", cwd, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout, maxBuffer: 64 * 1024 * 1024 });
+  } catch {
+    return null;
   }
-});
-
-// ../core/src/gate.ts
-var CURRENT_CHAT_PREFIX, ANAPHORIC_QUESTION;
-var init_gate = __esm({
-  "../core/src/gate.ts"() {
-    "use strict";
-    CURRENT_CHAT_PREFIX = "(?:(?:so\\s+)?(?:in|within)\\s+(?:this|the)\\s+(?:chat|conversation|session)\\s*,?\\s*)?";
-    ANAPHORIC_QUESTION = new RegExp(
-      "^" + CURRENT_CHAT_PREFIX + "(?:(?:and\\s+)?(?:does|do|did|is|are|was|were|can|could|would|will|has|have|had)\\s+.*\\b(?:this|that|it|these|those|they)\\b.*|(?:and\\s+)?(?:does|do|did|is|are|was|were|can|could|would|will|has|have|had)\\b.*\\b(?:also|too|as\\s+well)\\b.*|(?:what|why|how|where|when)\\s+(?:does|do|did|is|are|was|were)\\s+(?:this|that|it|these|those|they)\\b.*|(?:can|could|would)\\s+you\\s+(?:explain|clarify|show)\\s+(?:this|that|it)\\b.*)$",
-      "i"
-    );
+}
+function repoRoot(cwd, storeRoot) {
+  const key = `${cwd}
+${storeRoot ?? ""}`;
+  const hit = rootCache.get(key);
+  if (hit) return hit;
+  const top = git(cwd, ["rev-parse", "--show-toplevel"])?.trim();
+  let root = top || "";
+  if (!root && storeRoot && path5.basename(storeRoot) === ".bunshin") {
+    const parent = path5.dirname(storeRoot);
+    if (path5.resolve(cwd).startsWith(path5.resolve(parent))) root = parent;
   }
-});
-
-// ../core/src/metrics.ts
-var init_metrics = __esm({
-  "../core/src/metrics.ts"() {
-    "use strict";
+  root = root || path5.resolve(cwd);
+  rootCache.set(key, root);
+  return root;
+}
+function parseRemote(url) {
+  const clean2 = url.trim().replace(/\.git$/, "").replace(/\/+$/, "");
+  if (!clean2) return null;
+  const scp = clean2.match(/^[^@/\s]+@[^:/\s]+:(.+)$/);
+  const pathPart = scp ? scp[1] : (() => {
+    try {
+      return new URL(clean2).pathname;
+    } catch {
+      return clean2;
+    }
+  })();
+  const segs = pathPart.split("/").filter(Boolean);
+  if (segs.length >= 2) return `${segs[segs.length - 2]}/${segs[segs.length - 1]}`;
+  return segs[0] ?? null;
+}
+function repoName(root) {
+  const url = git(root, ["remote", "get-url", "origin"]);
+  return url && parseRemote(url) || path5.basename(root);
+}
+function repoCommit(root) {
+  return git(root, ["rev-parse", "HEAD"])?.trim() || void 0;
+}
+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) => fs6.existsSync(path5.join(root, rel)) && !deployedSkill(root, rel)).sort();
+  const out = [];
+  let visited = 0;
+  const walk = (dir, rel, depth) => {
+    if (depth > 8 || visited++ > 2e4) return;
+    let entries;
+    try {
+      entries = fs6.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const e of entries) {
+      if (e.isDirectory()) {
+        if (!SKIP_DIRS.has(e.name) && !fs6.existsSync(path5.join(dir, e.name, ".git"))) walk(path5.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) && !deployedSkill(root, r)) out.push(r);
+      }
+    }
+  };
+  walk(root, "", 0);
+  return out.sort();
+}
+function indexWorkingTree(v2, config, cwd, opts = {}) {
+  const root = repoRoot(cwd, v2.store.root);
+  const now = opts.now ?? Date.now();
+  const cached = v2.readRepoIndex(root);
+  const ownerTeam = config.ownerTeam || config.orgUnit || "unknown";
+  const source = sourceFor(root, v2.store.root);
+  const sameRepo = cached && cached.ownerTeam === ownerTeam && cached.format === INDEX_FORMAT;
+  const repo = sameRepo && cached.repo && !opts.force ? cached.repo : repoName(root);
+  const fresh = sameRepo && cached.repo === repo && cached.paths && cached.listedAt && now - Date.parse(cached.listedAt) < LIST_TTL_MS && !opts.force;
+  const paths = fresh ? cached.paths : listDocs(root);
+  let changed = !fresh || !sameRepo || cached.repo !== repo;
+  const files = {};
+  for (const rel of paths) {
+    const abs = path5.join(root, rel);
+    let stat;
+    try {
+      stat = fs6.statSync(abs);
+    } catch {
+      changed = true;
+      continue;
+    }
+    const prev = sameRepo && cached.repo === repo ? cached.files[rel] : void 0;
+    if (prev && prev.mtimeMs === stat.mtimeMs && prev.size === stat.size) {
+      files[rel] = prev;
+      continue;
+    }
+    changed = true;
+    try {
+      const text2 = fs6.readFileSync(abs, "utf8");
+      files[rel] = { mtimeMs: stat.mtimeMs, size: stat.size, sections: parseRepoDoc({ repo, path: rel, text: text2 }, { orgId: config.orgId, ownerTeam, layer: source ? sourceLayer(source) : "org" }) };
+    } catch {
+    }
   }
-});
-
-// ../core/src/lesson/id.ts
-var init_id = __esm({
-  "../core/src/lesson/id.ts"() {
-    "use strict";
+  const index = {
+    format: INDEX_FORMAT,
+    repo,
+    ownerTeam,
+    listedAt: fresh ? cached.listedAt : new Date(now).toISOString(),
+    paths,
+    files
+  };
+  if (changed) {
+    try {
+      v2.writeRepoIndex(root, index);
+    } catch {
+    }
   }
-});
-
-// ../core/src/lesson/markdown.ts
-var init_markdown2 = __esm({
-  "../core/src/lesson/markdown.ts"() {
-    "use strict";
+  return { root, index, sections: Object.values(files).flatMap((f) => f.sections) };
+}
+function relativeToRoot(root, file, cwd = root) {
+  if (!file) return null;
+  const abs = path5.isAbsolute(file) ? file : path5.resolve(cwd, file);
+  let real = abs;
+  let realRoot = root;
+  try {
+    realRoot = fs6.realpathSync(root);
+  } catch {
   }
-});
-
-// ../core/src/lesson/index.ts
-var init_lesson = __esm({
-  "../core/src/lesson/index.ts"() {
+  try {
+    real = fs6.realpathSync(abs);
+  } catch {
+    try {
+      real = path5.join(fs6.realpathSync(path5.dirname(abs)), path5.basename(abs));
+    } catch {
+    }
+  }
+  for (const [r, f] of [
+    [realRoot, real],
+    [root, abs]
+  ]) {
+    const rel = path5.relative(r, f);
+    if (rel && !rel.startsWith("..") && !path5.isAbsolute(rel)) return rel.split(path5.sep).join("/");
+  }
+  return null;
+}
+var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc, deployedSkill, INDEX_FORMAT;
+var init_repo = __esm({
+  "src/v2/repo.ts"() {
     "use strict";
+    init_v22();
+    init_source();
+    DOC_NAMES = /* @__PURE__ */ new Set(["spec.md", "testing.md", "skill.md"]);
+    SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".bunshin"]);
+    LIST_TTL_MS = 6e4;
+    rootCache = /* @__PURE__ */ new Map();
+    isDoc = (rel) => {
+      const parts = rel.split("/");
+      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) && fs6.existsSync(path5.join(root, path5.posix.dirname(rel), ".bunshin.json"));
+    INDEX_FORMAT = 2;
   }
 });
 
-// ../core/src/serve/score.ts
-function classifyTaskMode(task) {
-  const t = (task || "").trim();
-  if (INVESTIGATE_RE.test(t) && !BUILD_RE.test(t)) return "investigate";
-  if (BUILD_RE.test(t)) return "build";
-  if (CONVERSE_RE.test(t) || t.endsWith("?")) return "converse";
-  return "build";
-}
-function lessonText(lesson) {
-  const extra = lesson.kind === "workflow" ? [...lesson.preconditions, ...lesson.steps.map((s) => `${s.action} ${s.detail ?? ""} ${s.verify ?? ""}`), lesson.outcome].join(" ") : "";
-  return `${lesson.title}
-${lesson.gist}
-${lesson.tags.join(" ")}
-${lesson.content}
-${extra}`;
-}
-function score(lesson, request, profile, textRelevance, opts = {}) {
-  const w = { ...DEFAULT_WEIGHTS, ...opts.weights ?? {} };
+// src/v2/source.ts
+var source_exports = {};
+__export(source_exports, {
+  cwdInPool: () => cwdInPool,
+  inPool: () => inPool,
+  listFolders: () => listFolders,
+  projectRootFor: () => projectRootFor,
+  select: () => select,
+  sourceFor: () => sourceFor,
+  storeHome: () => storeHome,
+  topFolder: () => topFolder
+});
+import fs7 from "node:fs";
+import path6 from "node:path";
+import { execFileSync as execFileSync2 } from "node:child_process";
+function storeHome(storeRoot) {
+  return path6.dirname(path6.resolve(storeRoot));
+}
+function topFolder(cwd, storeRoot) {
+  const rel = path6.relative(storeHome(storeRoot), path6.resolve(cwd));
+  if (!rel || rel.startsWith("..") || path6.isAbsolute(rel)) return "";
+  return rel.split(path6.sep)[0] ?? "";
+}
+function inPool(selection, folder) {
+  if (!folder || !selection) return true;
+  if (selection.exclude?.includes(folder)) return false;
+  return selection.only ? selection.only.includes(folder) : true;
+}
+function cwdInPool(config, cwd, storeRoot) {
+  return inPool(config.sources, topFolder(cwd, storeRoot));
+}
+function git2(cwd, args) {
+  try {
+    return execFileSync2("git", ["-C", cwd, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 1500 }).trim() || null;
+  } catch {
+    return null;
+  }
+}
+function sourceFor(cwd, storeRoot, ctx) {
+  if (ctx?.kind === "robot") return sourceId("robot", ctx.id);
+  const key = `${path6.resolve(cwd)}
+${storeRoot}`;
+  if (sourceCache.has(key)) return sourceCache.get(key);
+  const found = findSource(cwd, storeRoot);
+  sourceCache.set(key, found);
+  return found;
+}
+function findSource(cwd, storeRoot) {
+  const home = storeHome(storeRoot);
+  const top = git2(cwd, ["rev-parse", "--show-toplevel"]);
+  if (top) {
+    const remote = git2(top, ["remote", "get-url", "origin"]);
+    const named = remote ? parseRemote(remote) : null;
+    if (named) return sourceId("repo", named);
+    const rel = path6.relative(home, top);
+    return sourceId("folder", rel && !rel.startsWith("..") && !path6.isAbsolute(rel) ? rel.split(path6.sep).join("/") : path6.basename(top));
+  }
+  const folder = topFolder(cwd, storeRoot);
+  return folder ? sourceId("folder", folder) : void 0;
+}
+function projectRootFor(cwd, storeRoot) {
+  const home = storeHome(storeRoot);
+  const top = git2(cwd, ["rev-parse", "--show-toplevel"]);
+  if (top) {
+    const rel = path6.relative(home, top);
+    if (!rel.startsWith("..") && !path6.isAbsolute(rel)) return top;
+  }
+  const folder = topFolder(cwd, storeRoot);
+  return folder ? path6.join(home, folder) : home;
+}
+function listFolders(storeRoot, selection, opts = {}) {
+  const home = storeHome(storeRoot);
+  let names = [];
+  try {
+    names = fs7.readdirSync(home, { withFileTypes: true }).filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => e.name).sort((a, b) => a.localeCompare(b));
+  } catch {
+  }
+  return names.map((folder) => ({
+    folder,
+    included: inPool(selection, folder),
+    ...opts.sources ? { source: sourceFor(path6.join(home, folder), storeRoot) } : {}
+  }));
+}
+function select(current, action, folders) {
+  const uniq = (xs) => [...new Set(xs)].sort((a, b) => a.localeCompare(b));
+  const only = current?.only;
+  const exclude = current?.exclude ?? [];
+  let next;
+  switch (action) {
+    case "all":
+      return void 0;
+    case "only":
+      next = { only: uniq(folders) };
+      break;
+    case "include":
+      next = { ...only ? { only: uniq([...only, ...folders]) } : {}, exclude: exclude.filter((f) => !folders.includes(f)) };
+      break;
+    case "exclude":
+      next = { ...only ? { only: only.filter((f) => !folders.includes(f)) } : {}, exclude: uniq([...exclude, ...folders]) };
+      break;
+  }
+  if (!next.exclude?.length) delete next.exclude;
+  return next.only || next.exclude ? next : void 0;
+}
+var sourceCache;
+var init_source = __esm({
+  "src/v2/source.ts"() {
+    "use strict";
+    init_v22();
+    init_repo();
+    sourceCache = /* @__PURE__ */ new Map();
+  }
+});
+
+// ../core/src/types.ts
+var init_types2 = __esm({
+  "../core/src/types.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/gate.ts
+var CURRENT_CHAT_PREFIX, ANAPHORIC_QUESTION;
+var init_gate = __esm({
+  "../core/src/gate.ts"() {
+    "use strict";
+    CURRENT_CHAT_PREFIX = "(?:(?:so\\s+)?(?:in|within)\\s+(?:this|the)\\s+(?:chat|conversation|session)\\s*,?\\s*)?";
+    ANAPHORIC_QUESTION = new RegExp(
+      "^" + CURRENT_CHAT_PREFIX + "(?:(?:and\\s+)?(?:does|do|did|is|are|was|were|can|could|would|will|has|have|had)\\s+.*\\b(?:this|that|it|these|those|they)\\b.*|(?:and\\s+)?(?:does|do|did|is|are|was|were|can|could|would|will|has|have|had)\\b.*\\b(?:also|too|as\\s+well)\\b.*|(?:what|why|how|where|when)\\s+(?:does|do|did|is|are|was|were)\\s+(?:this|that|it|these|those|they)\\b.*|(?:can|could|would)\\s+you\\s+(?:explain|clarify|show)\\s+(?:this|that|it)\\b.*)$",
+      "i"
+    );
+  }
+});
+
+// ../core/src/metrics.ts
+var init_metrics = __esm({
+  "../core/src/metrics.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/lesson/id.ts
+var init_id = __esm({
+  "../core/src/lesson/id.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/lesson/markdown.ts
+var init_markdown2 = __esm({
+  "../core/src/lesson/markdown.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/lesson/index.ts
+var init_lesson = __esm({
+  "../core/src/lesson/index.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/serve/score.ts
+function classifyTaskMode(task) {
+  const t = (task || "").trim();
+  if (INVESTIGATE_RE.test(t) && !BUILD_RE.test(t)) return "investigate";
+  if (BUILD_RE.test(t)) return "build";
+  if (CONVERSE_RE.test(t) || t.endsWith("?")) return "converse";
+  return "build";
+}
+function lessonText(lesson) {
+  const extra = lesson.kind === "workflow" ? [...lesson.preconditions, ...lesson.steps.map((s) => `${s.action} ${s.detail ?? ""} ${s.verify ?? ""}`), lesson.outcome].join(" ") : "";
+  return `${lesson.title}
+${lesson.gist}
+${lesson.tags.join(" ")}
+${lesson.content}
+${extra}`;
+}
+function score(lesson, request, profile, textRelevance, opts = {}) {
+  const w = { ...DEFAULT_WEIGHTS, ...opts.weights ?? {} };
   const now = opts.now ?? (/* @__PURE__ */ new Date()).toISOString();
   const reasons = [];
   const mode = classifyTaskMode(request.task);
@@ -3643,8 +4065,8 @@ var init_src = __esm({
 });
 
 // src/v2/store.ts
-import fs6 from "node:fs";
-import path5 from "node:path";
+import fs8 from "node:fs";
+import path7 from "node:path";
 import { createHash as createHash2, randomBytes as randomBytes3 } from "node:crypto";
 function hexId(prefix) {
   return `${prefix}_${randomBytes3(6).toString("hex")}`;
@@ -3678,12 +4100,12 @@ var init_store2 = __esm({
     V2Store = class {
       constructor(store) {
         this.store = store;
-        this.dir = path5.join(store.root, "v2");
+        this.dir = path7.join(store.root, "v2");
       }
       store;
       dir;
       p(...parts) {
-        return path5.join(this.dir, ...parts);
+        return path7.join(this.dir, ...parts);
       }
       // ── context / bundle / params ──
       readContext() {
@@ -3764,9 +4186,9 @@ var init_store2 = __esm({
         const dir = this.p("sessions");
         if (!fileExists(dir)) return [];
         const out = [];
-        for (const f of fs6.readdirSync(dir)) {
+        for (const f of fs8.readdirSync(dir)) {
           if (!f.endsWith(".json") || f === "current.json") continue;
-          const raw = readJson(path5.join(dir, f), null);
+          const raw = readJson(path7.join(dir, f), null);
           if (raw?.sessionId) out.push(normalizeSession(raw.sessionId, raw));
         }
         return out;
@@ -3794,7 +4216,7 @@ var init_store2 = __esm({
         let at = raw.at;
         if (!at) {
           try {
-            at = fs6.statSync(this.p("outcome", `${fileSafe(sessionId)}.json`)).mtime.toISOString();
+            at = fs8.statSync(this.p("outcome", `${fileSafe(sessionId)}.json`)).mtime.toISOString();
           } catch {
             at = (/* @__PURE__ */ new Date()).toISOString();
           }
@@ -3821,13 +4243,13 @@ var init_store2 = __esm({
       /** Exclusive lock file; returns a release function, or null when another process holds it. */
       tryLock(name, staleMs = 10 * 6e4) {
         const file = this.p("locks", `${fileSafe(name)}.lock`);
-        ensureDir(path5.dirname(file));
+        ensureDir(path7.dirname(file));
         for (let attempt = 0; attempt < 2; attempt++) {
           try {
-            fs6.writeFileSync(file, String(process.pid), { flag: "wx" });
+            fs8.writeFileSync(file, String(process.pid), { flag: "wx" });
             return () => {
               try {
-                fs6.unlinkSync(file);
+                fs8.unlinkSync(file);
               } catch {
               }
             };
@@ -3835,8 +4257,8 @@ var init_store2 = __esm({
             if (err.code !== "EEXIST") return null;
             let stale = false;
             try {
-              const owner = Number(fs6.readFileSync(file, "utf8"));
-              const age = Date.now() - fs6.statSync(file).mtimeMs;
+              const owner = Number(fs8.readFileSync(file, "utf8"));
+              const age = Date.now() - fs8.statSync(file).mtimeMs;
               if (age > staleMs) stale = true;
               else if (Number.isInteger(owner) && owner > 0) {
                 try {
@@ -3850,7 +4272,7 @@ var init_store2 = __esm({
             }
             if (!stale) return null;
             try {
-              fs6.unlinkSync(file);
+              fs8.unlinkSync(file);
             } catch {
             }
           }
@@ -3867,15 +4289,15 @@ var init_store2 = __esm({
         const dir = this.p(name);
         if (!fileExists(dir)) return [];
         const out = [];
-        for (const f of fs6.readdirSync(dir)) {
+        for (const f of fs8.readdirSync(dir)) {
           if (!f.endsWith(".json")) continue;
-          const v = readJson(path5.join(dir, f), null);
+          const v = readJson(path7.join(dir, f), null);
           if (v) out.push(v);
         }
         return out;
       }
     };
-    rootKey = (root) => createHash2("sha256").update(path5.resolve(root)).digest("hex").slice(0, 16);
+    rootKey = (root) => createHash2("sha256").update(path7.resolve(root)).digest("hex").slice(0, 16);
     addUnique = (list2, ...ids) => {
       for (const id of ids) if (id && !list2.includes(id)) list2.push(id);
     };
@@ -3883,15 +4305,15 @@ var init_store2 = __esm({
 });
 
 // src/v2/deploy.ts
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync3 } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
-import fs7 from "node:fs";
+import fs9 from "node:fs";
 import os2 from "node:os";
-import path6 from "node:path";
+import path8 from "node:path";
 function deployWorkspace(env = process.env) {
-  if (env.BUNSHIN_DEPLOY_WORKSPACE) return path6.resolve(env.BUNSHIN_DEPLOY_WORKSPACE);
+  if (env.BUNSHIN_DEPLOY_WORKSPACE) return path8.resolve(env.BUNSHIN_DEPLOY_WORKSPACE);
   try {
-    const ws = JSON.parse(fs7.readFileSync(settingsFile(env.BUNSHIN_DEPLOY_HOME || os2.homedir()), "utf8")).workspace;
+    const ws = JSON.parse(fs9.readFileSync(settingsFile(env.BUNSHIN_DEPLOY_HOME || os2.homedir()), "utf8")).workspace;
     return typeof ws === "string" && ws ? ws : null;
   } catch {
     return null;
@@ -3900,24 +4322,24 @@ function deployWorkspace(env = process.env) {
 function deployPaths(env = process.env, orgId) {
   const home = env.BUNSHIN_DEPLOY_HOME || os2.homedir();
   const ws = deployWorkspace(env);
-  const state = path6.join(home, ".bunshin", "deploy");
-  const shared = { claude: path6.join(ws ?? home, ".claude", "skills"), codex: path6.join(ws ?? home, ".codex", "skills") };
-  const org = orgId ? path6.join(state, orgKey(orgId)) : null;
+  const state = path8.join(home, ".bunshin", "deploy");
+  const shared = { claude: path8.join(ws ?? home, ".claude", "skills"), codex: path8.join(ws ?? home, ".codex", "skills") };
+  const org = orgId ? path8.join(state, orgKey(orgId)) : null;
   return {
     home,
-    claudeSkills: org ? path6.join(org, "claude-skills") : shared.claude,
-    codexSkills: org ? path6.join(org, "codex-skills") : shared.codex,
-    ...org ? { legacy: [.../* @__PURE__ */ new Set([shared.claude, shared.codex, path6.join(home, ".claude", "skills"), path6.join(home, ".codex", "skills"), path6.join(home, ".bunshin", "library")])] } : {},
-    claudeMd: ws ? path6.join(ws, "CLAUDE.md") : path6.join(home, ".claude", "CLAUDE.md"),
-    agentsMd: ws ? path6.join(ws, "AGENTS.md") : path6.join(home, ".codex", "AGENTS.md"),
-    library: org ? path6.join(org, "library") : path6.join(home, ".bunshin", "library"),
+    claudeSkills: org ? path8.join(org, "claude-skills") : shared.claude,
+    codexSkills: org ? path8.join(org, "codex-skills") : shared.codex,
+    ...org ? { legacy: [.../* @__PURE__ */ new Set([shared.claude, shared.codex, path8.join(home, ".claude", "skills"), path8.join(home, ".codex", "skills"), path8.join(home, ".bunshin", "library")])] } : {},
+    claudeMd: ws ? path8.join(ws, "CLAUDE.md") : path8.join(home, ".claude", "CLAUDE.md"),
+    agentsMd: ws ? path8.join(ws, "AGENTS.md") : path8.join(home, ".codex", "AGENTS.md"),
+    library: org ? path8.join(org, "library") : path8.join(home, ".bunshin", "library"),
     // Pack executables are linked into one folder on PATH (shared by name; their files are per organization).
-    bin: path6.join(home, ".bunshin", "bin"),
+    bin: path8.join(home, ".bunshin", "bin"),
     state
   };
 }
 function statePath(p, orgId) {
-  return path6.join(p.state, `${orgKey(orgId)}.json`);
+  return path8.join(p.state, `${orgKey(orgId)}.json`);
 }
 function readState(p, orgId) {
   const s = readJson(statePath(p, orgId), null);
@@ -3925,7 +4347,7 @@ function readState(p, orgId) {
 }
 function readText(file) {
   try {
-    return fs7.readFileSync(file, "utf8");
+    return fs9.readFileSync(file, "utf8");
   } catch {
     return null;
   }
@@ -3933,13 +4355,13 @@ function readText(file) {
 function writeFile(file, content, mode) {
   writeTextAtomic(file, content);
   try {
-    fs7.chmodSync(file, mode === "x" ? 493 : 420);
+    fs9.chmodSync(file, mode === "x" ? 493 : 420);
   } catch {
   }
 }
 function removeFile(file) {
   try {
-    fs7.unlinkSync(file);
+    fs9.unlinkSync(file);
   } catch {
   }
 }
@@ -3947,33 +4369,38 @@ function pruneDirs(dir, stop) {
   let d = dir;
   while (d.startsWith(stop) && d !== stop) {
     try {
-      if (fs7.readdirSync(d).length) return;
-      fs7.rmdirSync(d);
+      if (fs9.readdirSync(d).length) return;
+      fs9.rmdirSync(d);
     } catch {
       return;
     }
-    d = path6.dirname(d);
+    d = path8.dirname(d);
   }
 }
 function listFiles(dir, base = dir) {
   let entries;
   try {
-    entries = fs7.readdirSync(dir, { withFileTypes: true });
+    entries = fs9.readdirSync(dir, { withFileTypes: true });
   } catch {
     return [];
   }
   const out = [];
   for (const e of entries) {
-    const abs = path6.join(dir, e.name);
+    const abs = path8.join(dir, e.name);
     if (e.isDirectory()) out.push(...listFiles(abs, base));
-    else if (e.isFile()) out.push(path6.relative(base, abs).split(path6.sep).join("/"));
+    else if (e.isFile()) out.push(path8.relative(base, abs).split(path8.sep).join("/"));
   }
   return out.sort();
 }
 function childDir(root, name) {
   if (!name || !SAFE_NAME.test(name)) return null;
-  const dir = path6.join(root, name);
-  return path6.dirname(path6.resolve(dir)) === path6.resolve(root) && insideRoot(root, dir) ? dir : null;
+  const dir = path8.join(root, name);
+  return path8.dirname(path8.resolve(dir)) === path8.resolve(root) && insideRoot(root, dir) ? dir : null;
+}
+function layerRank(layer, tree) {
+  const kind = layerKind(layer);
+  if (kind === "group") return 1 + (tree ? groupChain(tree, layerValue(layer)).length : 0);
+  return kind === "source" ? 1e3 : kind === "user" || kind === "robot" ? 2e3 : 0;
 }
 function planDeploy(bundle, p, harnesses) {
   const active = bundle.sections.filter((s) => s.status === "active" || s.status === "stale");
@@ -3985,7 +4412,7 @@ function planDeploy(bundle, p, harnesses) {
       continue;
     }
     const prev = byName.get(s.skill.name);
-    if (!prev || (LAYER_RANK[layerKind(s.layer)] ?? 0) > (LAYER_RANK[layerKind(prev.layer)] ?? 0)) byName.set(s.skill.name, s);
+    if (!prev || layerRank(s.layer, bundle.scopes) > layerRank(prev.layer, bundle.scopes)) byName.set(s.skill.name, s);
   }
   const skills = [...byName.values()].sort((a, b) => a.skill.name.localeCompare(b.skill.name));
   const instructions = active.filter((s) => s.delivery === "always" && !s.skill && !s.profileOf).sort((a, b) => (a.packPath ?? a.title).localeCompare(b.packPath ?? b.title));
@@ -4080,7 +4507,7 @@ function removeBlock(file) {
   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 fs7.unlinkSync(file);
+  else fs9.unlinkSync(file);
   return true;
 }
 function writeBlock(file, block2) {
@@ -4101,7 +4528,7 @@ function skillIndex(skills, p) {
     "",
     "When a task matches a skill below, read its SKILL.md and follow it before doing the work by hand.",
     "",
-    ...skills.map((s) => `- **${s.skill.name}** (\`${path6.join(p.codexSkills, s.skill.name, "SKILL.md")}\`): ${neutralizeMarkers(s.skill.description).replace(/\s+/g, " ").trim()}`)
+    ...skills.map((s) => `- **${s.skill.name}** (\`${path8.join(p.codexSkills, s.skill.name, "SKILL.md")}\`): ${neutralizeMarkers(s.skill.description).replace(/\s+/g, " ").trim()}`)
   ];
   return lines.join("\n");
 }
@@ -4150,7 +4577,7 @@ function captureDoc(c, doc, out) {
     for (const dir of doc.dirs ?? []) {
       for (const rel of listFiles(dir)) {
         if (rel === "SKILL.md" || rel === MANIFEST || seen.has(`file:${rel}`)) continue;
-        const abs = path6.join(dir, rel);
+        const abs = path8.join(dir, rel);
         const content = readText(abs);
         if (content === null || Buffer.byteLength(content) > MAX_FILE) continue;
         byRel.set(`file:${rel}`, { target: { abs, rel, role: "file", sha: "", ...isExecutable(abs) ? { mode: "x" } : {} }, content });
@@ -4189,18 +4616,18 @@ function captureNewSkills(c, state, roots, owned, incoming, out, layer, only) {
   for (const root of roots) {
     let names = [];
     try {
-      names = fs7.readdirSync(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+      names = fs9.readdirSync(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
     } catch {
       continue;
     }
     for (const name of names) {
-      const dir = path6.join(root, name);
+      const dir = path8.join(root, name);
       if (owned.has(dir) || incoming.has(name) || only && name !== only) continue;
-      const skillMd = readText(path6.join(dir, "SKILL.md"));
+      const skillMd = readText(path8.join(dir, "SKILL.md"));
       if (skillMd === null) continue;
       let born = 0;
       try {
-        const st = fs7.statSync(path6.join(dir, "SKILL.md"));
+        const st = fs9.statSync(path8.join(dir, "SKILL.md"));
         born = Math.min(st.birthtimeMs || st.mtimeMs, st.mtimeMs);
       } catch {
         continue;
@@ -4209,8 +4636,8 @@ function captureNewSkills(c, state, roots, owned, incoming, out, layer, only) {
       const files = {};
       for (const rel of listFiles(dir).filter((r) => !r.split("/").some((seg) => seg.startsWith(".")))) {
         if (rel === "SKILL.md" || rel === MANIFEST) continue;
-        const content = readText(path6.join(dir, rel));
-        if (content !== null && Buffer.byteLength(content) <= MAX_FILE) files[rel] = { content, ...isExecutable(path6.join(dir, rel)) ? { mode: "x" } : {} };
+        const content = readText(path8.join(dir, rel));
+        if (content !== null && Buffer.byteLength(content) <= MAX_FILE) files[rel] = { content, ...isExecutable(path8.join(dir, rel)) ? { mode: "x" } : {} };
       }
       const hash = sha(JSON.stringify([skillMd, files]));
       if (state.created[name]?.hash === hash) continue;
@@ -4258,14 +4685,14 @@ function captureEdits(v2, config, ctx, opts = {}) {
 }
 function lockDeploy(p) {
   ensureDir(p.state);
-  const file = path6.join(p.state, ".lock");
+  const file = path8.join(p.state, ".lock");
   for (let i = 0; i < 2; i++) {
     try {
-      fs7.writeFileSync(file, String(process.pid), { flag: "wx" });
+      fs9.writeFileSync(file, String(process.pid), { flag: "wx" });
       return () => removeFile(file);
     } catch {
       try {
-        const age = Date.now() - fs7.statSync(file).mtimeMs;
+        const age = Date.now() - fs9.statSync(file).mtimeMs;
         const pid = Number(readText(file));
         let alive = age < 12e4;
         if (alive && pid > 0) {
@@ -4332,7 +4759,7 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
     const foreign = /* @__PURE__ */ new Set();
     if (d.kind === "skill" && !prev) {
       for (const dir of d.dirs ?? []) {
-        const cur = readText(path6.join(dir, "SKILL.md"));
+        const cur = readText(path8.join(dir, "SKILL.md"));
         if (cur === null || cur === d.section.body || state.created[d.name]) continue;
         foreign.add(dir);
         report.warnings.push(`${dir} is not managed by Bunshin; the library's ${d.name} skill was not installed there`);
@@ -4344,7 +4771,7 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
         targets.push({ ...t, sha: sha(neutralizeMarkers(d.section.body).replace(/\n*$/, "\n")) });
         continue;
       }
-      if ([...foreign].some((dir) => t.abs.startsWith(dir + path6.sep))) continue;
+      if ([...foreign].some((dir) => t.abs.startsWith(dir + path8.sep))) continue;
       if (!(d.dirs ?? (d.root ? [d.root] : [])).some((r) => insideRoot(r, t.abs))) {
         report.warnings.push(`${t.abs} not written: it leads outside its folder`);
         continue;
@@ -4353,10 +4780,10 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
       const existing = readText(t.abs);
       try {
         if (existing !== content) {
-          ensureDir(path6.dirname(t.abs));
+          ensureDir(path8.dirname(t.abs));
           writeFile(t.abs, content, t.mode);
           report.written++;
-        } else if (t.mode === "x" && !isExecutable(t.abs)) fs7.chmodSync(t.abs, 493);
+        } else if (t.mode === "x" && !isExecutable(t.abs)) fs9.chmodSync(t.abs, 493);
       } catch (err) {
         report.warnings.push(`${t.abs} not written: ${err instanceof Error ? err.message : String(err)}`);
         continue;
@@ -4369,19 +4796,19 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
       const cur = readText(old.abs);
       if (cur !== null && sha(cur) === old.sha) {
         removeFile(old.abs);
-        pruneDirs(path6.dirname(old.abs), d.kind === "skill" ? path6.dirname(path6.dirname(old.abs)) : p.library);
+        pruneDirs(path8.dirname(old.abs), d.kind === "skill" ? path8.dirname(path8.dirname(old.abs)) : p.library);
         report.removed++;
       }
     }
     if (d.kind === "skill") {
       for (const dir of prev?.dirs ?? []) {
         if ((d.dirs ?? []).includes(dir) || !removable(dir)) continue;
-        removeFile(path6.join(dir, MANIFEST));
-        pruneDirs(dir, path6.dirname(dir));
+        removeFile(path8.join(dir, MANIFEST));
+        pruneDirs(dir, path8.dirname(dir));
       }
       for (const dir of d.dirs ?? []) {
         const manifest = safeJoin(dir, MANIFEST);
-        if (foreign.has(dir) || !manifest || !fs7.existsSync(path6.join(dir, "SKILL.md"))) continue;
+        if (foreign.has(dir) || !manifest || !fs9.existsSync(path8.join(dir, "SKILL.md"))) continue;
         writeJsonAtomic(manifest, { sectionId: id, name: d.name, version: d.section.version, libraryVersion: bundle.libraryVersion ?? null, managedBy: "bunshin sync" });
       }
       report.skills++;
@@ -4406,12 +4833,12 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
     }
     for (const dir of doc.dirs ?? []) {
       if (!removable(dir)) continue;
-      removeFile(path6.join(dir, MANIFEST));
-      pruneDirs(dir, path6.dirname(dir));
-      if (fs7.existsSync(dir)) {
+      removeFile(path8.join(dir, MANIFEST));
+      pruneDirs(dir, path8.dirname(dir));
+      if (fs9.existsSync(dir)) {
         const left = listFiles(dir);
         if (left.length) report.warnings.push(`${dir} kept: it has files Bunshin did not write`);
-        else pruneDirs(dir, path6.dirname(dir));
+        else pruneDirs(dir, path8.dirname(dir));
       }
     }
   }
@@ -4427,17 +4854,17 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
     if (d.kind === "skill") continue;
     for (const t of d.targets) {
       if (t.role === "block" || t.mode !== "x" || !/(^|\/)bin\/[^/]+$/.test(t.rel) || !owned(t.abs)) continue;
-      const link = path6.join(p.bin, path6.basename(t.abs));
+      const link = path8.join(p.bin, path8.basename(t.abs));
       ensureDir(p.bin);
       try {
-        const cur = fs7.readlinkSync(link);
+        const cur = fs9.readlinkSync(link);
         if (cur !== t.abs) {
-          fs7.unlinkSync(link);
-          fs7.symlinkSync(t.abs, link);
+          fs9.unlinkSync(link);
+          fs9.symlinkSync(t.abs, link);
         }
       } catch {
         try {
-          if (!fs7.existsSync(link)) fs7.symlinkSync(t.abs, link);
+          if (!fs9.existsSync(link)) fs9.symlinkSync(t.abs, link);
         } catch {
         }
       }
@@ -4448,19 +4875,19 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
   if (harnesses.has("claude-code")) {
     for (const pack of packs) {
       const dir = childDir(p.library, pack);
-      if (!dir || !insideRoot(dir, path6.join(dir, ".claude", "x"))) continue;
-      const link = path6.join(dir, ".claude", "skills");
+      if (!dir || !insideRoot(dir, path8.join(dir, ".claude", "x"))) continue;
+      const link = path8.join(dir, ".claude", "skills");
       try {
-        fs7.lstatSync(link);
-        if (fs7.readlinkSync(link) !== p.claudeSkills) {
-          fs7.unlinkSync(link);
-          fs7.symlinkSync(p.claudeSkills, link);
+        fs9.lstatSync(link);
+        if (fs9.readlinkSync(link) !== p.claudeSkills) {
+          fs9.unlinkSync(link);
+          fs9.symlinkSync(p.claudeSkills, link);
         }
       } catch {
-        ensureDir(path6.dirname(link));
+        ensureDir(path8.dirname(link));
         ensureDir(p.claudeSkills);
         try {
-          fs7.symlinkSync(p.claudeSkills, link);
+          fs9.symlinkSync(p.claudeSkills, link);
         } catch {
         }
       }
@@ -4469,17 +4896,26 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
   for (const old of state.links) {
     if (links.has(old)) continue;
     try {
-      const target = fs7.readlinkSync(old);
-      if (!fs7.existsSync(target)) fs7.unlinkSync(old);
+      const target = fs9.readlinkSync(old);
+      if (!fs9.existsSync(target)) fs9.unlinkSync(old);
     } catch {
     }
   }
   let linked = state.linked ?? [];
   if (p.legacy) {
-    const names = Object.values(next).filter((d) => d.kind === "skill" && (d.dirs ?? []).length).map((d) => d.name);
-    const roots = [.../* @__PURE__ */ new Set([...linked, ...opts.linkRoot ? [path6.resolve(opts.linkRoot)] : []])];
+    const deployed = Object.values(next).filter((d) => d.kind === "skill" && (d.dirs ?? []).length);
+    const layerOf = new Map(plan.skills.map((x) => [x.skill.name, x.layer]));
+    const roots = [.../* @__PURE__ */ new Set([...linked, ...opts.linkRoot ? [path8.resolve(opts.linkRoot)] : []])];
     linked = [];
     for (const root of roots) {
+      let source;
+      try {
+        source = sourceFor(root, v2.store.root, ctx);
+      } catch {
+        source = void 0;
+      }
+      const reader = readerFor(ctx, void 0, { ...source ? { source } : {}, ...bundle.scopes ? { tree: bundle.scopes } : {} });
+      const names = deployed.filter((d) => inBoundary({ layer: layerOf.get(d.name) ?? "org" }, reader)).map((d) => d.name);
       const res = linkSkills(p, root, opts.linkHarnesses ?? [...harnesses], names);
       report.warnings.push(...res.warnings);
       if (res.kept) linked.push(root);
@@ -4500,13 +4936,13 @@ function materialize(sections, dir) {
   const put = (rel, content, mode) => {
     const abs = safeJoin(dir, rel);
     if (!abs) return;
-    ensureDir(path6.dirname(abs));
+    ensureDir(path8.dirname(abs));
     writeFile(abs, content, mode);
     files++;
   };
   for (const s of sections.filter((x) => x.status === "active" || x.status === "stale")) {
     if (s.skill) {
-      const base = s.packPath && /(^|\/)SKILL\.md$/.test(s.packPath) ? path6.posix.dirname(s.packPath) : `.claude/skills/${s.skill.name}`;
+      const base = s.packPath && /(^|\/)SKILL\.md$/.test(s.packPath) ? path8.posix.dirname(s.packPath) : `.claude/skills/${s.skill.name}`;
       put(`${base}/SKILL.md`, s.body);
       for (const [rel, f] of Object.entries(s.skill.files ?? {})) put(`${base}/${rel}`, f.content, f.mode);
       continue;
@@ -4518,51 +4954,51 @@ function materialize(sections, dir) {
 }
 function linkSkills(p, root, harnesses, names) {
   const out = { linked: 0, removed: 0, kept: false, warnings: [] };
-  const abs = path6.resolve(root);
-  if (abs === path6.resolve(p.home) || abs === path6.resolve(os2.homedir()) || !fs7.existsSync(abs)) return out;
-  const managed = (target) => target.startsWith(path6.resolve(p.state) + path6.sep);
+  const abs = path8.resolve(root);
+  if (abs === path8.resolve(p.home) || abs === path8.resolve(os2.homedir()) || !fs9.existsSync(abs)) return out;
+  const managed = (target) => target.startsWith(path8.resolve(p.state) + path8.sep);
   const excluded = [];
   for (const h of harnesses) {
     const spec = LINK_DIRS[h];
     if (!spec) continue;
-    const dir = path6.join(abs, spec.rel);
-    const canonical = path6.resolve(p[spec.key]);
-    const want = new Set(names.filter((n) => SAFE_NAME.test(n) && fs7.existsSync(path6.join(canonical, n, "SKILL.md"))));
+    const dir = path8.join(abs, spec.rel);
+    const canonical = path8.resolve(p[spec.key]);
+    const want = new Set(names.filter((n) => SAFE_NAME.test(n) && fs9.existsSync(path8.join(canonical, n, "SKILL.md"))));
     let entries = [];
     try {
-      entries = fs7.readdirSync(dir, { withFileTypes: true });
+      entries = fs9.readdirSync(dir, { withFileTypes: true });
     } catch {
     }
     for (const e of entries) {
       if (!e.isSymbolicLink()) continue;
-      const link = path6.join(dir, e.name);
+      const link = path8.join(dir, e.name);
       let target = "";
       try {
-        target = path6.resolve(dir, fs7.readlinkSync(link));
+        target = path8.resolve(dir, fs9.readlinkSync(link));
       } catch {
         continue;
       }
       if (!managed(target)) continue;
-      if (want.has(e.name) && target === path6.join(canonical, e.name)) {
+      if (want.has(e.name) && target === path8.join(canonical, e.name)) {
         want.delete(e.name);
-        excluded.push(path6.join(spec.rel, e.name));
+        excluded.push(path8.join(spec.rel, e.name));
         continue;
       }
       removeFile(link);
       out.removed++;
     }
     for (const name of want) {
-      const link = path6.join(dir, name);
+      const link = path8.join(dir, name);
       try {
-        fs7.lstatSync(link);
+        fs9.lstatSync(link);
         out.warnings.push(`${link} is the project's own; the library's ${name} skill was not linked there`);
         continue;
       } catch {
       }
       try {
         ensureDir(dir);
-        fs7.symlinkSync(path6.join(canonical, name), link, "dir");
-        excluded.push(path6.join(spec.rel, name));
+        fs9.symlinkSync(path8.join(canonical, name), link, "dir");
+        excluded.push(path8.join(spec.rel, name));
         out.linked++;
       } catch (err) {
         out.warnings.push(`${link} not linked: ${err instanceof Error ? err.message : String(err)}`);
@@ -4575,10 +5011,10 @@ function linkSkills(p, root, harnesses, names) {
   return out;
 }
 function gitExclude(root, rels) {
-  if (!fs7.existsSync(path6.join(root, ".git"))) return;
+  if (!fs9.existsSync(path8.join(root, ".git"))) return;
   let file;
   try {
-    file = path6.resolve(root, execFileSync("git", ["-C", root, "rev-parse", "--git-path", "info/exclude"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 2e3 }).trim());
+    file = path8.resolve(root, execFileSync3("git", ["-C", root, "rev-parse", "--git-path", "info/exclude"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 2e3 }).trim());
   } catch {
     return;
   }
@@ -4587,25 +5023,26 @@ function gitExclude(root, rels) {
   const end = start >= 0 ? cur.indexOf(EXCLUDE_END, start) : -1;
   const rest = start >= 0 && end >= 0 ? cur.slice(0, start) + cur.slice(end + EXCLUDE_END.length).replace(/^\n/, "") : cur;
   const block2 = rels.length ? `${EXCLUDE_BEGIN}
-${[...new Set(rels)].sort().map((r) => `/${r.split(path6.sep).join("/")}`).join("\n")}
+${[...new Set(rels)].sort().map((r) => `/${r.split(path8.sep).join("/")}`).join("\n")}
 ${EXCLUDE_END}
 ` : "";
   const next = block2 ? `${rest}${rest && !rest.endsWith("\n") ? "\n" : ""}${block2}` : rest;
   if (next === cur) return;
   try {
-    ensureDir(path6.dirname(file));
-    fs7.writeFileSync(file, next);
+    ensureDir(path8.dirname(file));
+    fs9.writeFileSync(file, next);
   } catch {
   }
 }
-var settingsFile, orgKey, sha, BLOCK_BEGIN, BLOCK_END, MANIFEST, MAX_FILE, isExecutable, safeJoin, SAFE_NAME, neutralizeMarkers, LAYER_RANK, docMarker, BORN_SLACK_MS, LINK_DIRS, EXCLUDE_BEGIN, EXCLUDE_END;
+var settingsFile, orgKey, sha, BLOCK_BEGIN, BLOCK_END, MANIFEST, MAX_FILE, isExecutable, safeJoin, SAFE_NAME, neutralizeMarkers, docMarker, BORN_SLACK_MS, LINK_DIRS, EXCLUDE_BEGIN, EXCLUDE_END;
 var init_deploy = __esm({
   "src/v2/deploy.ts"() {
     "use strict";
     init_v22();
+    init_source();
     init_util();
     init_store2();
-    settingsFile = (home) => path6.join(home, ".bunshin", "deploy", "settings.json");
+    settingsFile = (home) => path8.join(home, ".bunshin", "deploy", "settings.json");
     orgKey = (orgId) => orgId.replace(/[^A-Za-z0-9._-]/g, "_") || "org";
     sha = (text2) => createHash3("sha256").update(text2).digest("hex");
     BLOCK_BEGIN = "<!-- bunshin:begin -->";
@@ -4614,7 +5051,7 @@ var init_deploy = __esm({
     MAX_FILE = 2 * 1024 * 1024;
     isExecutable = (file) => {
       try {
-        return (fs7.statSync(file).mode & 73) !== 0;
+        return (fs9.statSync(file).mode & 73) !== 0;
       } catch {
         return false;
       }
@@ -4622,12 +5059,11 @@ var init_deploy = __esm({
     safeJoin = containedPath;
     SAFE_NAME = /^(?!\.\.?$)[A-Za-z0-9][A-Za-z0-9._-]*$/;
     neutralizeMarkers = (text2) => text2.replace(/<!--(?=\s*bunshin:)/gi, "<!-\u200B-");
-    LAYER_RANK = { org: 0, dept: 1, team: 2, user: 3, fleet: 0, arm: 1, mount: 2, robot: 3 };
     docMarker = (id, version2) => `<!-- bunshin:doc id=${id} v=${version2} -->`;
     BORN_SLACK_MS = 2e3;
     LINK_DIRS = {
-      "claude-code": { rel: path6.join(".claude", "skills"), key: "claudeSkills" },
-      codex: { rel: path6.join(".codex", "skills"), key: "codexSkills" }
+      "claude-code": { rel: path8.join(".claude", "skills"), key: "claudeSkills" },
+      codex: { rel: path8.join(".codex", "skills"), key: "codexSkills" }
     };
     EXCLUDE_BEGIN = "# >>> bunshin: library skills linked here (managed by bunshin sync)";
     EXCLUDE_END = "# <<< bunshin";
@@ -4739,11 +5175,11 @@ var init_live = __esm({
 });
 
 // src/transcript.ts
-import fs8 from "node:fs";
+import fs10 from "node:fs";
 function parseTranscript(file) {
   let raw = "";
   try {
-    raw = fs8.readFileSync(file, "utf8");
+    raw = fs10.readFileSync(file, "utf8");
   } catch {
     return { turns: [], userMessages: 0, toolCalls: 0, toolFailures: 0 };
   }
@@ -4834,292 +5270,128 @@ function isHumanText(text2) {
 function blockText(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
-    return content.map((c) => c && typeof c === "object" && "text" in c ? String(c.text) : "").filter(Boolean).join("\n");
-  }
-  return content == null ? "" : JSON.stringify(content);
-}
-function codexToolResults(output, depth = 0) {
-  const raw = blockText(output);
-  let envelope = output;
-  if (typeof output === "string") {
-    try {
-      envelope = JSON.parse(output);
-    } catch {
-    }
-  }
-  if (depth > 6) return [{ text: raw, pending: true }];
-  if (Array.isArray(envelope)) return envelope.flatMap((part) => codexToolResults(part, depth + 1));
-  if (envelope && typeof envelope === "object" && !Array.isArray(envelope)) {
-    const result = envelope;
-    if (typeof result.output === "string" && (Number.isInteger(result.exit_code) || result.exit_code === null || Number.isInteger(result.session_id))) {
-      const pending = !Number.isInteger(result.exit_code);
-      return [{
-        text: `${pending ? "Command still running" : `Process exited with code ${result.exit_code}`}
-${result.output}`,
-        isError: !pending && result.exit_code !== 0,
-        pending
-      }];
-    }
-    if (result.status === "fulfilled" && "value" in result) return codexToolResults(result.value, depth + 1);
-    if (result.status === "rejected") return [{ text: raw, isError: true }];
-  }
-  return [{
-    text: raw,
-    isError: /(?:Process exited with code|exit_code["']?\s*:)\s*[1-9]\d*\b/i.test(raw),
-    pending: /(?:Process running with session ID|Script running with cell ID)/i.test(raw)
-  }];
-}
-function summarizeInput(input) {
-  if (input == null) return "";
-  if (typeof input !== "object") return String(input);
-  const obj = input;
-  for (const key of ["command", "prompt", "pattern", "file_path", "query", "description"]) {
-    if (typeof obj[key] === "string") return `${key}: ${obj[key]}`;
-  }
-  return JSON.stringify(obj);
-}
-function bounded(text2, maxChars) {
-  if (text2.length <= maxChars) return text2;
-  const marker = "\n[... middle omitted ...]\n";
-  if (maxChars <= marker.length) return text2.slice(0, Math.max(0, maxChars));
-  const head = Math.floor((maxChars - marker.length) / 2);
-  return text2.slice(0, head) + marker + text2.slice(-(maxChars - marker.length - head));
-}
-function digest(facts, { from = 0, maxChars = 6e4, toolResultChars = 6e3 } = {}) {
-  const parts = [];
-  for (const t of facts.turns.slice(from)) {
-    const text2 = redact2(t.text);
-    if (t.role === "user") parts.push(`[USER]
-${bounded(text2, maxChars)}`);
-    else if (t.role === "assistant") parts.push(`[ASSISTANT]
-${bounded(text2, maxChars)}`);
-    else if (t.tool === "result") parts.push(`[TOOL RESULT${t.isError ? " \u2014 ERROR" : t.pending ? " \u2014 RUNNING" : ""}]
-${bounded(text2, toolResultChars)}`);
-    else parts.push(`[TOOL ${t.tool}] ${truncate(text2, 400)}`);
-  }
-  return bounded(parts.join("\n\n"), maxChars);
-}
-function fullTrace(facts, { from = 0, to } = {}) {
-  return facts.turns.slice(from, to).map((t) => {
-    if (t.role === "user") return `[USER]
-${redact2(t.text)}`;
-    if (t.role === "assistant") return `[ASSISTANT]
-${redact2(t.text)}`;
-    if (t.tool === "result") return `[TOOL RESULT${t.isError ? " \u2014 ERROR" : t.pending ? " \u2014 RUNNING" : ""}]
-${redact2(t.text)}`;
-    const input = t.input === void 0 ? t.text : typeof t.input === "string" ? t.input : JSON.stringify(t.input, null, 1);
-    return `[TOOL ${t.tool}]
-${redact2(input)}`;
-  });
-}
-function traceChunks(turns, maxBytes = 1e6) {
-  const out = [];
-  let cur = "";
-  let size = 0;
-  turns.forEach((turn, i) => {
-    let piece = (i ? "\n\n" : "") + turn;
-    let bytes = jsonBytes(piece);
-    if (size + bytes <= maxBytes) {
-      cur += piece;
-      size += bytes;
-      return;
-    }
-    if (cur) out.push(cur);
-    while (bytes > maxBytes) {
-      let n = Math.min(piece.length, maxBytes);
-      for (let b = jsonBytes(piece.slice(0, n)); b > maxBytes; b = jsonBytes(piece.slice(0, n))) n = Math.max(1, Math.floor(n * maxBytes / b) - 1);
-      const code2 = piece.charCodeAt(n - 1);
-      if (n > 1 && code2 >= 55296 && code2 <= 56319) n--;
-      const head = piece.slice(0, n);
-      out.push(head);
-      piece = piece.slice(n);
-      bytes -= jsonBytes(head);
-    }
-    cur = piece;
-    size = bytes;
-  });
-  if (cur) out.push(cur);
-  return out;
-}
-function recentContext(file, { turns = 2, maxChars = 6e3 } = {}) {
-  const facts = parseTranscript(file);
-  const visible = facts.turns.filter((t) => t.role !== "tool");
-  const userIdx = visible.map((t, i) => t.role === "user" ? i : -1).filter((i) => i >= 0);
-  const start = userIdx.length > turns ? userIdx[userIdx.length - turns] : 0;
-  return digest({ ...facts, turns: visible.slice(start) }, { maxChars });
-}
-var BANNER, jsonBytes;
-var init_transcript = __esm({
-  "src/transcript.ts"() {
-    "use strict";
-    init_redact2();
-    init_util();
-    BANNER = "## Recalled lessons (Bunshin)";
-    jsonBytes = (s) => Buffer.byteLength(JSON.stringify(s)) - 2;
-  }
-});
-
-// src/v2/repo.ts
-import fs9 from "node:fs";
-import path7 from "node:path";
-import { execFileSync as execFileSync2 } from "node:child_process";
-function git(cwd, args, timeout = 1500) {
-  try {
-    return execFileSync2("git", ["-C", cwd, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout, maxBuffer: 64 * 1024 * 1024 });
-  } catch {
-    return null;
-  }
-}
-function repoRoot(cwd, storeRoot) {
-  const key = `${cwd}
-${storeRoot ?? ""}`;
-  const hit = rootCache.get(key);
-  if (hit) return hit;
-  const top = git(cwd, ["rev-parse", "--show-toplevel"])?.trim();
-  let root = top || "";
-  if (!root && storeRoot && path7.basename(storeRoot) === ".bunshin") {
-    const parent = path7.dirname(storeRoot);
-    if (path7.resolve(cwd).startsWith(path7.resolve(parent))) root = parent;
-  }
-  root = root || path7.resolve(cwd);
-  rootCache.set(key, root);
-  return root;
-}
-function parseRemote(url) {
-  const clean2 = url.trim().replace(/\.git$/, "").replace(/\/+$/, "");
-  if (!clean2) return null;
-  const scp = clean2.match(/^[^@/\s]+@[^:/\s]+:(.+)$/);
-  const pathPart = scp ? scp[1] : (() => {
-    try {
-      return new URL(clean2).pathname;
-    } catch {
-      return clean2;
-    }
-  })();
-  const segs = pathPart.split("/").filter(Boolean);
-  if (segs.length >= 2) return `${segs[segs.length - 2]}/${segs[segs.length - 1]}`;
-  return segs[0] ?? null;
-}
-function repoName(root) {
-  const url = git(root, ["remote", "get-url", "origin"]);
-  return url && parseRemote(url) || path7.basename(root);
-}
-function repoCommit(root) {
-  return git(root, ["rev-parse", "HEAD"])?.trim() || void 0;
-}
-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) => fs9.existsSync(path7.join(root, rel)) && !deployedSkill(root, rel)).sort();
-  const out = [];
-  let visited = 0;
-  const walk = (dir, rel, depth) => {
-    if (depth > 8 || visited++ > 2e4) return;
-    let entries;
-    try {
-      entries = fs9.readdirSync(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const e of entries) {
-      if (e.isDirectory()) {
-        if (!SKIP_DIRS.has(e.name) && !fs9.existsSync(path7.join(dir, e.name, ".git"))) walk(path7.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) && !deployedSkill(root, r)) out.push(r);
-      }
-    }
-  };
-  walk(root, "", 0);
-  return out.sort();
-}
-function indexWorkingTree(v2, config, cwd, opts = {}) {
-  const root = repoRoot(cwd, v2.store.root);
-  const now = opts.now ?? Date.now();
-  const cached = v2.readRepoIndex(root);
-  const ownerTeam = config.ownerTeam || config.orgUnit || "unknown";
-  const sameRepo = cached && cached.ownerTeam === ownerTeam;
-  const repo = sameRepo && cached.repo && !opts.force ? cached.repo : repoName(root);
-  const fresh = sameRepo && cached.repo === repo && cached.paths && cached.listedAt && now - Date.parse(cached.listedAt) < LIST_TTL_MS && !opts.force;
-  const paths = fresh ? cached.paths : listDocs(root);
-  let changed = !fresh || !sameRepo || cached.repo !== repo;
-  const files = {};
-  for (const rel of paths) {
-    const abs = path7.join(root, rel);
-    let stat;
-    try {
-      stat = fs9.statSync(abs);
-    } catch {
-      changed = true;
-      continue;
-    }
-    const prev = sameRepo && cached.repo === repo ? cached.files[rel] : void 0;
-    if (prev && prev.mtimeMs === stat.mtimeMs && prev.size === stat.size) {
-      files[rel] = prev;
-      continue;
-    }
-    changed = true;
-    try {
-      const text2 = fs9.readFileSync(abs, "utf8");
-      files[rel] = { mtimeMs: stat.mtimeMs, size: stat.size, sections: parseRepoDoc({ repo, path: rel, text: text2 }, { orgId: config.orgId, ownerTeam }) };
-    } catch {
-    }
-  }
-  const index = {
-    repo,
-    ownerTeam,
-    listedAt: fresh ? cached.listedAt : new Date(now).toISOString(),
-    paths,
-    files
-  };
-  if (changed) {
-    try {
-      v2.writeRepoIndex(root, index);
-    } catch {
-    }
+    return content.map((c) => c && typeof c === "object" && "text" in c ? String(c.text) : "").filter(Boolean).join("\n");
   }
-  return { root, index, sections: Object.values(files).flatMap((f) => f.sections) };
+  return content == null ? "" : JSON.stringify(content);
 }
-function relativeToRoot(root, file, cwd = root) {
-  if (!file) return null;
-  const abs = path7.isAbsolute(file) ? file : path7.resolve(cwd, file);
-  let real = abs;
-  let realRoot = root;
-  try {
-    realRoot = fs9.realpathSync(root);
-  } catch {
-  }
-  try {
-    real = fs9.realpathSync(abs);
-  } catch {
+function codexToolResults(output, depth = 0) {
+  const raw = blockText(output);
+  let envelope = output;
+  if (typeof output === "string") {
     try {
-      real = path7.join(fs9.realpathSync(path7.dirname(abs)), path7.basename(abs));
+      envelope = JSON.parse(output);
     } catch {
     }
   }
-  for (const [r, f] of [
-    [realRoot, real],
-    [root, abs]
-  ]) {
-    const rel = path7.relative(r, f);
-    if (rel && !rel.startsWith("..") && !path7.isAbsolute(rel)) return rel.split(path7.sep).join("/");
+  if (depth > 6) return [{ text: raw, pending: true }];
+  if (Array.isArray(envelope)) return envelope.flatMap((part) => codexToolResults(part, depth + 1));
+  if (envelope && typeof envelope === "object" && !Array.isArray(envelope)) {
+    const result = envelope;
+    if (typeof result.output === "string" && (Number.isInteger(result.exit_code) || result.exit_code === null || Number.isInteger(result.session_id))) {
+      const pending = !Number.isInteger(result.exit_code);
+      return [{
+        text: `${pending ? "Command still running" : `Process exited with code ${result.exit_code}`}
+${result.output}`,
+        isError: !pending && result.exit_code !== 0,
+        pending
+      }];
+    }
+    if (result.status === "fulfilled" && "value" in result) return codexToolResults(result.value, depth + 1);
+    if (result.status === "rejected") return [{ text: raw, isError: true }];
   }
-  return null;
+  return [{
+    text: raw,
+    isError: /(?:Process exited with code|exit_code["']?\s*:)\s*[1-9]\d*\b/i.test(raw),
+    pending: /(?:Process running with session ID|Script running with cell ID)/i.test(raw)
+  }];
 }
-var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc, deployedSkill;
-var init_repo = __esm({
-  "src/v2/repo.ts"() {
+function summarizeInput(input) {
+  if (input == null) return "";
+  if (typeof input !== "object") return String(input);
+  const obj = input;
+  for (const key of ["command", "prompt", "pattern", "file_path", "query", "description"]) {
+    if (typeof obj[key] === "string") return `${key}: ${obj[key]}`;
+  }
+  return JSON.stringify(obj);
+}
+function bounded(text2, maxChars) {
+  if (text2.length <= maxChars) return text2;
+  const marker = "\n[... middle omitted ...]\n";
+  if (maxChars <= marker.length) return text2.slice(0, Math.max(0, maxChars));
+  const head = Math.floor((maxChars - marker.length) / 2);
+  return text2.slice(0, head) + marker + text2.slice(-(maxChars - marker.length - head));
+}
+function digest(facts, { from = 0, maxChars = 6e4, toolResultChars = 6e3 } = {}) {
+  const parts = [];
+  for (const t of facts.turns.slice(from)) {
+    const text2 = redact2(t.text);
+    if (t.role === "user") parts.push(`[USER]
+${bounded(text2, maxChars)}`);
+    else if (t.role === "assistant") parts.push(`[ASSISTANT]
+${bounded(text2, maxChars)}`);
+    else if (t.tool === "result") parts.push(`[TOOL RESULT${t.isError ? " \u2014 ERROR" : t.pending ? " \u2014 RUNNING" : ""}]
+${bounded(text2, toolResultChars)}`);
+    else parts.push(`[TOOL ${t.tool}] ${truncate(text2, 400)}`);
+  }
+  return bounded(parts.join("\n\n"), maxChars);
+}
+function fullTrace(facts, { from = 0, to } = {}) {
+  return facts.turns.slice(from, to).map((t) => {
+    if (t.role === "user") return `[USER]
+${redact2(t.text)}`;
+    if (t.role === "assistant") return `[ASSISTANT]
+${redact2(t.text)}`;
+    if (t.tool === "result") return `[TOOL RESULT${t.isError ? " \u2014 ERROR" : t.pending ? " \u2014 RUNNING" : ""}]
+${redact2(t.text)}`;
+    const input = t.input === void 0 ? t.text : typeof t.input === "string" ? t.input : JSON.stringify(t.input, null, 1);
+    return `[TOOL ${t.tool}]
+${redact2(input)}`;
+  });
+}
+function traceChunks(turns, maxBytes = 1e6) {
+  const out = [];
+  let cur = "";
+  let size = 0;
+  turns.forEach((turn, i) => {
+    let piece = (i ? "\n\n" : "") + turn;
+    let bytes = jsonBytes(piece);
+    if (size + bytes <= maxBytes) {
+      cur += piece;
+      size += bytes;
+      return;
+    }
+    if (cur) out.push(cur);
+    while (bytes > maxBytes) {
+      let n = Math.min(piece.length, maxBytes);
+      for (let b = jsonBytes(piece.slice(0, n)); b > maxBytes; b = jsonBytes(piece.slice(0, n))) n = Math.max(1, Math.floor(n * maxBytes / b) - 1);
+      const code2 = piece.charCodeAt(n - 1);
+      if (n > 1 && code2 >= 55296 && code2 <= 56319) n--;
+      const head = piece.slice(0, n);
+      out.push(head);
+      piece = piece.slice(n);
+      bytes -= jsonBytes(head);
+    }
+    cur = piece;
+    size = bytes;
+  });
+  if (cur) out.push(cur);
+  return out;
+}
+function recentContext(file, { turns = 2, maxChars = 6e3 } = {}) {
+  const facts = parseTranscript(file);
+  const visible = facts.turns.filter((t) => t.role !== "tool");
+  const userIdx = visible.map((t, i) => t.role === "user" ? i : -1).filter((i) => i >= 0);
+  const start = userIdx.length > turns ? userIdx[userIdx.length - turns] : 0;
+  return digest({ ...facts, turns: visible.slice(start) }, { maxChars });
+}
+var BANNER, jsonBytes;
+var init_transcript = __esm({
+  "src/transcript.ts"() {
     "use strict";
-    init_v22();
-    DOC_NAMES = /* @__PURE__ */ new Set(["spec.md", "testing.md", "skill.md"]);
-    SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".bunshin"]);
-    LIST_TTL_MS = 6e4;
-    rootCache = /* @__PURE__ */ new Map();
-    isDoc = (rel) => {
-      const parts = rel.split("/");
-      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) && fs9.existsSync(path7.join(root, path7.posix.dirname(rel), ".bunshin.json"));
+    init_redact2();
+    init_util();
+    BANNER = "## Recalled lessons (Bunshin)";
+    jsonBytes = (s) => Buffer.byteLength(JSON.stringify(s)) - 2;
   }
 });
 
@@ -5188,8 +5460,14 @@ function applyOverlays(sections, overlays, ctx) {
 }
 function localView(v2, config, cwd, opts = {}) {
   const ctx = contextFor(v2, config);
-  const reader = readerFor(ctx);
   const bundle = v2.readBundle();
+  let source;
+  try {
+    source = opts.source !== void 0 ? opts.source || void 0 : sourceFor(cwd, v2.store.root, ctx);
+  } catch {
+    source = void 0;
+  }
+  const reader = readerFor(ctx, void 0, { ...source ? { source } : {}, ...bundle?.scopes ? { tree: bundle.scopes } : {} });
   const byId = /* @__PURE__ */ new Map();
   for (const s of bundle?.sections ?? []) byId.set(s.id, s);
   let root = cwd;
@@ -5207,7 +5485,7 @@ function localView(v2, config, cwd, opts = {}) {
     }
   }
   applyOverlays(byId, v2.readOverlays(), ctx);
-  return { ctx, reader, layers: layersFor(ctx), bundle, sections: [...byId.values()], byId, root, repo };
+  return { ctx, reader, ...source ? { source } : {}, layers: reader.layers, bundle, sections: [...byId.values()], byId, root, repo };
 }
 var ACTIVE_OVERLAY;
 var init_view = __esm({
@@ -5215,12 +5493,13 @@ var init_view = __esm({
     "use strict";
     init_v22();
     init_repo();
+    init_source();
     ACTIVE_OVERLAY = /* @__PURE__ */ new Set(["proposed", "trial", "submitted", "kept-local", "needs-review"]);
   }
 });
 
 // src/v2/apply.ts
-import fs10 from "node:fs";
+import fs11 from "node:fs";
 function appendedText(op) {
   return op.condition ? `- **${op.condition}:** ${op.text.trim()}` : op.text.trim();
 }
@@ -5275,12 +5554,12 @@ function applyLocally(v2, view, s) {
   if (section.storage.type === "repo") {
     const file = containedPath(view.root, section.storage.path);
     const ours = !view.repo || section.storage.repo === view.repo;
-    if (ours && file && fs10.existsSync(file)) {
-      const before = fs10.readFileSync(file, "utf8");
+    if (ours && file && fs11.existsSync(file)) {
+      const before = fs11.readFileSync(file, "utf8");
       const res2 = applyOpToMarkdown(before, section.storage.anchor, op);
       if (res2.ok) {
         const changed = res2.text !== before;
-        if (changed) fs10.writeFileSync(file, res2.text);
+        if (changed) fs11.writeFileSync(file, res2.text);
         const overlay2 = { ...base, kind: "working-tree", sectionId: section.id, file: section.storage.path, anchor: section.storage.anchor, changed };
         upsertOverlay(v2, overlay2);
         return { applied: true, target: describeTarget(s, view), overlay: overlay2 };
@@ -5301,7 +5580,7 @@ function revertWorkingTree(root, o) {
   if (!file) return { reverted: false, reason: "path outside the repository" };
   let text2;
   try {
-    text2 = fs10.readFileSync(file, "utf8");
+    text2 = fs11.readFileSync(file, "utf8");
   } catch {
     return { reverted: false, reason: "file missing" };
   }
@@ -5321,7 +5600,7 @@ ${appendedText(o.op)}`;
     if (once(text2, o.op.text) >= 0 && !text2.includes(o.op.find)) next = text2.replace(o.op.text, o.op.find);
   }
   if (next === null) return { reverted: false, reason: "file changed since the trial edit" };
-  fs10.writeFileSync(file, next);
+  fs11.writeFileSync(file, next);
   return { reverted: true };
 }
 function revertParam(v2, o) {
@@ -5394,7 +5673,7 @@ var init_apply = __esm({
 });
 
 // src/v2/signals.ts
-import fs11 from "node:fs";
+import fs12 from "node:fs";
 function isCorrection(text2) {
   const t = text2.trim().slice(0, 600);
   return !!t && CORRECTION_RE.test(t);
@@ -5416,7 +5695,7 @@ function scanTranscript(file) {
   if (!file) return empty;
   let raw;
   try {
-    raw = fs11.readFileSync(file, "utf8");
+    raw = fs12.readFileSync(file, "utf8");
   } catch {
     return empty;
   }
@@ -5500,8 +5779,8 @@ var init_signals = __esm({
 });
 
 // src/v2/ui.ts
-import fs12 from "node:fs";
-import path8 from "node:path";
+import fs13 from "node:fs";
+import path9 from "node:path";
 function feedPath(v2, sessionId) {
   return v2.p("ui", `${safe(sessionId)}.json`);
 }
@@ -5517,7 +5796,7 @@ function emptyFeed(v2, sessionId, now) {
 }
 function cliArgv() {
   const entry = process.argv[1];
-  return entry ? [process.execPath, path8.resolve(entry)] : ["bunshin"];
+  return entry ? [process.execPath, path9.resolve(entry)] : ["bunshin"];
 }
 function updateFeed(v2, sessionId, patch, now = (/* @__PURE__ */ new Date()).toISOString()) {
   if (!sessionId || sessionId === "no-session") return null;
@@ -5532,7 +5811,7 @@ function updateFeed(v2, sessionId, patch, now = (/* @__PURE__ */ new Date()).toI
     f.cli = cliArgv();
     f.served = f.served.slice(0, MAX_SERVED);
     f.events = f.events.slice(-MAX_EVENTS);
-    fs12.mkdirSync(path8.dirname(feedPath(v2, sessionId)), { recursive: true });
+    fs13.mkdirSync(path9.dirname(feedPath(v2, sessionId)), { recursive: true });
     writeJsonAtomic(feedPath(v2, sessionId), f);
     return f;
   } catch {
@@ -5633,16 +5912,16 @@ function latestFeed(v2) {
   const dir = v2.p("ui");
   let best = null;
   try {
-    for (const f2 of fs12.readdirSync(dir)) {
+    for (const f2 of fs13.readdirSync(dir)) {
       if (!f2.endsWith(".json") || f2.endsWith(".mod.json")) continue;
-      const m = fs12.statSync(path8.join(dir, f2)).mtimeMs;
+      const m = fs13.statSync(path9.join(dir, f2)).mtimeMs;
       if (!best || m > best.m) best = { f: f2, m };
     }
   } catch {
     return null;
   }
   if (!best) return null;
-  const f = readJson(path8.join(dir, best.f), null);
+  const f = readJson(path9.join(dir, best.f), null);
   return f && f.v === UI_FEED_VERSION ? f : null;
 }
 var UI_FEED_VERSION, MAX_SERVED, MAX_EVENTS, MOD_FRESH_MS, DEFAULT_MODES;
@@ -5658,110 +5937,6 @@ var init_ui = __esm({
   }
 });
 
-// src/v2/source.ts
-var source_exports = {};
-__export(source_exports, {
-  cwdInPool: () => cwdInPool,
-  inPool: () => inPool,
-  listFolders: () => listFolders,
-  projectRootFor: () => projectRootFor,
-  select: () => select,
-  sourceFor: () => sourceFor,
-  storeHome: () => storeHome,
-  topFolder: () => topFolder
-});
-import fs13 from "node:fs";
-import path9 from "node:path";
-import { execFileSync as execFileSync3 } from "node:child_process";
-function storeHome(storeRoot) {
-  return path9.dirname(path9.resolve(storeRoot));
-}
-function topFolder(cwd, storeRoot) {
-  const rel = path9.relative(storeHome(storeRoot), path9.resolve(cwd));
-  if (!rel || rel.startsWith("..") || path9.isAbsolute(rel)) return "";
-  return rel.split(path9.sep)[0] ?? "";
-}
-function inPool(selection, folder) {
-  if (!folder || !selection) return true;
-  if (selection.exclude?.includes(folder)) return false;
-  return selection.only ? selection.only.includes(folder) : true;
-}
-function cwdInPool(config, cwd, storeRoot) {
-  return inPool(config.sources, topFolder(cwd, storeRoot));
-}
-function git2(cwd, args) {
-  try {
-    return execFileSync3("git", ["-C", cwd, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 1500 }).trim() || null;
-  } catch {
-    return null;
-  }
-}
-function sourceFor(cwd, storeRoot, ctx) {
-  if (ctx?.kind === "robot") return sourceId("robot", ctx.id);
-  const home = storeHome(storeRoot);
-  const top = git2(cwd, ["rev-parse", "--show-toplevel"]);
-  if (top) {
-    const remote = git2(top, ["remote", "get-url", "origin"]);
-    const named = remote ? parseRemote(remote) : null;
-    if (named) return sourceId("repo", named);
-    const rel = path9.relative(home, top);
-    return sourceId("folder", rel && !rel.startsWith("..") && !path9.isAbsolute(rel) ? rel.split(path9.sep).join("/") : path9.basename(top));
-  }
-  const folder = topFolder(cwd, storeRoot);
-  return folder ? sourceId("folder", folder) : void 0;
-}
-function projectRootFor(cwd, storeRoot) {
-  const home = storeHome(storeRoot);
-  const top = git2(cwd, ["rev-parse", "--show-toplevel"]);
-  if (top) {
-    const rel = path9.relative(home, top);
-    if (!rel.startsWith("..") && !path9.isAbsolute(rel)) return top;
-  }
-  const folder = topFolder(cwd, storeRoot);
-  return folder ? path9.join(home, folder) : home;
-}
-function listFolders(storeRoot, selection, opts = {}) {
-  const home = storeHome(storeRoot);
-  let names = [];
-  try {
-    names = fs13.readdirSync(home, { withFileTypes: true }).filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => e.name).sort((a, b) => a.localeCompare(b));
-  } catch {
-  }
-  return names.map((folder) => ({
-    folder,
-    included: inPool(selection, folder),
-    ...opts.sources ? { source: sourceFor(path9.join(home, folder), storeRoot) } : {}
-  }));
-}
-function select(current, action, folders) {
-  const uniq = (xs) => [...new Set(xs)].sort((a, b) => a.localeCompare(b));
-  const only = current?.only;
-  const exclude = current?.exclude ?? [];
-  let next;
-  switch (action) {
-    case "all":
-      return void 0;
-    case "only":
-      next = { only: uniq(folders) };
-      break;
-    case "include":
-      next = { ...only ? { only: uniq([...only, ...folders]) } : {}, exclude: exclude.filter((f) => !folders.includes(f)) };
-      break;
-    case "exclude":
-      next = { ...only ? { only: only.filter((f) => !folders.includes(f)) } : {}, exclude: uniq([...exclude, ...folders]) };
-      break;
-  }
-  if (!next.exclude?.length) delete next.exclude;
-  return next.only || next.exclude ? next : void 0;
-}
-var init_source = __esm({
-  "src/v2/source.ts"() {
-    "use strict";
-    init_v22();
-    init_repo();
-  }
-});
-
 // src/v2/sync.ts
 var sync_exports = {};
 __export(sync_exports, {
@@ -5974,7 +6149,8 @@ async function uploadIndex(store, cwd, deadline = Date.now() + 3e4) {
     }
   });
   const commit = repoCommit(root);
-  const res = await v2api(config, "POST", "/sections/index", { repo: index.repo, ...commit ? { commit } : {}, ownerTeam: index.ownerTeam, docs }, { deadline, timeoutMs: 3e4 });
+  const source = sourceFor(root, store.root);
+  const res = await v2api(config, "POST", "/sections/index", { repo: index.repo, ...commit ? { commit } : {}, ...source ? { source } : {}, ownerTeam: index.ownerTeam, docs }, { deadline, timeoutMs: 3e4 });
   return typeof res.indexed === "number" ? res.indexed : docs.length;
 }
 var isLocalId, carriesTrace;
@@ -6113,7 +6289,7 @@ async function runReflectionV2(store, opts) {
   if (!release) return { ...result, skipped: "a reflection of this session is already running" };
   try {
     const session = v2.session(opts.sessionId, opts.cwd ?? process.cwd());
-    const view = localView(v2, config, session.cwd || opts.cwd || process.cwd());
+    const view = localView(v2, config, session.cwd || opts.cwd || process.cwd(), session.source !== void 0 ? { source: session.source } : {});
     const origin = opts.origin ?? (opts.focus !== void 0 ? "learn" : "session-end");
     const episodeId = episodeIdFor(view.ctx.id, opts.sessionId);
     const prior = session.suggestionIds.map((id) => v2.readSuggestion(id)).filter((s) => !!s);
@@ -6130,7 +6306,7 @@ async function runReflectionV2(store, opts) {
     const lessons = [.../* @__PURE__ */ new Set([...prior.map(lessonLine), ...session.serverLessons ?? []])].slice(0, 40);
     const earlier = from > 0 || lessons.length ? { ...from > 0 && facts ? { from: anchorAt(facts, from) } : {}, lessons } : void 0;
     const guidelines = reflectionGuidelines(view.sections, view.reader);
-    const promptBase = { contextKind: view.ctx.kind, layers: view.layers, index, captured, guidelines, ...opts.focus ? { focus: opts.focus } : {}, ...earlier ? { earlier } : {}, ...profile ? { profileId: profile.id } : {} };
+    const promptBase = { contextKind: view.ctx.kind, layers: view.layers, index, captured, guidelines, scopes: scopeChoices(view.bundle?.scopes, view.source), ...opts.focus ? { focus: opts.focus } : {}, ...earlier ? { earlier } : {}, ...profile ? { profileId: profile.id } : {} };
     let raw = null;
     if (harness === "claude-code") {
       const fork = await runClaudeFork(opts.sessionId, buildReflectPrompt(promptBase), { cwd: session.cwd, model: config.model });
@@ -6170,7 +6346,7 @@ async function runReflectionV2(store, opts) {
     result.nothingNew = result.method !== "none" && parsed.length === 0;
     const apply = opts.forceApply || config.reflect.autoApply === "all" || config.reflect.autoApply === "robot" && view.ctx.kind === "robot";
     const createdAt = (/* @__PURE__ */ new Date()).toISOString();
-    const source = session.source !== void 0 ? session.source || void 0 : sourceFor(session.cwd || opts.cwd || process.cwd(), store.root, view.ctx);
+    const source = view.source;
     for (const p of parsed) {
       const s = toSuggestion(p, { id: hexId("g"), orgId: config.orgId, contextId: view.ctx.id, authorUserId: config.userId, origin, createdAt, episodeId });
       if (source) s.source = source;
@@ -6257,7 +6433,6 @@ var init_reflect3 = __esm({
     init_signals();
     init_ui();
     init_view();
-    init_source();
     FORK_TIMEOUT_MS = 12e4;
     FORK_DENIED_TOOLS = "Bash,Edit,Write,MultiEdit,NotebookEdit,WebFetch,WebSearch,Task,Agent,Skill,SlashCommand";
   }
@@ -6677,7 +6852,7 @@ function liveUpdate(v2, ctx, session) {
       return "";
     }
     const config = ctx.store.config();
-    const deployed = deployEnabled(config, localView(v2, config, ctx.cwd).ctx);
+    const deployed = deployEnabled(config, contextFor(v2, config));
     const paths = deployed ? deployPaths(process.env, config.orgId) : null;
     const root = paths ? config.harness === "codex" ? paths.codexSkills : paths.claudeSkills : null;
     const skillPath = (name) => root ? `${root}/${name}/SKILL.md` : null;
@@ -6744,7 +6919,7 @@ async function onPrompt(ctx) {
   };
   if (!prompt.trim()) return withLive({});
   const config = ctx.store.config();
-  const view = localView(v2, config, ctx.cwd);
+  const view = localView(v2, config, ctx.cwd, session.source !== void 0 ? { source: session.source } : {});
   const injected = inContext(session);
   const named = invokedSkill(prompt, view.sections);
   if (named) {
@@ -6832,7 +7007,7 @@ function onPreToolUse(ctx) {
   const raw = toolPaths(ctx.input.tool_input);
   if (!raw.length) return withLive({});
   const config = ctx.store.config();
-  const view = localView(v2, config, ctx.cwd);
+  const view = localView(v2, config, ctx.cwd, session.source !== void 0 ? { source: session.source } : {});
   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 withLive({});
@@ -6957,6 +7132,7 @@ function buildEpisode(store, session, transcriptPath, now = /* @__PURE__ */ new
     ...view.bundle?.release?.version ? { harnessVersion: view.bundle.release.version } : {},
     cliVersion: version(),
     ...source ? { source } : {},
+    ...session.borrowed?.length ? { borrowed: session.borrowed } : {},
     uploaded: false,
     ...previous?.reportedServed ? { reportedServed: previous.reportedServed } : {},
     ...previous?.reportedLoaded ? { reportedLoaded: previous.reportedLoaded } : {},
@@ -7265,6 +7441,7 @@ var init_project_hooks = __esm({
 // src/init.ts
 var init_exports = {};
 __export(init_exports, {
+  BORROW_COMMAND: () => BORROW_COMMAND,
   CODEX_HOOK_EVENTS: () => CODEX_HOOK_EVENTS,
   HOOK_EVENTS: () => HOOK_EVENTS,
   LEARN_COMMAND: () => LEARN_COMMAND,
@@ -7386,18 +7563,18 @@ function mcpLauncher(bin) {
   }
   return { command: process.execPath, args: [script, "mcp"] };
 }
-function installLearnCommand({ file, remove = false }) {
+function installLearnCommand({ file, remove = false, content = LEARN_COMMAND }) {
   try {
     const current = fileExists(file) ? fs21.readFileSync(file, "utf8") : null;
-    const ours = current === null || current === LEARN_COMMAND;
+    const ours = current === null || current === content;
     if (remove) {
       if (current !== null && ours) fs21.unlinkSync(file);
       return { file, installed: 0, changed: current !== null && ours };
     }
-    if (!ours) return { file, installed: 0, changed: false, error: "a different learn.md is already there; left as it is" };
+    if (!ours) return { file, installed: 0, changed: false, error: `a different ${path16.basename(file)} is already there; left as it is` };
     if (current === null) {
       fs21.mkdirSync(path16.dirname(file), { recursive: true });
-      fs21.writeFileSync(file, LEARN_COMMAND);
+      fs21.writeFileSync(file, content);
     }
     return { file, installed: 1, changed: current === null };
   } catch (err) {
@@ -7519,11 +7696,20 @@ function runInit(opts = {}) {
     learnCommand = installLearnCommand({ file: path16.join(user ? path16.join(homeDir(), ".claude") : path16.join(cwd, ".claude"), "commands", "learn.md"), remove: opts.removeHooks });
     if (learnCommand.error) warnings.push(`/learn not installed at ${learnCommand.file}: ${learnCommand.error}`);
   }
+  let borrowCommand;
+  if (opts.removeHooks || !opts.noHooks) {
+    const user = hookScope === "user";
+    const file = config.harness === "claude-code" ? path16.join(user ? path16.join(homeDir(), ".claude") : path16.join(cwd, ".claude"), "commands", "borrow.md") : config.harness === "codex" ? path16.join(process.env.CODEX_HOME ?? path16.join(homeDir(), ".codex"), "prompts", "borrow.md") : config.harness === "pi" ? user ? path16.join(homeDir(), ".pi", "agent", "prompts", "borrow.md") : path16.join(cwd, ".pi", "prompts", "borrow.md") : null;
+    if (file) {
+      borrowCommand = installLearnCommand({ file, remove: opts.removeHooks, content: BORROW_COMMAND });
+      if (borrowCommand.error) warnings.push(`/borrow not installed at ${borrowCommand.file}: ${borrowCommand.error}`);
+    }
+  }
   if (!resolveBackend(config)) {
     warnings.push("No model backend found. Install and sign in to Codex or Claude Code before using automatic learning.");
   }
   store.log("init", { root, scope, role: config.role, orgUnit: config.orgUnit, hooks: hooks?.installed ?? 0 });
-  return { root, config, created: !existed, hooks, ...mcp ? { mcp } : {}, ...learnCommand ? { learnCommand } : {}, warnings };
+  return { root, config, created: !existed, hooks, ...mcp ? { mcp } : {}, ...learnCommand ? { learnCommand } : {}, ...borrowCommand ? { borrowCommand } : {}, warnings };
 }
 function otherHarnessInstructions() {
   return [
@@ -7539,7 +7725,7 @@ function otherHarnessInstructions() {
     "  Claude Code plugin users need no settings.json wiring \u2014 the plugin ships hooks/hooks.json."
   ].join("\n");
 }
-var PRE_TOOL_MATCHER, HOOK_EVENTS, CODEX_HOOK_EVENTS, LEARN_COMMAND;
+var PRE_TOOL_MATCHER, HOOK_EVENTS, CODEX_HOOK_EVENTS, LEARN_COMMAND, BORROW_COMMAND;
 var init_init = __esm({
   "src/init.ts"() {
     "use strict";
@@ -7565,6 +7751,7 @@ var init_init = __esm({
       { event: "SessionEnd", arg: "session-end", timeout: 3 }
     ];
     LEARN_COMMAND = '---\ndescription: Capture what this session learned into the Bunshin library now (applied locally as a trial, submitted for the nightly review)\nargument-hint: "[what to capture, e.g. \\"the ledger must be reconciled before closing\\"]"\nallowed-tools: Bash(bunshin learn:*)\n---\n\nCapture knowledge from this session into Bunshin.\n\nRun exactly this with the Bash tool (it takes up to two minutes; use a timeout of 180000 ms):\n\n```bash\nbunshin learn "$ARGUMENTS"\n```\n\n`bunshin learn` forks this conversation (`claude -p --resume <this session> --fork-session`),\nso the reflection sees everything you saw without re-sending the transcript. It applies what it\nfinds locally as a trial and queues it for the nightly review:\n\n- edits to this repo\'s SPEC.md / TESTING.md / SKILL.md land in the working tree (they show up\n  in `git diff`);\n- knowledge with no repo home becomes a local overlay on the Bunshin library;\n- per-machine values stay private.\n\nRelay its output to the user as it is. Each line reads\n`captured: <summary> \u2192 <section or file#anchor>`. If it prints `nothing new to capture.`, say so\nin one line; that is the normal outcome. If it reports an error, show it and stop; do not retry\nin a loop, and do not edit the library files by hand.\n\nIf the user named nothing specific, run it without arguments. Do not continue with other work in\nthe same reply unless the user asked you to.\n';
+    BORROW_COMMAND = '---\ndescription: Bring in a lesson or skill learned elsewhere in this workspace (another project or group) when you know it will help here\nargument-hint: "[what to look for, e.g. \\"the release checklist from the api repo\\"]"\nallowed-tools: Bash(bunshin recall:*), Bash(bunshin load:*)\n---\n\nThe person wants something learned outside this project\'s scope. Search the whole workspace for it\n(run with the Bash tool):\n\n```bash\nbunshin recall "$ARGUMENTS" --hypothetical "$ARGUMENTS" --across\n```\n\nShow the person the numbered results as printed (each says where it was learned). Load the one\nthey pick, or the one that plainly matches, with `bunshin load <id>`, then use it as prior\nknowledge for the task. Loading it records that it was borrowed into this project: the nightly\ngeneralization reads that as evidence the lesson applies beyond where it was learned.\n\nIf nothing matches, say so in one line and carry on.\n';
   }
 });
 
@@ -7586,19 +7773,19 @@ function mark(v2, sessionId, cwd, field, ids) {
   } catch {
   }
 }
-async function recallPull(store, query, { cwd, sessionId, timeoutMs = 6e3 }) {
+async function recallPull(store, query, { cwd, sessionId, timeoutMs = 6e3, across = false }) {
   const v2 = new V2Store(store);
   const config = store.config();
   const sid = sessionId ?? sessionIdFromEnv(v2);
   const session = sid ? v2.readSession(sid) : null;
   const exclude = session ? [...session.loaded] : [];
   const limit = Math.max(1, Math.min(10, query.limit ?? 5));
-  const view = localView(v2, config, cwd);
-  const local = () => pull(view.sections, view.reader, { ...query, limit }, { exclude });
+  const view = localView(v2, config, cwd, session?.source !== void 0 ? { source: session.source } : {});
+  const local = () => pull(view.sections, view.reader, { ...query, limit }, { exclude, across });
   let out;
   if (canCall(config)) {
     try {
-      const res = await v2api(config, "POST", "/recall/pull", { ...redactDeep(query), limit, exclude }, { timeoutMs });
+      const res = await v2api(config, "POST", "/recall/pull", { ...redactDeep(query), limit, exclude, ...view.source ? { source: view.source } : {}, ...across ? { across: true } : {} }, { timeoutMs });
       const remote = Array.isArray(res.candidates) ? res.candidates : [];
       const extra = local().filter((c) => c.id.startsWith("local:") && !remote.some((r) => r.id === c.id));
       out = { candidates: [...remote, ...extra].slice(0, limit), source: "mothership" };
@@ -7613,7 +7800,8 @@ async function loadSection(store, id, { cwd, sessionId, anchor }) {
   const v2 = new V2Store(store);
   const config = store.config();
   const sid = sessionId ?? sessionIdFromEnv(v2);
-  const view = localView(v2, config, cwd);
+  const session = sid ? v2.readSession(sid) : null;
+  const view = localView(v2, config, cwd, session?.source !== void 0 ? { source: session.source } : {});
   let section = view.byId.get(id);
   let source = "local";
   if (!section && canCall(config)) {
@@ -7626,8 +7814,17 @@ async function loadSection(store, id, { cwd, sessionId, anchor }) {
   }
   if (!section) return null;
   mark(v2, sid, cwd, "loaded", [section.id]);
+  const borrowed = !inBoundary(section, view.reader);
+  if (borrowed && sid) {
+    try {
+      v2.updateSession(sid, cwd, (s) => {
+        s.borrowed = [...(s.borrowed ?? []).filter((b) => b.sectionId !== section.id), { sectionId: section.id, layer: section.layer, at: (/* @__PURE__ */ new Date()).toISOString() }].slice(-50);
+      });
+    } catch {
+    }
+  }
   const part = anchor?.replace(/^[§#]/, "");
-  return { section, text: renderSection(section, void 0, part ? { anchor: part, maxChars: 0 } : { maxChars: Number.POSITIVE_INFINITY }), source };
+  return { section, text: renderSection(section, void 0, part ? { anchor: part, maxChars: 0 } : { maxChars: Number.POSITIVE_INFINITY }), source, ...borrowed ? { borrowed: true } : {} };
 }
 var init_library = __esm({
   "src/v2/library.ts"() {
@@ -7761,18 +7958,19 @@ async function cmdReviewDecide(store, args, out, err) {
 async function cmdRecall(store, args, cwd, out, err) {
   const abstract = args._.slice(1).join(" ").trim() || str3(args.flags.abstract) || "";
   if (!abstract) {
-    err('bunshin recall: usage: bunshin recall "<the task, abstractly>" --hypothetical "<the lesson you would want>" --id a,b [--json]\n');
+    err('bunshin recall: usage: bunshin recall "<the task, abstractly>" --hypothetical "<the lesson you would want>" --id a,b [--across] [--json]\n');
     return 1;
   }
   const limit = Number(str3(args.flags.limit)) || void 0;
-  const res = await recallPull(store, { taskAbstract: abstract, hypotheticalLesson: str3(args.flags.hypothetical) ?? abstract, identifiers: list(args.flags.id ?? args.flags.ids), ...limit ? { limit } : {} }, { cwd, sessionId: str3(args.flags.session) });
+  const across = bool2(args.flags.across);
+  const res = await recallPull(store, { taskAbstract: abstract, hypotheticalLesson: str3(args.flags.hypothetical) ?? abstract, identifiers: list(args.flags.id ?? args.flags.ids), ...limit ? { limit } : {} }, { cwd, sessionId: str3(args.flags.session), across });
   if (bool2(args.flags.json)) {
     out(JSON.stringify(res, null, 2) + "\n");
     return 0;
   }
-  out(renderCandidates(res.candidates) + "\n");
+  out(renderCandidates(res.candidates, new V2Store(store).readBundle()?.scopes) + "\n");
   if (res.candidates.length) out(`
-(${res.source}) Load one with: bunshin load <id>
+(${res.source}) Load one with: bunshin load <id>${across && res.candidates.some((c) => c.outside) ? " (a lesson from outside this project's scope is recorded as borrowed: evidence it applies here too)" : ""}
 `);
   return 0;
 }
@@ -7789,7 +7987,7 @@ async function cmdLoad(store, args, cwd, out, err) {
 `);
     return 1;
   }
-  out(bool2(args.flags.json) ? JSON.stringify({ section: res.section, source: res.source }, null, 2) + "\n" : res.text + "\n");
+  out(bool2(args.flags.json) ? JSON.stringify({ section: res.section, source: res.source, ...res.borrowed ? { borrowed: true } : {} }, null, 2) + "\n" : res.text + "\n");
   return 0;
 }
 async function cmdLearn(store, args, cwd, out, err) {
@@ -7853,7 +8051,7 @@ function cmdSuggest(store, args, cwd, out, err) {
     orgId: config.orgId,
     contextId: view.ctx.id,
     authorUserId: config.userId,
-    target: known ? { sectionId: known } : { layer: "fleet", storage: { type: "harness", path: rel, symbol: symbol ?? "" } },
+    target: known ? { sectionId: known } : { storage: { type: "harness", path: rel, symbol: symbol ?? "" } },
     op: { op: "append", text: rationale },
     rationale,
     evidenceEpisodeIds: sessionId ? [episodeIdFor(view.ctx.id, sessionId)] : [],
@@ -8347,8 +8545,8 @@ async function handleMcp(msg, opts) {
           if (!taskAbstract.trim()) return reply(text("task_abstract is required: describe the task abstractly.", true));
           const identifiers = Array.isArray(args.identifiers) ? args.identifiers.filter((x) => typeof x === "string") : [];
           const limit = typeof args.limit === "number" ? args.limit : void 0;
-          const res = await recallPull(store, { taskAbstract, hypotheticalLesson, identifiers, ...limit ? { limit } : {} }, { cwd });
-          const body = renderCandidates(res.candidates);
+          const res = await recallPull(store, { taskAbstract, hypotheticalLesson, identifiers, ...limit ? { limit } : {} }, { cwd, across: args.across === true });
+          const body = renderCandidates(res.candidates, new V2Store(store).readBundle()?.scopes);
           return reply(text(res.candidates.length ? `${body}
 
 Load the ones that would change what you do with bunshin_load (0-3).` : body));
@@ -8405,6 +8603,7 @@ var init_mcp = __esm({
     init_v22();
     init_source();
     init_store();
+    init_store2();
     init_library();
     DEFAULT_PROTOCOL = "2025-06-18";
     MCP_TOOLS = [
@@ -8418,7 +8617,8 @@ var init_mcp = __esm({
             task_abstract: { type: "string", description: "The task in abstract, structural terms (what kind of problem this is), not a restatement of its topic." },
             hypothetical_lesson: { type: "string", description: "The lesson you would want to find, written as if it existed." },
             identifiers: { type: "array", items: { type: "string" }, description: "Concrete identifiers involved: function names, error codes, file paths, product or system names. May be empty." },
-            limit: { type: "integer", minimum: 1, maximum: 10, description: "Maximum results (default 5)." }
+            limit: { type: "integer", minimum: 1, maximum: 10, description: "Maximum results (default 5)." },
+            across: { type: "boolean", description: "Only when the person asks for something learned elsewhere (another project or group of this workspace): search across the project's boundary. Default false." }
           },
           required: ["task_abstract", "hypothetical_lesson", "identifiers"],
           additionalProperties: false
@@ -9627,7 +9827,7 @@ function effortOf(job) {
   const tokens = Math.round(chars / 4);
   const minutes = Math.max(2, Math.round(2 + tokens / 15e3));
   const proposals = (job.prompt.match(/^### g_\w+/gm) ?? []).length;
-  const what = job.kind === "reflect" ? "read every [USER] message and each failed or denied result first; most sessions teach nothing new, and at most 4 lessons are kept" : job.kind === "merge" ? `${proposals} proposal${proposals === 1 ? "" : "s"} against one document: decide each, edit only what the applied ones need` : `${proposals} proposed new document${proposals === 1 ? "" : "s"}: combine, fold into existing ones, or reject`;
+  const what = job.kind === "reflect" ? "read every [USER] message and each failed or denied result first; most sessions teach nothing new, and at most 4 lessons are kept" : job.kind === "merge" ? `${proposals} proposal${proposals === 1 ? "" : "s"} against one document: decide each, edit only what the applied ones need` : job.kind === "generalize" ? `${(job.prompt.match(/^<document /gm) ?? []).length} documents from sibling scopes: write once at the parent what at least two of them share, and trim it out of them; "nothing_shared" is a normal answer` : `${proposals} proposed new document${proposals === 1 ? "" : "s"}: combine, fold into existing ones, or reject`;
   return `${chars.toLocaleString("en")} chars (~${tokens.toLocaleString("en")} tokens); about ${minutes} min. ${what}.`;
 }
 function jobIndex(text2) {
@@ -10115,7 +10315,7 @@ var init_runner = __esm({
     init_trust();
     init_version();
     DEFAULT_API = "https://api.bunshin.cc";
-    KINDS2 = ["reflect", "merge", "create"];
+    KINDS2 = ["reflect", "merge", "create", "generalize"];
     str5 = (v) => typeof v === "string" && v.trim() ? v.trim() : void 0;
     LAUNCHD_LABEL = "cc.bunshin.runner";
     CRON_MARK = "# bunshin-runner";
@@ -11146,7 +11346,7 @@ import fs32 from "node:fs";
 import path27 from "node:path";
 function parseArgs(argv) {
   const out = { _: [], flags: {} };
-  const valueless = /* @__PURE__ */ new Set(["json", "quiet", "force", "sync", "global", "help", "version", "dry-run", "offline", "apply", "no-hooks", "remove-hooks", "key-stdin", "debug", "verbose", "robot", "fork", "upload", "index", "all", "legacy", "depth", "local", "skip-github", "propose-rewrites", "clear", "watch", "once", "allow-codex-shell", "retrace"]);
+  const valueless = /* @__PURE__ */ new Set(["json", "quiet", "force", "sync", "global", "help", "version", "dry-run", "offline", "apply", "no-hooks", "remove-hooks", "key-stdin", "debug", "verbose", "robot", "fork", "upload", "index", "all", "legacy", "depth", "local", "skip-github", "propose-rewrites", "clear", "watch", "once", "allow-codex-shell", "retrace", "across"]);
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     if (a === "--") {
@@ -11285,6 +11485,8 @@ Key saved privately outside the project.
       if (result.hooks) out(`${result.hooks.installed} ${harness === "pi" ? "extension" : "hooks"} configured in ${result.hooks.file}
 `);
       if (result.learnCommand?.installed) out(`/learn installed in ${result.learnCommand.file}
+`);
+      if (result.borrowCommand?.installed) out(`/borrow installed in ${result.borrowCommand.file} (bring in a lesson learned in another project or group)
 `);
       else if (result.learnCommand?.error) out(`/learn not installed: ${result.learnCommand.error} (${result.learnCommand.file})
 `);
@@ -11860,10 +12062,12 @@ Usage: bunshin <command> [options]
   status [--json]               store, context, library, outbox, hooks and sync health
   sources [all | only <folders\u2026> | include <folders\u2026> | exclude <folders\u2026>] [--json]
                                 which folders under this store's folder take part (learning pool)
-  recall "<task, abstractly>" [--hypothetical "<lesson>"] [--id a,b] [--limit n] [--json]
-                                pull candidates from the library (offline: local view)
+  recall "<task, abstractly>" [--hypothetical "<lesson>"] [--id a,b] [--limit n] [--across] [--json]
+                                pull candidates from this project's scopes (offline: local view);
+                                --across borrows from anywhere in the workspace (/borrow)
   load <id> [--anchor <heading>] [--json]
-                                print one document (or one part of it) and mark it loaded
+                                print one document (or one part of it) and mark it loaded; a
+                                lesson from outside this project's scopes is recorded as borrowed
   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|approve <id>|reject <id> [--note <text>]]
@@ -11883,9 +12087,8 @@ Usage: bunshin <command> [options]
                                 the deployed skills; push proposes local edits / a new skill now
   library version|log|status|pin [--write [file]]|checkout <lib@N> --to <dir> [--git <sha>] [--pin <file>]
                                 library versions (lib@N), history, and exact reproductions
-  library workspace [<dir>|--clear]
-                                deploy skills and instructions into a workspace folder (e.g.
-                                ~/Documents/dev) instead of ~/.claude and ~/.codex; set it before the first sync
+  library workspace             (retired: each workspace keeps its own skills and links them into
+                                the projects its sessions run in; see library status)
   ui [--session <id>] [--json] [--watch]   what Bunshin did this session, as the person sees it
   ui status | install | uninstall           the Claude Code mod (band above the prompt, /bunshin, toasts)
   ui enable|disable --harness <h> [--mode auto|mod|widget|lines|off]   how a harness shows it
@@ -11896,9 +12099,9 @@ Usage: bunshin <command> [options]
   repo import|attach|clone|verify|list|url|login
                                 host a git repository in Bunshin (full history; git push/pull
                                 keep working through git-remote-bunshin). bunshin repo help
-  runner [--once|--watch] [--backend auto|sdk|claude-cli|codex-cli|pi-cli] [--model <m>] [--kinds reflect,merge,create]
+  runner [--once|--watch] [--backend auto|sdk|claude-cli|codex-cli|pi-cli] [--model <m>] [--kinds reflect,merge,create,generalize]
                                 answer the company's queued model work (cloud reflection,
-                                reconciliation) with this machine's model. BUNSHIN_RUNNER_KEY
+                                reconciliation, generalization) with this machine's model. BUNSHIN_RUNNER_KEY
   runner next | submit <job> <file|-> | fail <job> --error <why>
                                 agent mode, for a Claude Code routine or Codex cloud task
   runner install --key <runner key> [--every <minutes>] [--no-run] | uninstall