@bunshin-cc/bunshin 0.6.5 → 0.8.0

package/dist/bin.js

@@ -1074,6 +1074,95 @@ 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 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];
@@ -1091,11 +1180,22 @@ function layersFor(ctx) {
   const dept = department(team);
   return ["org", ...dept ? [`dept:${dept}`] : [], ...team ? [`team:${team}`] : [], `user:${ctx.userId}`];
 }
-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) {
+  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 +1204,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) {
@@ -1134,6 +1235,15 @@ function scopeAffinity(section, reader) {
 }
 function baseAffinity(section, reader) {
   const kind = layerKind(section.layer);
+  if (kind === "group" || kind === "source") {
+    const i = reader.layers.indexOf(section.layer);
+    if (i < 0) 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 (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));
@@ -1159,6 +1269,7 @@ var init_layers = __esm({
     "use strict";
     init_permissions();
     init_text();
+    init_scopes();
     COMPANY_LAYER_ORDER = ["org", "dept", "team", "user"];
     FLEET_LAYER_ORDER = ["fleet", "arm", "mount", "robot"];
   }
@@ -1344,17 +1455,17 @@ var init_document = __esm({
 });
 
 // ../core/src/v2/sections/markdown.ts
-function repoSectionId(repo, path26, anchor = "") {
-  return anchor ? `repo:${repo}/${path26}#${anchor}` : `repo:${repo}/${path26}`;
+function repoSectionId(repo, path28, anchor = "") {
+  return anchor ? `repo:${repo}/${path28}#${anchor}` : `repo:${repo}/${path28}`;
 }
-function docKind(path26) {
-  const base = path26.split("/").pop()?.toLowerCase() ?? "";
+function docKind(path28) {
+  const base = path28.split("/").pop()?.toLowerCase() ?? "";
   if (base === "testing.md") return "verification";
   if (base === "skill.md") return "skill";
   return "spec";
 }
-function defaultPaths(path26) {
-  const dir = path26.split("/").slice(0, -1).join("/");
+function defaultPaths(path28) {
+  const dir = path28.split("/").slice(0, -1).join("/");
   if (!dir || dir.startsWith(".claude/") || dir.startsWith(".codex/")) return [];
   return [`${dir}/**`];
 }
@@ -1499,11 +1610,11 @@ function lintSkills(sections) {
     }
   const state = /* @__PURE__ */ new Map();
   const cycles = /* @__PURE__ */ new Set();
-  const dfs = (n, path26) => {
+  const dfs = (n, path28) => {
     state.set(n, 1);
     for (const d of edges[n] ?? []) {
-      if (state.get(d) === 1) cycles.add([...path26.slice(path26.indexOf(d)), d].join(" -> "));
-      else if (!state.get(d)) dfs(d, [...path26, d]);
+      if (state.get(d) === 1) cycles.add([...path28.slice(path28.indexOf(d)), d].join(" -> "));
+      else if (!state.get(d)) dfs(d, [...path28, d]);
     }
     state.set(n, 2);
   };
@@ -1590,8 +1701,8 @@ function parsePythonSkills(text2) {
   }
   return { skills, constants };
 }
-function harnessSectionId(path26, symbol) {
-  return `harness:${path26}#${symbol}`;
+function harnessSectionId(path28, symbol) {
+  return `harness:${path28}#${symbol}`;
 }
 var DEF_RE;
 var init_python = __esm({
@@ -1717,8 +1828,8 @@ function globToRegExp(glob) {
   globCache.set(glob, out);
   return out;
 }
-function matchesGlob(path26, glob) {
-  const p = path26.replace(/^\.\//, "").replace(/\\/g, "/");
+function matchesGlob(path28, glob) {
+  const p = path28.replace(/^\.\//, "").replace(/\\/g, "/");
   return globToRegExp(glob.replace(/^\.\//, "")).test(p);
 }
 var DEFAULT_EMBEDDERS, globCache;
@@ -1748,8 +1859,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 +1908,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) {
@@ -1809,10 +1921,10 @@ function push(sections, reader, query) {
   for (const s of recallable(sections, reader).filter((x) => reachesReader(x, reader))) {
     const triggers = [...(s.triggers ?? []).filter((t) => t.anchor), { anchor: "", paths: s.paths, entities: s.entities, skills: s.skills }];
     for (const t of triggers) {
-      const path26 = paths.find((p) => t.paths.some((g) => matchesGlob(p, g)));
-      const entity = path26 ? void 0 : t.entities.find((e) => entities.has(e) || text2 && text2.includes(e));
-      const skill = path26 || entity ? void 0 : skills.find((k) => t.skills.includes(k));
-      const trigger = path26 ? `path:${path26}` : entity ? `entity:${entity}` : skill ? `skill:${skill}` : "";
+      const path28 = paths.find((p) => t.paths.some((g) => matchesGlob(p, g)));
+      const entity = path28 ? void 0 : t.entities.find((e) => entities.has(e) || text2 && text2.includes(e));
+      const skill = path28 || entity ? void 0 : skills.find((k) => t.skills.includes(k));
+      const trigger = path28 ? `path:${path28}` : entity ? `entity:${entity}` : skill ? `skill:${skill}` : "";
       if (trigger) {
         hits.set(s.id, { section: s, trigger, anchor: t.anchor });
         break;
@@ -1837,7 +1949,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 +1990,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 +2059,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 +2070,7 @@ var init_engine = __esm({
     "use strict";
     init_text();
     init_layers();
+    init_scopes();
     init_document();
     init_text_index();
     PASSAGE_CHARS = 4e3;
@@ -1968,7 +2082,7 @@ var init_engine = __esm({
 // ../core/src/v2/guidelines.ts
 function reflectionGuidelines(sections, reader, opts = {}) {
   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) => !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 }));
 }
 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, dept: 1, fleet: 1, group: 2, team: 2, arm: 3, mount: 3, source: 3, robot: 4, user: 4 })[layerKind(l)] ?? 5;
   }
 });
 
@@ -2060,17 +2175,6 @@ function identLike(rest) {
     return humps.length > 0 && m[1].length / humps.length >= 3;
   });
 }
-function luhnOk(digits) {
-  let total = 0;
-  let alt = false;
-  for (let i = digits.length - 1; i >= 0; i--) {
-    let d = digits.charCodeAt(i) - 48;
-    if (alt && (d *= 2) > 9) d -= 9;
-    total += d;
-    alt = !alt;
-  }
-  return total % 10 === 0;
-}
 function issuerOk(d) {
   const n = d.length;
   if (d[0] === "4") return n === 13 || n === 16 || n === 19;
@@ -2082,23 +2186,44 @@ function issuerOk(d) {
   if (/^(?:50|5[6-8]|6\d)/.test(d)) return n >= 12 && n <= 19;
   return false;
 }
+function luhnDigits(d, n) {
+  let total = 0;
+  let alt = false;
+  for (let i = n - 1; i >= 0; i--) {
+    let x = d[i];
+    if (alt && (x *= 2) > 9) x -= 9;
+    total += x;
+    alt = !alt;
+  }
+  return total % 10 === 0;
+}
 function cardPrefix(s) {
-  const digits = s.replace(/\D/g, "");
-  if (/^3[1-3]|^2[019]/.test(digits)) return 0;
-  const sep = s.search(/[ -]/);
-  if (sep > 0 && sep !== 4 && !(sep >= 13 && sep <= 19)) return 0;
+  const d = CARD_DIGITS;
   const ends = [];
-  let n = 0;
+  const counts = [];
+  let digits = 0;
+  let sep = -1;
   for (let i = 0, start = 0; i <= s.length; i++) {
-    if (i < s.length && s.charCodeAt(i) >= 48 && s.charCodeAt(i) <= 57) continue;
+    const c = i < s.length ? s.charCodeAt(i) : -1;
+    if (c >= 48 && c <= 57) {
+      if (digits < d.length) d[digits] = c - 48;
+      digits++;
+      continue;
+    }
+    if (sep < 0 && c !== -1) sep = i;
     if (ends.length && i - start < 3) break;
-    n += i - start;
-    ends.push([i, n]);
+    ends.push(i);
+    counts.push(digits);
     start = i + 1;
   }
+  if (d[0] === 3 && d[1] >= 1 && d[1] <= 3 || d[0] === 2 && (d[1] === 0 || d[1] === 1 || d[1] === 9)) return 0;
+  if (sep > 0 && sep !== 4 && !(sep >= 13 && sep <= 19)) return 0;
   for (let k = ends.length - 1; k >= 0; k--) {
-    const [end, count] = ends[k];
-    if (count >= 13 && count <= 19 && luhnOk(digits.slice(0, count)) && issuerOk(digits.slice(0, count))) return end;
+    const count = counts[k];
+    if (count < 13 || count > 19 || !luhnDigits(d, count)) continue;
+    let str8 = "";
+    for (let j = 0; j < count; j++) str8 += String.fromCharCode(48 + d[j]);
+    if (issuerOk(str8)) return ends[k];
   }
   return 0;
 }
@@ -2181,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, 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";
@@ -2257,9 +2382,10 @@ var init_redact = __esm({
     UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     PATH_RE = /^(?:~|\.{1,2})?\/[\w.@%+~/-]*$|^[A-Za-z]:\\/;
     credentialish = (v) => /[\d\W_]/.test(v) || v.length >= 16 && /[a-z]/.test(v) && /[A-Z]/.test(v);
+    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}?`;
@@ -2345,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;
@@ -2385,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;
@@ -2610,7 +2736,7 @@ ${input.digestNote ? `${input.digestNote}
 
 ` : ""}${input.transcriptDigest}
 ` : ""}
-${input.focus ? `## What to capture
+${input.feedback ? feedbackSection(input.feedback) : ""}${input.focus ? `## What to capture
 
 ${input.focus}
 ` : ""}${guidelinesSection(input.guidelines, { forReflection: true })}
@@ -2657,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).
@@ -2690,6 +2824,34 @@ At most ${max} suggestions. Schema:
                   "rationale": string, "urgency": "normal"|"urgent",
                   "signal": "steering"|"environment"|"knowledge"|"capability"|"approach"}]}`;
 }
+function feedbackSection(f) {
+  return `
+## Feedback from the person (human steering)
+
+${f.lesson ? "A person reviewed a lesson reflection took from this session" : "The person who worked in this session read what reflection took from it"} and wrote:
+
+<feedback>
+${f.text.trim()}
+</feedback>
+${f.lesson ? `
+The lesson it is about:
+
+<lesson>
+${f.lesson.trim()}
+</lesson>
+` : ""}
+Treat it as a correction from a person (signal "steering"): the strongest evidence there is. Act on it:
+- If it says the session taught something that was missed, capture that lesson in the right
+  document, written as the guidelines below ask. ${f.transcript ? "Find it in the session below." : "The session's trace is no longer available: work from the feedback itself (the person's own account), the lessons already taken and the documents."}
+- If it corrects a lesson (too specific, wrong, in the wrong place), propose the corrected lesson
+  (op "replace" if it already landed in a document, otherwise a new one) and name the lesson it
+  corrects in the rationale. Lessons listed as already taken may be corrected this way.
+- If it says how lessons should be captured or written in general, propose a rule for the
+  reflection guidelines, merged with the rules already there: never repeat one; refine an existing
+  rule with op "replace" when the feedback sharpens it.
+Answer "nothing_new" only if everything it asks for is already in the library or proposed.
+`;
+}
 function documentsSection(docs) {
   if (!docs?.length) return "";
   const body = docs.map((d) => `### ${d.id}: ${d.title} (${d.why})
@@ -2913,6 +3075,8 @@ var init_reconcile = __esm({
     init_document();
     init_markdown();
     init_text_index();
+    init_scopes();
+    init_sources();
     init_types();
   }
 });
@@ -2954,6 +3118,17 @@ var init_profile = __esm({
   }
 });
 
+// ../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/index.ts
 var init_v2 = __esm({
   "../core/src/v2/index.ts"() {
@@ -2975,6 +3150,9 @@ var init_v2 = __esm({
     init_research();
     init_profile();
     init_guidelines();
+    init_sources();
+    init_scopes();
+    init_generalize();
   }
 });
 
@@ -3073,6 +3251,284 @@ var init_api = __esm({
   }
 });
 
+// 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;
+  }
+}
+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;
+  }
+  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 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 = 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 }) };
+    } catch {
+    }
+  }
+  const index = {
+    repo,
+    ownerTeam,
+    listedAt: fresh ? cached.listedAt : new Date(now).toISOString(),
+    paths,
+    files
+  };
+  if (changed) {
+    try {
+      v2.writeRepoIndex(root, index);
+    } catch {
+    }
+  }
+  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 {
+  }
+  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;
+var init_repo = __esm({
+  "src/v2/repo.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) && fs6.existsSync(path5.join(root, path5.posix.dirname(rel), ".bunshin.json"));
+  }
+});
+
+// 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"() {
@@ -3593,9 +4049,9 @@ var init_src = __esm({
 });
 
 // src/v2/store.ts
-import fs6 from "node:fs";
-import path5 from "node:path";
-import { randomBytes as randomBytes3 } from "node:crypto";
+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")}`;
 }
@@ -3617,7 +4073,7 @@ function normalizeSession(id, raw) {
     hinted: list2(raw.hinted)
   };
 }
-var SAFE_ID, fileSafe, V2Store, addUnique;
+var SAFE_ID, fileSafe, V2Store, rootKey, addUnique;
 var init_store2 = __esm({
   "src/v2/store.ts"() {
     "use strict";
@@ -3628,12 +4084,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() {
@@ -3714,9 +4170,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;
@@ -3744,7 +4200,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();
           }
@@ -3752,11 +4208,12 @@ var init_store2 = __esm({
         return { status: raw.status, source: raw.source || "robot", ...raw.metrics ? { metrics: raw.metrics } : {}, at };
       }
       // ── repo index / sync state ──
-      readRepoIndex() {
-        return readJson(this.p("repo-index.json"), null);
+      /** One index per working tree: a store covering a folder of repositories keeps each one's. */
+      readRepoIndex(root) {
+        return readJson(this.p("repo-index", `${rootKey(root)}.json`), null);
       }
-      writeRepoIndex(index) {
-        writeJsonAtomic(this.p("repo-index.json"), index);
+      writeRepoIndex(root, index) {
+        writeJsonAtomic(this.p("repo-index", `${rootKey(root)}.json`), index);
       }
       readSyncState() {
         return readJson(this.p("sync.json"), {});
@@ -3770,13 +4227,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 {
               }
             };
@@ -3784,8 +4241,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 {
@@ -3799,7 +4256,7 @@ var init_store2 = __esm({
             }
             if (!stale) return null;
             try {
-              fs6.unlinkSync(file);
+              fs8.unlinkSync(file);
             } catch {
             }
           }
@@ -3816,14 +4273,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(path7.resolve(root)).digest("hex").slice(0, 16);
     addUnique = (list2, ...ids) => {
       for (const id of ids) if (id && !list2.includes(id)) list2.push(id);
     };
@@ -3831,63 +4289,49 @@ var init_store2 = __esm({
 });
 
 // src/v2/deploy.ts
-import { createHash as createHash2 } from "node:crypto";
-import fs7 from "node:fs";
+import { execFileSync as execFileSync3 } from "node:child_process";
+import { createHash as createHash3 } from "node:crypto";
+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;
   }
 }
-function deployPaths(env = process.env) {
+function deployPaths(env = process.env, orgId) {
   const home = env.BUNSHIN_DEPLOY_HOME || os2.homedir();
   const ws = deployWorkspace(env);
+  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: path6.join(ws ?? home, ".claude", "skills"),
-    codexSkills: path6.join(ws ?? home, ".codex", "skills"),
-    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: path6.join(home, ".bunshin", "library"),
-    bin: path6.join(home, ".bunshin", "bin"),
-    state: path6.join(home, ".bunshin", "deploy")
+    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: path8.join(home, ".bunshin", "bin"),
+    state
   };
 }
-function setDeployWorkspace(dir, env = process.env) {
-  const home = env.BUNSHIN_DEPLOY_HOME || os2.homedir();
-  const ws = dir ? path6.resolve(dir.replace(/^~(?=$|\/)/, home)) : null;
-  if (ws && !fs7.statSync(ws, { throwIfNoEntry: false })?.isDirectory()) throw new Error(`${ws} is not a folder`);
-  const stateDir = path6.join(home, ".bunshin", "deploy");
-  const deployed = fs7.existsSync(stateDir) && fs7.readdirSync(stateDir).some((f) => {
-    if (f === "settings.json" || !f.endsWith(".json")) return false;
-    try {
-      return Object.keys(JSON.parse(fs7.readFileSync(path6.join(stateDir, f), "utf8")).docs ?? {}).length > 0;
-    } catch {
-      return false;
-    }
-  });
-  if (deployed && ws !== deployWorkspace({ ...env, BUNSHIN_DEPLOY_WORKSPACE: "" })) {
-    throw new Error("The library is already deployed to the current location. Set the workspace before the first sync on this machine.");
-  }
-  fs7.mkdirSync(path6.dirname(settingsFile(home)), { recursive: true });
-  fs7.writeFileSync(settingsFile(home), JSON.stringify(ws ? { workspace: ws } : {}, null, 2) + "\n");
-  return ws;
-}
 function statePath(p, orgId) {
-  return path6.join(p.state, `${orgId.replace(/[^A-Za-z0-9._-]/g, "_") || "org"}.json`);
+  return path8.join(p.state, `${orgKey(orgId)}.json`);
 }
 function readState(p, orgId) {
   const s = readJson(statePath(p, orgId), null);
-  return { orgId, since: s?.since ?? (/* @__PURE__ */ new Date()).toISOString(), docs: s?.docs ?? {}, created: s?.created ?? {}, links: s?.links ?? [], ...s?.libraryVersion ? { libraryVersion: s.libraryVersion } : {} };
+  return { orgId, since: s?.since ?? (/* @__PURE__ */ new Date()).toISOString(), docs: s?.docs ?? {}, created: s?.created ?? {}, links: s?.links ?? [], ...s?.linked?.length ? { linked: s.linked } : {}, ...s?.libraryVersion ? { libraryVersion: s.libraryVersion } : {} };
 }
 function readText(file) {
   try {
-    return fs7.readFileSync(file, "utf8");
+    return fs9.readFileSync(file, "utf8");
   } catch {
     return null;
   }
@@ -3895,13 +4339,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 {
   }
 }
@@ -3909,33 +4353,33 @@ 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 planDeploy(bundle, p, harnesses) {
   const active = bundle.sections.filter((s) => s.status === "active" || s.status === "stale");
@@ -4042,7 +4486,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) {
@@ -4063,7 +4507,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");
 }
@@ -4112,7 +4556,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 });
@@ -4151,18 +4595,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;
@@ -4171,8 +4615,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;
@@ -4205,7 +4649,7 @@ function captureInto(v2, config, ctx, state, p, harnesses, now, incoming, captur
   return captured.map((s) => ({ suggestionId: s.id, op: s.op.op, ...s.target.sectionId ? { sectionId: s.target.sectionId } : {}, name: s.summary ?? s.op.op }));
 }
 function captureEdits(v2, config, ctx, opts = {}) {
-  const p = opts.paths ?? deployPaths();
+  const p = opts.paths ?? deployPaths(process.env, config.orgId);
   const harnesses = new Set(opts.harnesses ?? config.deploy?.harnesses ?? ["claude-code", "codex"]);
   const release = lockDeploy(p);
   if (!release) return [];
@@ -4220,14 +4664,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) {
@@ -4245,11 +4689,14 @@ function lockDeploy(p) {
   }
   return null;
 }
+function linkHarnesses(config) {
+  return [.../* @__PURE__ */ new Set([config.harness, ...config.deploy?.harnesses ?? []])].filter((h) => h === "claude-code" || h === "codex");
+}
 function deployEnabled(config, ctx) {
   return ctx.kind === "person" && config.deploy?.enabled !== false;
 }
 function deployLibrary(v2, config, ctx, bundle, opts = {}) {
-  const p = opts.paths ?? deployPaths();
+  const p = opts.paths ?? deployPaths(process.env, config.orgId);
   const harnesses = new Set(opts.harnesses ?? config.deploy?.harnesses ?? ["claude-code", "codex"]);
   const now = opts.now ?? (/* @__PURE__ */ new Date()).toISOString();
   const release = lockDeploy(p);
@@ -4266,6 +4713,7 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
   const plan = planDeploy(bundle, p, harnesses);
   report.warnings.push(...plan.warnings);
   const owned = (abs) => [p.claudeSkills, p.codexSkills, p.library].some((r) => insideRoot(r, abs));
+  const removable = (abs) => owned(abs) || (p.legacy ?? []).some((r) => insideRoot(r, abs));
   if (opts.capture !== false) report.captured = captureInto(v2, config, ctx, state, p, harnesses, now, plan.skills.map((x) => x.skill.name), opts.captureNewSkills);
   const decided = new Map(bundle.decisions.map((d) => [d.suggestionId, d.decision.status]));
   const localStatus = (id) => decided.get(id) ?? v2.readSuggestion(id)?.status;
@@ -4290,7 +4738,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`);
@@ -4302,7 +4750,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;
@@ -4311,10 +4759,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;
@@ -4323,18 +4771,23 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
       prevByAbs.delete(`${t.abs}#${t.role}`);
     }
     for (const old of prevByAbs.values()) {
-      if (old.role === "block" || d.contents.has(old.abs) || !owned(old.abs)) continue;
+      if (old.role === "block" || d.contents.has(old.abs) || !removable(old.abs)) continue;
       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(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++;
@@ -4350,7 +4803,7 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
       continue;
     }
     for (const t of doc.targets) {
-      if (t.role === "block" || !owned(t.abs)) continue;
+      if (t.role === "block" || !removable(t.abs)) continue;
       const cur = readText(t.abs);
       if (cur !== null && sha(cur) === t.sha) {
         removeFile(t.abs);
@@ -4358,13 +4811,13 @@ function deployLocked(v2, config, ctx, bundle, opts, p, harnesses, now) {
       }
     }
     for (const dir of doc.dirs ?? []) {
-      if (!owned(dir)) continue;
-      removeFile(path6.join(dir, MANIFEST));
-      pruneDirs(dir, path6.dirname(dir));
-      if (fs7.existsSync(dir)) {
+      if (!removable(dir)) continue;
+      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));
       }
     }
   }
@@ -4380,17 +4833,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 {
         }
       }
@@ -4401,15 +4854,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);
+        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 {
         }
       }
@@ -4418,32 +4875,53 @@ 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 {
     }
   }
-  const saved = { ...state, docs: next, links: [...links], ...bundle.libraryVersion ? { libraryVersion: bundle.libraryVersion } : {} };
+  let linked = state.linked ?? [];
+  if (p.legacy) {
+    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);
+    }
+  }
+  const saved = { ...state, docs: next, links: [...links], ...linked.length ? { linked } : {}, ...bundle.libraryVersion ? { libraryVersion: bundle.libraryVersion } : {} };
+  if (!linked.length) delete saved.linked;
   writeJsonAtomic(statePath(p, config.orgId), saved);
   report.libraryVersion = bundle.libraryVersion;
   return report;
 }
-function deployedState(config, paths = deployPaths()) {
+function deployedState(config, paths = deployPaths(process.env, config.orgId)) {
   const s = readState(paths, config.orgId);
-  return { ...s.libraryVersion ? { libraryVersion: s.libraryVersion } : {}, docs: Object.values(s.docs) };
+  return { ...s.libraryVersion ? { libraryVersion: s.libraryVersion } : {}, linked: s.linked ?? [], docs: Object.values(s.docs) };
 }
 function materialize(sections, dir) {
   let files = 0;
   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;
@@ -4453,22 +4931,106 @@ function materialize(sections, dir) {
   }
   return { files };
 }
-var settingsFile, sha, BLOCK_BEGIN, BLOCK_END, MANIFEST, MAX_FILE, isExecutable, safeJoin, SAFE_NAME, neutralizeMarkers, LAYER_RANK, docMarker, BORN_SLACK_MS;
+function linkSkills(p, root, harnesses, names) {
+  const out = { linked: 0, removed: 0, kept: false, warnings: [] };
+  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 = 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 = fs9.readdirSync(dir, { withFileTypes: true });
+    } catch {
+    }
+    for (const e of entries) {
+      if (!e.isSymbolicLink()) continue;
+      const link = path8.join(dir, e.name);
+      let target = "";
+      try {
+        target = path8.resolve(dir, fs9.readlinkSync(link));
+      } catch {
+        continue;
+      }
+      if (!managed(target)) continue;
+      if (want.has(e.name) && target === path8.join(canonical, e.name)) {
+        want.delete(e.name);
+        excluded.push(path8.join(spec.rel, e.name));
+        continue;
+      }
+      removeFile(link);
+      out.removed++;
+    }
+    for (const name of want) {
+      const link = path8.join(dir, name);
+      try {
+        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);
+        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)}`);
+      }
+    }
+    pruneDirs(dir, abs);
+  }
+  out.kept = excluded.length > 0;
+  gitExclude(abs, excluded);
+  return out;
+}
+function gitExclude(root, rels) {
+  if (!fs9.existsSync(path8.join(root, ".git"))) return;
+  let file;
+  try {
+    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;
+  }
+  const cur = readText(file) ?? "";
+  const start = cur.indexOf(EXCLUDE_BEGIN);
+  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(path8.sep).join("/")}`).join("\n")}
+${EXCLUDE_END}
+` : "";
+  const next = block2 ? `${rest}${rest && !rest.endsWith("\n") ? "\n" : ""}${block2}` : rest;
+  if (next === cur) return;
+  try {
+    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 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");
-    sha = (text2) => createHash2("sha256").update(text2).digest("hex");
+    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 -->";
     BLOCK_END = "<!-- bunshin:end -->";
     MANIFEST = ".bunshin.json";
     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;
       }
@@ -4476,9 +5038,15 @@ 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 };
+    LAYER_RANK = { org: 0, dept: 1, group: 2, team: 2, source: 3, 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: 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";
   }
 });
 
@@ -4587,11 +5155,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 };
   }
@@ -4729,245 +5297,81 @@ function summarizeInput(input) {
 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 } 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;
-  }
-}
-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();
-  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(index);
-    } catch {
-    }
-  }
-  return { root, index, sections: Object.values(files).flatMap((f) => f.sections) };
+  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 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 {
+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)}`);
   }
-  try {
-    real = fs9.realpathSync(abs);
-  } catch {
-    try {
-      real = path7.join(fs9.realpathSync(path7.dirname(abs)), path7.basename(abs));
-    } catch {
+  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;
     }
-  }
-  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("/");
-  }
-  return null;
+    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;
 }
-var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc, deployedSkill;
-var init_repo = __esm({
-  "src/v2/repo.ts"() {
+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;
   }
 });
 
@@ -5036,8 +5440,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;
@@ -5055,7 +5465,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({
@@ -5063,12 +5473,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();
 }
@@ -5123,12 +5534,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 };
@@ -5149,7 +5560,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" };
   }
@@ -5169,7 +5580,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) {
@@ -5242,7 +5653,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);
@@ -5264,7 +5675,7 @@ function scanTranscript(file) {
   if (!file) return empty;
   let raw;
   try {
-    raw = fs11.readFileSync(file, "utf8");
+    raw = fs12.readFileSync(file, "utf8");
   } catch {
     return empty;
   }
@@ -5348,8 +5759,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`);
 }
@@ -5365,7 +5776,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;
@@ -5380,7 +5791,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 {
@@ -5481,16 +5892,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;
@@ -5515,8 +5926,8 @@ __export(sync_exports, {
   syncV2: () => syncV2,
   uploadIndex: () => uploadIndex
 });
-import fs13 from "node:fs";
-import path9 from "node:path";
+import fs14 from "node:fs";
+import path10 from "node:path";
 function episodePayload(e) {
   const { orgId: _o, uploaded: _u, servedReported: _s, reportedServed: _rs, reportedLoaded: _rl, transcriptPath: _tp, ...rest } = e;
   void _o, _u, _s, _rs, _rl, _tp;
@@ -5550,7 +5961,7 @@ function markForRetrace(v2, { days = 30, now = Date.now() } = {}) {
     if (e.upload === "header-only" || e.cliVersion || !e.transcript) continue;
     if (now - Date.parse(e.endedAt || e.startedAt) > days * 864e5) continue;
     const file = e.transcriptPath ?? v2.readSession(e.sessionId)?.transcriptPath;
-    if (!file || !fs13.existsSync(file)) {
+    if (!file || !fs14.existsSync(file)) {
       missing++;
       continue;
     }
@@ -5565,7 +5976,7 @@ function markForRetrace(v2, { days = 30, now = Date.now() } = {}) {
 async function syncV2(store, opts = {}) {
   const v2 = new V2Store(store);
   const config = store.config();
-  const cwd = opts.cwd ?? path9.dirname(store.root);
+  const cwd = opts.cwd ?? path10.dirname(store.root);
   const report = { offline: !canCall(config), uploadedEpisodes: 0, deferredTraces: 0, uploadedSuggestions: 0, trialUpdates: 0, bundle: v2.readBundle() ? "cached" : "none", settled: [], errors: [] };
   const deadline = Date.now() + (opts.budgetMs ?? 24e4);
   if (report.offline) {
@@ -5681,7 +6092,8 @@ async function syncV2(store, opts = {}) {
     const bundle = v2.readBundle();
     if (bundle) {
       try {
-        report.deploy = deployLibrary(v2, config, ctx, bundle, { capture: false });
+        const linkRoot = cwd && cwdInPool(config, cwd, store.root) ? projectRootFor(cwd, store.root) : void 0;
+        report.deploy = deployLibrary(v2, config, ctx, bundle, { capture: false, ...linkRoot ? { linkRoot } : {}, linkHarnesses: linkHarnesses(config) });
       } catch (err) {
         report.errors.push(`deploy: ${err instanceof Error ? err.message : String(err)}`);
       }
@@ -5711,7 +6123,7 @@ async function uploadIndex(store, cwd, deadline = Date.now() + 3e4) {
   const { root, index } = indexWorkingTree(v2, config, cwd, { force: true });
   const docs = (index.paths ?? Object.keys(index.files)).flatMap((rel) => {
     try {
-      return [{ path: rel, text: fs13.readFileSync(path9.join(root, rel), "utf8") }];
+      return [{ path: rel, text: fs14.readFileSync(path10.join(root, rel), "utf8") }];
     } catch {
       return [];
     }
@@ -5729,6 +6141,7 @@ var init_sync = __esm({
     init_api();
     init_apply();
     init_deploy();
+    init_source();
     init_repo();
     init_store2();
     init_view();
@@ -5739,10 +6152,10 @@ var init_sync = __esm({
 
 // src/v2/reflect.ts
 import { spawn as spawn3 } from "node:child_process";
-import { createHash as createHash3 } from "node:crypto";
-import fs14 from "node:fs";
+import { createHash as createHash4 } from "node:crypto";
+import fs15 from "node:fs";
 function episodeIdFor(contextId, sessionId) {
-  return `e_${createHash3("sha256").update(`${contextId}
+  return `e_${createHash4("sha256").update(`${contextId}
 ${sessionId}`).digest("hex").slice(0, 16)}`;
 }
 function runClaudeFork(sessionId, prompt, { cwd, model, timeoutMs = FORK_TIMEOUT_MS } = {}) {
@@ -5775,7 +6188,7 @@ function runClaudeFork(sessionId, prompt, { cwd, model, timeoutMs = FORK_TIMEOUT
     };
     let child;
     try {
-      child = spawn3(bin, args, { cwd: cwd && fs14.existsSync(cwd) ? cwd : void 0, env: modelEnv("claude-cli"), stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn3(bin, args, { cwd: cwd && fs15.existsSync(cwd) ? cwd : void 0, env: modelEnv("claude-cli"), stdio: ["ignore", "pipe", "pipe"] });
     } catch (e) {
       resolve({ ok: false, error: e instanceof Error ? e.message : String(e) });
       return;
@@ -5820,7 +6233,7 @@ function reflectionIndex(view, ids, task, focus, humanTurns = []) {
   return [...chosen.values()].slice(0, 30).map(({ id, kind, layer, title, when, outline }) => ({ id, kind, layer, title, when, ...outline?.length ? { outline } : {} }));
 }
 function humanTurnsOf(transcriptPath) {
-  if (!transcriptPath || !fs14.existsSync(transcriptPath)) return [];
+  if (!transcriptPath || !fs15.existsSync(transcriptPath)) return [];
   try {
     return parseTranscript(transcriptPath).turns.filter((t) => t.role === "user" && t.text.trim()).map((t) => t.text.slice(0, 1e3));
   } catch {
@@ -5828,7 +6241,7 @@ function humanTurnsOf(transcriptPath) {
   }
 }
 function readFacts(transcriptPath) {
-  if (!transcriptPath || !fs14.existsSync(transcriptPath)) return null;
+  if (!transcriptPath || !fs15.existsSync(transcriptPath)) return null;
   try {
     return parseTranscript(transcriptPath);
   } catch {
@@ -5855,7 +6268,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);
@@ -5872,7 +6285,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 });
@@ -5891,7 +6304,7 @@ async function runReflectionV2(store, opts) {
         result.method = "fork";
       } else result.error = fork.error;
     }
-    if (result.method === "none" && session.transcriptPath && fs14.existsSync(session.transcriptPath)) {
+    if (result.method === "none" && session.transcriptPath && fs15.existsSync(session.transcriptPath)) {
       const transcriptDigest = digest(facts ?? parseTranscript(session.transcriptPath), { from, maxChars: 4e4 });
       const res = await askJson(config, {
         system: "You are Bunshin's reflection pass. Follow the instructions in the user message and reply with one JSON object only.",
@@ -5912,8 +6325,10 @@ 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 = 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;
       s.summary = summarize(s.op);
       if (apply) {
         const outcome = applyLocally(v2, view, s);
@@ -6014,51 +6429,51 @@ __export(uicmd_exports, {
   modSource: () => modSource
 });
 import { spawnSync } from "node:child_process";
-import fs15 from "node:fs";
+import fs16 from "node:fs";
 import os3 from "node:os";
-import path10 from "node:path";
+import path11 from "node:path";
 import { fileURLToPath } from "node:url";
 function modHome(home = process.env.BUNSHIN_DEPLOY_HOME || os3.homedir()) {
-  return path10.join(home, ".bunshin", "claude-code-ui");
+  return path11.join(home, ".bunshin", "claude-code-ui");
 }
 function modSource() {
-  const here = path10.dirname(fileURLToPath(import.meta.url));
-  for (const dir of [path10.join(here, "claude-code-ui"), path10.join(here, "..", "claude-code-ui"), path10.resolve(here, "../../../../adapters/claude-code-ui")]) {
-    if (fs15.existsSync(path10.join(dir, ".claude-plugin", "plugin.json"))) return dir;
+  const here = path11.dirname(fileURLToPath(import.meta.url));
+  for (const dir of [path11.join(here, "claude-code-ui"), path11.join(here, "..", "claude-code-ui"), path11.resolve(here, "../../../../adapters/claude-code-ui")]) {
+    if (fs16.existsSync(path11.join(dir, ".claude-plugin", "plugin.json"))) return dir;
   }
   return null;
 }
 function installedModVersion(home) {
   try {
-    return JSON.parse(fs15.readFileSync(path10.join(modHome(home), MOD_PLUGIN, ".claude-plugin", "plugin.json"), "utf8")).version ?? null;
+    return JSON.parse(fs16.readFileSync(path11.join(modHome(home), MOD_PLUGIN, ".claude-plugin", "plugin.json"), "utf8")).version ?? null;
   } catch {
     return null;
   }
 }
 function copyDir(from, to) {
-  fs15.mkdirSync(to, { recursive: true });
-  for (const e of fs15.readdirSync(from, { withFileTypes: true })) {
+  fs16.mkdirSync(to, { recursive: true });
+  for (const e of fs16.readdirSync(from, { withFileTypes: true })) {
     if (e.name === "types" && from.endsWith(".claude-plugin")) continue;
     if (e.name === "node_modules") continue;
-    const a = path10.join(from, e.name);
-    const b = path10.join(to, e.name);
+    const a = path11.join(from, e.name);
+    const b = path11.join(to, e.name);
     if (e.isDirectory()) copyDir(a, b);
-    else fs15.copyFileSync(a, b);
+    else fs16.copyFileSync(a, b);
   }
 }
 function installMod(version2, opts = {}) {
   const src = modSource();
   if (!src) throw new Error("the bunshin-ui mod is not in this build of the CLI");
   const home = modHome(opts.home);
-  const dir = path10.join(home, MOD_PLUGIN);
-  fs15.rmSync(dir, { recursive: true, force: true });
+  const dir = path11.join(home, MOD_PLUGIN);
+  fs16.rmSync(dir, { recursive: true, force: true });
   copyDir(src, dir);
-  const manifest = path10.join(dir, ".claude-plugin", "plugin.json");
-  const m = JSON.parse(fs15.readFileSync(manifest, "utf8"));
-  fs15.writeFileSync(manifest, JSON.stringify({ ...m, version: version2 }, null, 2) + "\n");
-  fs15.mkdirSync(path10.join(home, ".claude-plugin"), { recursive: true });
-  fs15.writeFileSync(
-    path10.join(home, ".claude-plugin", "marketplace.json"),
+  const manifest = path11.join(dir, ".claude-plugin", "plugin.json");
+  const m = JSON.parse(fs16.readFileSync(manifest, "utf8"));
+  fs16.writeFileSync(manifest, JSON.stringify({ ...m, version: version2 }, null, 2) + "\n");
+  fs16.mkdirSync(path11.join(home, ".claude-plugin"), { recursive: true });
+  fs16.writeFileSync(
+    path11.join(home, ".claude-plugin", "marketplace.json"),
     JSON.stringify({ name: MOD_MARKETPLACE, owner: { name: "Bunshin" }, plugins: [{ name: MOD_PLUGIN, source: `./${MOD_PLUGIN}`, description: m.description }] }, null, 2) + "\n"
   );
   const run2 = opts.run ?? spawnSync;
@@ -6093,7 +6508,7 @@ async function cmdUi(store, args, out, err, version2) {
 `);
       for (const s of res.steps) out(`  ${s.ok ? "\u2713" : "\xB7"} ${s.command}${s.ok ? "" : `: ${s.output.split("\n")[0] ?? ""}`}
 `);
-      out(installed ? "The mod loads in new Claude Code sessions (and after /reload-plugins): a Bunshin band above the prompt, /bunshin, toasts.\nUntil it runs, Bunshin prints one short line per event instead.\n" : "Could not install with `claude plugin`; install it yourself:\n  claude plugin marketplace add " + path10.dirname(res.dir) + "\n  claude plugin install bunshin-ui@bunshin-local --scope user\n");
+      out(installed ? "The mod loads in new Claude Code sessions (and after /reload-plugins): a Bunshin band above the prompt, /bunshin, toasts.\nUntil it runs, Bunshin prints one short line per event instead.\n" : "Could not install with `claude plugin`; install it yourself:\n  claude plugin marketplace add " + path11.dirname(res.dir) + "\n  claude plugin install bunshin-ui@bunshin-local --scope user\n");
     }
     return installed || !failed.length ? 0 : 1;
   }
@@ -6174,19 +6589,19 @@ __export(update_exports, {
   updateCheckDue: () => updateCheckDue,
   updateNotice: () => updateNotice
 });
-import fs16 from "node:fs";
-import path11 from "node:path";
+import fs17 from "node:fs";
+import path12 from "node:path";
 function readState2() {
   try {
-    return JSON.parse(fs16.readFileSync(stateFile(), "utf8"));
+    return JSON.parse(fs17.readFileSync(stateFile(), "utf8"));
   } catch {
     return {};
   }
 }
 function writeState(s) {
   try {
-    fs16.mkdirSync(path11.dirname(stateFile()), { recursive: true });
-    fs16.writeFileSync(stateFile(), JSON.stringify(s, null, 2) + "\n");
+    fs17.mkdirSync(path12.dirname(stateFile()), { recursive: true });
+    fs17.writeFileSync(stateFile(), JSON.stringify(s, null, 2) + "\n");
   } catch {
   }
 }
@@ -6236,14 +6651,14 @@ var init_update = __esm({
     PKG = "@bunshin-cc/bunshin";
     LATEST_URL = `https://registry.npmjs.org/${PKG.replace("/", "%2f")}/latest`;
     DAY = 864e5;
-    stateFile = () => path11.join(homeDir(), ".bunshin", "update.json");
+    stateFile = () => path12.join(homeDir(), ".bunshin", "update.json");
     disabled = () => process.env.BUNSHIN_NO_UPDATE_CHECK === "1" || process.env.BUNSHIN_NO_UPDATE_CHECK === "true";
   }
 });
 
 // src/v2/hooks.ts
-import fs17 from "node:fs";
-import path12 from "node:path";
+import fs18 from "node:fs";
+import path13 from "node:path";
 function inContext(s) {
   return s.inContext ?? [...s.loaded, ...s.pushed];
 }
@@ -6258,6 +6673,12 @@ function touch(v2, ctx, patch = () => {
   const s = v2.updateSession(id, ctx.cwd, (s2) => {
     s2.cwd = ctx.cwd || s2.cwd;
     s2.harness = ctx.store.config().harness;
+    if (s2.source === void 0) {
+      try {
+        s2.source = sourceFor(s2.cwd, ctx.store.root, contextFor(v2, ctx.store.config())) ?? "";
+      } catch {
+      }
+    }
     if (ctx.input.transcript_path) s2.transcriptPath = ctx.input.transcript_path;
     patch(s2);
   });
@@ -6304,10 +6725,10 @@ async function keepModCurrent(ctx, config) {
     const { version: version2 } = await Promise.resolve().then(() => (init_cli(), cli_exports));
     const current = version2();
     if (!modSource2() || installedModVersion2() === current) return;
-    const marker = path12.join(modHome2(), `.attempted-${current}`);
-    if (fs17.existsSync(marker)) return;
-    fs17.mkdirSync(modHome2(), { recursive: true });
-    fs17.writeFileSync(marker, (/* @__PURE__ */ new Date()).toISOString());
+    const marker = path13.join(modHome2(), `.attempted-${current}`);
+    if (fs18.existsSync(marker)) return;
+    fs18.mkdirSync(modHome2(), { recursive: true });
+    fs18.writeFileSync(marker, (/* @__PURE__ */ new Date()).toISOString());
     ctx.detach(["--root", ctx.store.root, "ui", "install", "--quiet"], { cwd: ctx.cwd });
   } catch {
   }
@@ -6410,8 +6831,8 @@ function liveUpdate(v2, ctx, session) {
       return "";
     }
     const config = ctx.store.config();
-    const deployed = deployEnabled(config, localView(v2, config, ctx.cwd).ctx);
-    const paths = deployed ? deployPaths() : null;
+    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;
     const { text: text2, next } = changesSince(session.live, bundle, skillPath);
@@ -6436,13 +6857,13 @@ function skillHint(sec, others) {
   const also = others.length ? ` Also possibly relevant: ${others.map((t) => `"${t}"`).join(", ")}.` : "";
   return `Bunshin: the \`${sec.skill.name}\` skill may apply: ${sec.skill.description.replace(/\s+/g, " ").trim()} If it does, invoke it (Skill tool, or \`/${sec.skill.name}\`) before doing this by hand.${also}`;
 }
-async function remoteAuto(ctx, prompt, exclude) {
+async function remoteAuto(ctx, prompt, exclude, source) {
   const config = ctx.store.config();
   if (!canCall(config) || !config.recall.useMothership) return null;
   const budget = Math.min(2500, ctx.deadline - Date.now() - 600);
   if (budget < 300) return null;
   try {
-    const res = await v2api(config, "POST", "/recall/auto", { prompt: redact2(prompt).slice(0, 8e3), exclude }, { timeoutMs: budget });
+    const res = await v2api(config, "POST", "/recall/auto", { prompt: redact2(prompt).slice(0, 8e3), exclude, ...source ? { source } : {} }, { timeoutMs: budget });
     return res.available ? res : null;
   } catch {
     return null;
@@ -6477,7 +6898,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) {
@@ -6497,7 +6918,7 @@ async function onPrompt(ctx) {
     return withLive(deployed || !fresh2 ? {} : additional("UserPromptSubmit", renderSection(named, why, { deployed: false })));
   }
   const res = auto(view.sections, view.reader, prompt, { exclude: injected });
-  const remote = await remoteAuto(ctx, prompt, injected);
+  const remote = await remoteAuto(ctx, prompt, injected, session.source);
   if (remote) {
     const local = (id) => view.sections.find((s) => s.id === id);
     if (remote.section) {
@@ -6565,7 +6986,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({});
@@ -6649,6 +7070,7 @@ function buildEpisode(store, session, transcriptPath, now = /* @__PURE__ */ new
   const v2 = new V2Store(store);
   const config = store.config();
   const view = localView(v2, config, session.cwd, { index: false });
+  const source = sessionSource(store, session, view.ctx);
   const scan = opts.scan ?? scanTranscript(transcriptPath ?? session.transcriptPath);
   const outcome = v2.readOutcome(session.sessionId);
   const turns = scan.facts.turns.length;
@@ -6688,6 +7110,8 @@ function buildEpisode(store, session, transcriptPath, now = /* @__PURE__ */ new
     ...outcome ? { outcome } : {},
     ...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 } : {},
@@ -6695,6 +7119,14 @@ function buildEpisode(store, session, transcriptPath, now = /* @__PURE__ */ new
   };
   return { episode, gate, scan };
 }
+function sessionSource(store, session, ctx) {
+  if (session.source !== void 0) return session.source || void 0;
+  try {
+    return sourceFor(session.cwd, store.root, ctx);
+  } catch {
+    return void 0;
+  }
+}
 function checkpointDue(session, scan, now) {
   const since = Date.parse(session.checkpointAt ?? session.startedAt);
   if (!Number.isFinite(since) || now.getTime() - since < CHECKPOINT_MS) return false;
@@ -6809,6 +7241,7 @@ var init_hooks = __esm({
     init_signals();
     init_store2();
     init_ui();
+    init_source();
     init_view();
     NUDGE_TEXT = "This looks worth capturing. Consider /learn.";
     NUDGE_INTERVAL_MS = 60 * 6e4;
@@ -6823,6 +7256,8 @@ var init_hooks = __esm({
 });
 
 // src/hooks.ts
+import fs19 from "node:fs";
+import path14 from "node:path";
 function normalizeEvent(raw) {
   return EVENT_NAMES[String(raw ?? "").trim().toLowerCase().replace(/_/g, "-")] ?? null;
 }
@@ -6866,6 +7301,8 @@ async function handleHook(rawEvent, input, opts = {}) {
   const store = opts.store !== void 0 ? opts.store : Store.discover(cwd);
   if (!store) return {};
   const config = store.config();
+  if (!cwdInPool(config, cwd, store.root)) return {};
+  if (deferToProject(cwd)) return {};
   const budgetMs = Math.min(opts.budgetMs ?? config.recall.hookBudgetMs ?? HARD_BUDGET_MS, HARD_BUDGET_MS);
   const deadline = Date.now() + budgetMs;
   try {
@@ -6886,6 +7323,24 @@ async function handleHook(rawEvent, input, opts = {}) {
     return {};
   }
 }
+function deferToProject(cwd, env = process.env) {
+  if (env.BUNSHIN_HOOK_SCOPE !== "user") return false;
+  let dir = path14.resolve(cwd);
+  for (let i = 0; i < 40; i++) {
+    for (const f of [".claude/settings.local.json", ".claude/settings.json", ".codex/hooks.json"]) {
+      try {
+        const text2 = fs19.readFileSync(path14.join(dir, f), "utf8");
+        if (/\bbunshin\b[^"]*\bhook\b/.test(text2) && !/BUNSHIN_HOOK_SCOPE=user/.test(text2)) return true;
+      } catch {
+      }
+    }
+    if (fs19.existsSync(path14.join(dir, ".git"))) return false;
+    const up = path14.dirname(dir);
+    if (up === dir) return false;
+    dir = up;
+  }
+  return false;
+}
 async function hookCommand(rawEvent, opts = {}) {
   const write = opts.write ?? ((s) => process.stdout.write(s));
   let output = {};
@@ -6908,6 +7363,7 @@ var init_hooks2 = __esm({
     init_detach();
     init_store();
     init_hooks();
+    init_source();
     HARD_BUDGET_MS = 4e3;
     EVENT_NAMES = {
       "session-start": "session-start",
@@ -6927,32 +7383,32 @@ var init_hooks2 = __esm({
 });
 
 // src/project-hooks.ts
-import fs18 from "node:fs";
-import path13 from "node:path";
-import { execFileSync as execFileSync2 } from "node:child_process";
+import fs20 from "node:fs";
+import path15 from "node:path";
+import { execFileSync as execFileSync4 } from "node:child_process";
 function codexProjectHooks(cwd) {
-  const legacyFile = path13.join(cwd, ".codex", "hooks.json");
-  const git4 = (...args) => execFileSync2("git", ["-C", cwd, "rev-parse", ...args], {
+  const legacyFile = path15.join(cwd, ".codex", "hooks.json");
+  const git5 = (...args) => execFileSync4("git", ["-C", cwd, "rev-parse", ...args], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "ignore"],
     timeout: 2e3
   }).trim();
   let root, common, directory;
   try {
-    root = git4("--show-toplevel");
-    common = git4("--path-format=absolute", "--git-common-dir");
-    directory = git4("--absolute-git-dir");
+    root = git5("--show-toplevel");
+    common = git5("--path-format=absolute", "--git-common-dir");
+    directory = git5("--absolute-git-dir");
   } catch {
     return { file: legacyFile, shared: false, legacyFile };
   }
-  const linked = fs18.realpathSync(common) !== fs18.realpathSync(directory);
+  const linked = fs20.realpathSync(common) !== fs20.realpathSync(directory);
   if (linked) {
-    if (path13.basename(common) !== ".git" || !fs18.statSync(common).isDirectory()) {
+    if (path15.basename(common) !== ".git" || !fs20.statSync(common).isDirectory()) {
       throw new Error("Codex hooks in a worktree of a bare repository are not supported yet. Use a full checkout for Bunshin setup.");
     }
-    root = path13.dirname(common);
+    root = path15.dirname(common);
   }
-  const file = fs18.realpathSync(root) === fs18.realpathSync(cwd) ? legacyFile : path13.join(root, ".codex", "hooks.json");
+  const file = fs20.realpathSync(root) === fs20.realpathSync(cwd) ? legacyFile : path15.join(root, ".codex", "hooks.json");
   return { file, shared: linked, legacyFile };
 }
 var init_project_hooks = __esm({
@@ -6964,6 +7420,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,
@@ -6975,6 +7432,7 @@ __export(init_exports, {
   installLearnCommand: () => installLearnCommand,
   installMcpConfig: () => installMcpConfig,
   installPiExtension: () => installPiExtension,
+  installUserMcp: () => installUserMcp,
   isBunshinEntry: () => isBunshinEntry,
   mcpLauncher: () => mcpLauncher,
   mergeClaudeSettings: () => mergeClaudeSettings,
@@ -6982,8 +7440,9 @@ __export(init_exports, {
   removeBunshinHooks: () => removeBunshinHooks,
   runInit: () => runInit
 });
-import fs19 from "node:fs";
-import path14 from "node:path";
+import { execFileSync as execFileSync5 } from "node:child_process";
+import fs21 from "node:fs";
+import path16 from "node:path";
 import { fileURLToPath as fileURLToPath2, pathToFileURL } from "node:url";
 function isBunshinEntry(entry) {
   return entry?._bunshin === true || typeof entry?.command === "string" && /\bbunshin\b.*\bhook\b/.test(entry.command);
@@ -7008,13 +7467,13 @@ function removeBunshinHooks(settings) {
   else delete out.hooks;
   return out;
 }
-function mergeClaudeSettings(settings, { bin = "bunshin", harness = "claude-code" } = {}) {
+function mergeClaudeSettings(settings, { bin = "bunshin", harness = "claude-code", user = false } = {}) {
   const base = removeBunshinHooks(settings);
   const hooks = { ...base.hooks ?? {} };
   for (const { event, arg, timeout, matcher } of harness === "codex" ? CODEX_HOOK_EVENTS : HOOK_EVENTS) {
     const groups = Array.isArray(hooks[event]) ? [...hooks[event]] : [];
     const hook = bunshinHookEntry(arg, timeout, bin);
-    hook.command = `BUNSHIN_HARNESS=${harness} ${hook.command}`;
+    hook.command = `${user ? "BUNSHIN_HOOK_SCOPE=user " : ""}BUNSHIN_HARNESS=${harness} ${hook.command}`;
     if (harness === "codex") delete hook._bunshin;
     groups.push(matcher ? { matcher, hooks: [hook] } : { hooks: [hook] });
     hooks[event] = groups;
@@ -7028,16 +7487,16 @@ function countBunshinHooks(settings) {
   );
 }
 function claudeSettingsPath() {
-  return path14.join(homeDir(), ".claude", "settings.json");
+  return path16.join(homeDir(), ".claude", "settings.json");
 }
 function installPiExtension(cwd, remove = false, scope = "repo") {
-  const file = scope === "global" ? path14.join(homeDir(), ".pi/agent/extensions/bunshin.js") : path14.join(cwd, ".pi/extensions/bunshin.js");
+  const file = scope === "global" ? path16.join(homeDir(), ".pi/agent/extensions/bunshin.js") : path16.join(cwd, ".pi/extensions/bunshin.js");
   const marker = "// Managed by Bunshin setup.";
   try {
-    const previous = fileExists(file) ? fs19.readFileSync(file, "utf8") : "";
+    const previous = fileExists(file) ? fs21.readFileSync(file, "utf8") : "";
     if (previous && !previous.startsWith(marker)) throw new Error("An existing Bunshin extension file is not managed by setup; preserve or move it before continuing.");
     if (remove) {
-      if (previous) fs19.unlinkSync(file);
+      if (previous) fs21.unlinkSync(file);
       return { file, installed: 0, changed: !!previous };
     }
     const extension = fileURLToPath2(new URL("./pi-extension.js", import.meta.url));
@@ -7046,24 +7505,24 @@ function installPiExtension(cwd, remove = false, scope = "repo") {
 export { default } from ${JSON.stringify(pathToFileURL(extension).href)};
 `;
     if (text2 !== previous) {
-      ensureDir(path14.dirname(file));
-      fs19.writeFileSync(file, text2);
+      ensureDir(path16.dirname(file));
+      fs21.writeFileSync(file, text2);
     }
     return { file, installed: 1, changed: text2 !== previous };
   } catch (error) {
     return { file, installed: 0, changed: false, error: error instanceof Error ? error.message : String(error) };
   }
 }
-function installClaudeHooks({ file = claudeSettingsPath(), bin = "bunshin", remove = false, harness = "claude-code" } = {}) {
+function installClaudeHooks({ file = claudeSettingsPath(), bin = "bunshin", remove = false, harness = "claude-code", user = false } = {}) {
   try {
-    const before = fileExists(file) ? JSON.parse(fs19.readFileSync(file, "utf8")) : {};
-    const after = remove ? removeBunshinHooks(before) : mergeClaudeSettings(before, { bin, harness });
+    const before = fileExists(file) ? JSON.parse(fs21.readFileSync(file, "utf8")) : {};
+    const after = remove ? removeBunshinHooks(before) : mergeClaudeSettings(before, { bin, harness, user });
     const changed = JSON.stringify(before) !== JSON.stringify(after);
     if (changed) {
-      ensureDir(path14.dirname(file));
+      ensureDir(path16.dirname(file));
       if (fileExists(file)) {
         try {
-          fs19.copyFileSync(file, `${file}.bunshin-backup`);
+          fs21.copyFileSync(file, `${file}.bunshin-backup`);
         } catch {
         }
       }
@@ -7078,23 +7537,23 @@ function mcpLauncher(bin) {
   if (!bin || /^[\w./@+-]+$/.test(bin)) return { command: bin || "bunshin", args: ["mcp"] };
   let script = process.argv[1] ?? "";
   try {
-    script = fs19.realpathSync(script);
+    script = fs21.realpathSync(script);
   } catch {
   }
   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) ? fs19.readFileSync(file, "utf8") : null;
-    const ours = current === null || current === LEARN_COMMAND;
+    const current = fileExists(file) ? fs21.readFileSync(file, "utf8") : null;
+    const ours = current === null || current === content;
     if (remove) {
-      if (current !== null && ours) fs19.unlinkSync(file);
+      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) {
-      fs19.mkdirSync(path14.dirname(file), { recursive: true });
-      fs19.writeFileSync(file, LEARN_COMMAND);
+      fs21.mkdirSync(path16.dirname(file), { recursive: true });
+      fs21.writeFileSync(file, content);
     }
     return { file, installed: 1, changed: current === null };
   } catch (err) {
@@ -7103,7 +7562,7 @@ function installLearnCommand({ file, remove = false }) {
 }
 function installMcpConfig({ file, launcher, remove = false }) {
   try {
-    const before = fileExists(file) ? JSON.parse(fs19.readFileSync(file, "utf8")) : {};
+    const before = fileExists(file) ? JSON.parse(fs21.readFileSync(file, "utf8")) : {};
     const servers = { ...before.mcpServers ?? {} };
     if (remove) delete servers.bunshin;
     else servers.bunshin = { type: "stdio", command: launcher.command, args: launcher.args, env: { BUNSHIN_HARNESS: "claude-code" } };
@@ -7111,7 +7570,7 @@ function installMcpConfig({ file, launcher, remove = false }) {
     if (!Object.keys(servers).length) delete after.mcpServers;
     const changed = JSON.stringify(before) !== JSON.stringify(after);
     if (changed) {
-      if (!Object.keys(after).length && fileExists(file)) fs19.unlinkSync(file);
+      if (!Object.keys(after).length && fileExists(file)) fs21.unlinkSync(file);
       else if (Object.keys(after).length) writeJsonAtomic(file, after);
     }
     return { file, installed: servers.bunshin ? 1 : 0, changed };
@@ -7119,25 +7578,49 @@ function installMcpConfig({ file, launcher, remove = false }) {
     return { file, installed: 0, changed: false, error: err instanceof Error ? err.message : String(err) };
   }
 }
+function installUserMcp({ launcher, remove = false, claude = "claude" }) {
+  const file = path16.join(homeDir(), ".claude.json");
+  const run2 = (args) => execFileSync5(claude, args, { stdio: ["ignore", "pipe", "pipe"], timeout: 2e4, env: { ...process.env, BUNSHIN_CHILD: "1" } }).toString();
+  try {
+    let had = false;
+    try {
+      run2(["mcp", "get", "bunshin"]);
+      had = true;
+    } catch {
+    }
+    if (had) {
+      try {
+        run2(["mcp", "remove", "bunshin", "-s", "user"]);
+      } catch {
+      }
+    }
+    if (remove) return { file, installed: 0, changed: had };
+    run2(["mcp", "add-json", "bunshin", JSON.stringify({ type: "stdio", command: launcher.command, args: launcher.args, env: { BUNSHIN_HARNESS: "claude-code" } }), "-s", "user"]);
+    return { file, installed: 1, changed: true };
+  } catch (err) {
+    return { file, installed: 0, changed: false, error: err instanceof Error ? err.message.split("\n")[0] : String(err) };
+  }
+}
 function runInit(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const warnings = [];
   const scope = opts.scope ?? "repo";
-  const root = scope === "global" ? path14.join(homeDir(), ".bunshin") : path14.join(cwd, ".bunshin");
-  if (fs19.existsSync(root) && !new Store(root).trusted && fs19.readdirSync(root).length) {
+  const root = scope === "global" ? path16.join(homeDir(), ".bunshin") : path16.join(cwd, ".bunshin");
+  if (fs21.existsSync(root) && !new Store(root).trusted && fs21.readdirSync(root).length) {
     const aside = `${root}.untrusted-${Date.now()}`;
-    fs19.renameSync(root, aside);
+    fs21.renameSync(root, aside);
     warnings.push(`moved ${root} aside to ${aside}: this user did not create it`);
   }
-  const existed = fileExists(path14.join(root, "config.json"));
+  const existed = fileExists(path16.join(root, "config.json"));
   const store = new Store(root);
   store.ensureLayout();
-  fs19.chmodSync(root, 448);
-  if (scope === "repo") {
-    const ignore = path14.join(cwd, ".gitignore");
-    const current = fileExists(ignore) ? fs19.readFileSync(ignore, "utf8") : "";
+  fs21.chmodSync(root, 448);
+  const hookScope = opts.hooks ?? (scope === "global" ? "user" : (existed && store.trusted ? store.config().hooks : void 0) ?? "project");
+  if (scope === "repo" && (hookScope === "project" || fileExists(path16.join(cwd, ".git")))) {
+    const ignore = path16.join(cwd, ".gitignore");
+    const current = fileExists(ignore) ? fs21.readFileSync(ignore, "utf8") : "";
     if (!current.split(/\r?\n/).some((line) => /^\/?\.bunshin\/?$/.test(line.trim()))) {
-      fs19.appendFileSync(ignore, `${current && !current.endsWith("\n") ? "\n" : ""}.bunshin/
+      fs21.appendFileSync(ignore, `${current && !current.endsWith("\n") ? "\n" : ""}.bunshin/
 `);
     }
   }
@@ -7145,6 +7628,7 @@ function runInit(opts = {}) {
   const config = {
     ...previous,
     scope,
+    hooks: hookScope,
     orgId: opts.orgId ?? previous.orgId,
     userId: opts.userId ?? previous.userId,
     role: opts.role ?? previous.role,
@@ -7161,18 +7645,22 @@ function runInit(opts = {}) {
   if (!fileExists(store.indexFile)) store.rebuildIndex();
   let hooks;
   if ((opts.removeHooks || !opts.noHooks) && config.harness === "pi") {
-    hooks = installPiExtension(cwd, opts.removeHooks, scope);
+    hooks = installPiExtension(cwd, opts.removeHooks, hookScope === "user" ? "global" : "repo");
     if (hooks.error) warnings.push(hooks.error);
   }
   if ((opts.removeHooks || !opts.noHooks) && (config.harness === "codex" || config.harness === "claude-code")) {
-    const projectHooks = config.harness === "codex" && scope === "repo" && !opts.settingsFile ? codexProjectHooks(cwd) : void 0;
-    const file = opts.settingsFile ?? (config.harness === "codex" ? projectHooks?.file ?? path14.join(process.env.CODEX_HOME ?? path14.join(homeDir(), ".codex"), "hooks.json") : scope === "repo" ? path14.join(cwd, ".claude", "settings.local.json") : claudeSettingsPath());
-    hooks = installClaudeHooks({ file, bin: opts.bin, remove: opts.removeHooks, harness: config.harness });
+    const projectHooks = config.harness === "codex" && hookScope === "project" && !opts.settingsFile ? codexProjectHooks(cwd) : void 0;
+    const file = opts.settingsFile ?? (config.harness === "codex" ? projectHooks?.file ?? path16.join(process.env.CODEX_HOME ?? path16.join(homeDir(), ".codex"), "hooks.json") : hookScope === "project" ? path16.join(cwd, ".claude", "settings.local.json") : claudeSettingsPath());
+    hooks = installClaudeHooks({ file, bin: opts.bin, remove: opts.removeHooks, harness: config.harness, user: hookScope === "user" && !opts.settingsFile });
+    if (!opts.removeHooks && !opts.settingsFile && hookScope === "user" && config.harness === "claude-code") {
+      const local = path16.join(cwd, ".claude", "settings.local.json");
+      if (fileExists(local) && path16.resolve(local) !== path16.resolve(file)) installClaudeHooks({ file: local, remove: true });
+    }
     if (projectHooks?.shared) {
       hooks.sharedWithWorktrees = true;
-      if (!hooks.error && !opts.removeHooks) ensureDir(path14.dirname(projectHooks.legacyFile));
+      if (!hooks.error && !opts.removeHooks) ensureDir(path16.dirname(projectHooks.legacyFile));
     }
-    if (!hooks.error && projectHooks && projectHooks.file !== projectHooks.legacyFile && fileExists(projectHooks.legacyFile) && fs19.realpathSync(projectHooks.file) !== fs19.realpathSync(projectHooks.legacyFile)) {
+    if (!hooks.error && projectHooks && projectHooks.file !== projectHooks.legacyFile && fileExists(projectHooks.legacyFile) && fs21.realpathSync(projectHooks.file) !== fs21.realpathSync(projectHooks.legacyFile)) {
       const old = installClaudeHooks({ file: projectHooks.legacyFile, remove: true, harness: "codex" });
       if (old.error) hooks.error = `Could not remove old Bunshin hooks from ${old.file}: ${old.error}`;
     }
@@ -7180,17 +7668,27 @@ function runInit(opts = {}) {
   }
   let mcp;
   let learnCommand;
-  if ((opts.removeHooks || !opts.noHooks) && config.harness === "claude-code" && scope === "repo") {
-    mcp = installMcpConfig({ file: path14.join(cwd, ".mcp.json"), launcher: opts.mcp ?? mcpLauncher(opts.bin), remove: opts.removeHooks });
+  if ((opts.removeHooks || !opts.noHooks) && config.harness === "claude-code") {
+    const user = hookScope === "user";
+    mcp = user ? installUserMcp({ launcher: opts.mcp ?? mcpLauncher(opts.bin), remove: opts.removeHooks }) : installMcpConfig({ file: path16.join(cwd, ".mcp.json"), launcher: opts.mcp ?? mcpLauncher(opts.bin), remove: opts.removeHooks });
     if (mcp.error) warnings.push(`could not update ${mcp.file}: ${mcp.error}`);
-    learnCommand = installLearnCommand({ file: path14.join(cwd, ".claude", "commands", "learn.md"), remove: opts.removeHooks });
+    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 [
@@ -7206,7 +7704,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";
@@ -7232,6 +7730,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';
   }
 });
 
@@ -7253,19 +7752,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" };
@@ -7280,7 +7779,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)) {
@@ -7293,8 +7793,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"() {
@@ -7318,6 +7827,7 @@ __export(commands_exports, {
   cmdReflectFork: () => cmdReflectFork,
   cmdReview: () => cmdReview,
   cmdReviewDecide: () => cmdReviewDecide,
+  cmdSources: () => cmdSources,
   cmdSuggest: () => cmdSuggest,
   cmdSync: () => cmdSync,
   robotAttrsFromFlags: () => robotAttrsFromFlags,
@@ -7325,9 +7835,9 @@ __export(commands_exports, {
   setupRobot: () => setupRobot,
   v2Status: () => v2Status
 });
-import fs20 from "node:fs";
-import path15 from "node:path";
-import { createHash as createHash4, randomBytes as randomBytes4 } from "node:crypto";
+import fs22 from "node:fs";
+import path17 from "node:path";
+import { createHash as createHash5, randomBytes as randomBytes4 } from "node:crypto";
 function cmdReview(store, args, cwd, out, err) {
   const v2 = new V2Store(store);
   const sub = args._[1] ?? "list";
@@ -7427,18 +7937,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;
 }
@@ -7455,7 +7966,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) {
@@ -7496,11 +8007,11 @@ function cmdSuggest(store, args, cwd, out, err) {
     err('bunshin suggest: usage: bunshin suggest --code <harness-relative path> [--file <local file>] [--rationale "<text>"]\n');
     return 1;
   }
-  const harnessDir = path15.resolve(cwd, str3(args.flags["harness-dir"]) ?? ".");
-  const file = str3(args.flags.file) ? path15.resolve(cwd, str3(args.flags.file)) : path15.join(harnessDir, rel);
+  const harnessDir = path17.resolve(cwd, str3(args.flags["harness-dir"]) ?? ".");
+  const file = str3(args.flags.file) ? path17.resolve(cwd, str3(args.flags.file)) : path17.join(harnessDir, rel);
   let content;
   try {
-    content = fs20.readFileSync(file, "utf8");
+    content = fs22.readFileSync(file, "utf8");
   } catch {
     err(`bunshin suggest: cannot read ${file}
 `);
@@ -7621,15 +8132,15 @@ async function cmdQuestions(store, args, out, err) {
   return 0;
 }
 function saveCredential(storeRoot, apiUrl, apiKey, id) {
-  const dir = path15.join(homeDir(), ".config/bunshin/credentials");
-  fs20.mkdirSync(dir, { recursive: true, mode: 448 });
-  fs20.chmodSync(dir, 448);
-  const file = path15.join(dir, `${createHash4("sha256").update(`${storeRoot}
+  const dir = path17.join(homeDir(), ".config/bunshin/credentials");
+  fs22.mkdirSync(dir, { recursive: true, mode: 448 });
+  fs22.chmodSync(dir, 448);
+  const file = path17.join(dir, `${createHash5("sha256").update(`${storeRoot}
 ${apiUrl}
 ${id}`).digest("hex")}.json`);
   const tmp = `${file}.${randomBytes4(4).toString("hex")}.tmp`;
-  fs20.writeFileSync(tmp, JSON.stringify({ apiUrl, apiKey }) + "\n", { mode: 384, flag: "wx" });
-  fs20.renameSync(tmp, file);
+  fs22.writeFileSync(tmp, JSON.stringify({ apiUrl, apiKey }) + "\n", { mode: 384, flag: "wx" });
+  fs22.renameSync(tmp, file);
   return file;
 }
 async function setupRobot(opts) {
@@ -7637,10 +8148,10 @@ async function setupRobot(opts) {
   const existing = Store.discover(opts.cwd);
   let store;
   const harness = opts.harness ?? "other";
-  if (existing && path15.resolve(path15.dirname(existing.root)) === path15.resolve(opts.cwd) && harness === "other") store = existing;
+  if (existing && path17.resolve(path17.dirname(existing.root)) === path17.resolve(opts.cwd) && harness === "other") store = existing;
   else {
     runInit({ cwd: opts.cwd, harness, noHooks: harness === "other", ...opts.apiUrl ? { apiUrl: opts.apiUrl } : {} });
-    store = new Store(path15.join(opts.cwd, ".bunshin"));
+    store = new Store(path17.join(opts.cwd, ".bunshin"));
   }
   let config = store.config();
   const apiUrl = (opts.apiUrl ?? config.apiUrl ?? "").replace(/\/$/, "");
@@ -7703,8 +8214,10 @@ function v2Status(store, cwd) {
   }
   const view = localView(v2, config, cwd, { index: false });
   const sync = v2.readSyncState();
+  const pooled = cwdInPool(config, cwd, store.root);
   return {
     context: { id: view.ctx.id, kind: view.ctx.kind, layers: view.layers },
+    source: { id: pooled ? sourceFor(cwd, store.root, view.ctx) ?? null : null, inPool: pooled, folder: topFolder(cwd, store.root) || null },
     bundle: bundle ? { sections: bundle.sections.length, generatedAt: bundle.generatedAt, release: bundle.release?.version ?? null } : null,
     repo: { name: repo, sections: repoSections },
     overlays: v2.readOverlays().length,
@@ -7715,6 +8228,46 @@ function v2Status(store, cwd) {
     session: v2.readCurrent()?.sessionId ?? null
   };
 }
+function cmdSources(store, args, cwd, out, err) {
+  const config = store.config();
+  const action = args._[1];
+  const names = args._.slice(2).flatMap((x) => x.split(",")).map((x) => x.trim().replace(/\/+$/, "")).filter(Boolean);
+  if (action) {
+    if (action !== "all" && action !== "only" && action !== "include" && action !== "exclude") {
+      err("usage: bunshin sources [all | only <folders\u2026> | include <folders\u2026> | exclude <folders\u2026>]\n");
+      return 1;
+    }
+    if (action !== "all" && !names.length) {
+      err(`bunshin sources ${action}: name at least one folder
+`);
+      return 1;
+    }
+    const known = new Set(listFolders(store.root, void 0).map((f) => f.folder));
+    const unknown = names.filter((n) => !known.has(n));
+    if (unknown.length) {
+      err(`bunshin sources: not a folder in ${storeHome(store.root)}: ${unknown.join(", ")}
+`);
+      return 1;
+    }
+    const next = select(config.sources, action, names);
+    const { sources: _drop, ...rest } = config;
+    void _drop;
+    store.saveConfig(next ? { ...rest, sources: next } : rest);
+  }
+  const selection = store.config().sources;
+  const folders = listFolders(store.root, selection, { sources: true });
+  if (bool2(args.flags.json)) {
+    out(JSON.stringify({ home: storeHome(store.root), selection: selection ?? null, folders }, null, 2) + "\n");
+    return 0;
+  }
+  const here = topFolder(cwd, store.root);
+  out(`Learning pool of ${storeHome(store.root)}: ${!selection ? "every folder (new ones join)" : selection.only ? "only the folders marked in (new ones stay out)" : "every folder but those marked out (new ones join)"}
+`);
+  if (!folders.length) out("  (no folders here yet)\n");
+  for (const f of folders) out(`  ${f.included ? "in " : "out"}  ${f.folder}${f.source ? `  (${f.source})` : ""}${f.folder === here ? "  \u2190 here" : ""}
+`);
+  return 0;
+}
 var str3, bool2, list;
 var init_commands = __esm({
   "src/v2/commands.ts"() {
@@ -7731,6 +8284,7 @@ var init_commands = __esm({
     init_repo();
     init_store2();
     init_sync();
+    init_source();
     init_view();
     str3 = (v) => typeof v === "string" ? v : void 0;
     bool2 = (v) => v === true || v === "true";
@@ -7743,6 +8297,7 @@ var setup_exports = {};
 __export(setup_exports, {
   HOSTED_API: () => HOSTED_API,
   apiAddress: () => apiAddress,
+  askSources: () => askSources,
   connectionProfile: () => connectionProfile,
   executable: () => executable,
   hookBinary: () => hookBinary,
@@ -7750,16 +8305,16 @@ __export(setup_exports, {
   setupProject: () => setupProject,
   shellQuote: () => shellQuote
 });
-import fs21 from "node:fs";
-import path16 from "node:path";
-import { createHash as createHash5, randomBytes as randomBytes5 } from "node:crypto";
+import fs23 from "node:fs";
+import path18 from "node:path";
+import { createHash as createHash6, randomBytes as randomBytes5 } from "node:crypto";
 function executable(name) {
-  const directories = [...(process.env.PATH ?? "").split(path16.delimiter), path16.join(homeDir(), ".local/bin")];
+  const directories = [...(process.env.PATH ?? "").split(path18.delimiter), path18.join(homeDir(), ".local/bin")];
   for (const directory of directories) {
-    const file = path16.resolve(directory, name);
+    const file = path18.resolve(directory, name);
     try {
-      fs21.accessSync(file, fs21.constants.X_OK);
-      if (fs21.statSync(file).isFile()) return file;
+      fs23.accessSync(file, fs23.constants.X_OK);
+      if (fs23.statSync(file).isFile()) return file;
     } catch {
     }
   }
@@ -7767,8 +8322,8 @@ function executable(name) {
 }
 function hookBinary(harness) {
   const agent = executable(harness === "claude-code" ? "claude" : harness);
-  const directories = [.../* @__PURE__ */ new Set([path16.dirname(process.execPath), path16.join(homeDir(), ".local/bin"), ...agent ? [path16.dirname(agent)] : []])];
-  return `PATH=${shellQuote(directories.join(path16.delimiter))}:"$PATH" ${shellQuote(process.execPath)} ${shellQuote(fs21.realpathSync(process.argv[1]))}`;
+  const directories = [.../* @__PURE__ */ new Set([path18.dirname(process.execPath), path18.join(homeDir(), ".local/bin"), ...agent ? [path18.dirname(agent)] : []])];
+  return `PATH=${shellQuote(directories.join(path18.delimiter))}:"$PATH" ${shellQuote(process.execPath)} ${shellQuote(fs23.realpathSync(process.argv[1]))}`;
 }
 function apiAddress(raw) {
   const url = new URL(raw);
@@ -7837,33 +8392,37 @@ async function setupProject(opts) {
   const apiKey = opts.apiKey.trim();
   if (!apiKey || /\s/.test(apiKey)) throw new Error("Paste the complete agent key from your Bunshin workspace.");
   const profile = await connectionProfile(apiUrl, apiKey);
-  const root = path16.join(opts.cwd, ".bunshin");
+  const root = path18.join(opts.cwd, ".bunshin");
   const store = new Store(root);
   const previous = store.config();
   if ((previous.orgId !== profile.orgId || previous.userId !== profile.userId) && (store.listLessons().length || store.allTraces().length || store.listRecallLessons().length)) {
     throw new Error("This project has lessons or activity from another profile. Use a fresh project to connect this workspace.");
   }
-  const credentialDirectory = path16.join(homeDir(), ".config/bunshin/credentials");
-  fs21.mkdirSync(credentialDirectory, { recursive: true, mode: 448 });
-  fs21.chmodSync(credentialDirectory, 448);
-  const name = createHash5("sha256").update(`${root}
+  const credentialDirectory = path18.join(homeDir(), ".config/bunshin/credentials");
+  fs23.mkdirSync(credentialDirectory, { recursive: true, mode: 448 });
+  fs23.chmodSync(credentialDirectory, 448);
+  const name = createHash6("sha256").update(`${root}
 ${apiUrl}
 ${profile.orgId}
 ${profile.userId}`).digest("hex");
-  const credentialFile = path16.join(credentialDirectory, `${name}.json`);
+  const credentialFile = path18.join(credentialDirectory, `${name}.json`);
   const temporary = `${credentialFile}.${randomBytes5(4).toString("hex")}.tmp`;
-  fs21.writeFileSync(temporary, JSON.stringify({ apiUrl, apiKey }) + "\n", { mode: 384, flag: "wx" });
-  fs21.renameSync(temporary, credentialFile);
+  fs23.writeFileSync(temporary, JSON.stringify({ apiUrl, apiKey }) + "\n", { mode: 384, flag: "wx" });
+  fs23.renameSync(temporary, credentialFile);
   const result = runInit({
     cwd: opts.cwd,
     harness: opts.harness,
     apiUrl,
     ...profile,
     noHooks: opts.noHooks,
-    bin: opts.bin ?? hookBinary(opts.harness)
+    bin: opts.bin ?? hookBinary(opts.harness),
+    ...opts.hooks ? { hooks: opts.hooks } : {}
   });
+  const { sources: kept, ...base } = result.config;
+  const sources = opts.sources === void 0 ? kept : opts.sources ?? void 0;
   store.saveConfig({
-    ...result.config,
+    ...base,
+    ...sources ? { sources } : {},
     ...profile,
     apiKey: void 0,
     credentialFile,
@@ -7874,6 +8433,39 @@ ${profile.userId}`).digest("hex");
   trustStore(root);
   return { ...result, profile, credentialFile };
 }
+async function askSources(store, out) {
+  const { listFolders: listFolders2, select: select2 } = await Promise.resolve().then(() => (init_source(), source_exports));
+  const config = store.config();
+  const folders = listFolders2(store.root, void 0);
+  if (folders.length < 2) return;
+  const readline2 = await import("node:readline/promises");
+  const rl = readline2.createInterface({ input: process.stdin, output: process.stderr });
+  try {
+    out(`This folder holds ${folders.length} folders:
+`);
+    folders.forEach((f, i) => out(`  ${String(i + 1).padStart(2)}. ${f.folder}
+`));
+    const answer = (await rl.question("Learn from [a]ll of them, all [e]xcept some, or [o]nly some? [a] ")).trim().toLowerCase();
+    const mode = answer.startsWith("e") || answer.startsWith("x") ? "exclude" : answer.startsWith("o") || answer.startsWith("p") ? "only" : "all";
+    const { sources: _drop, ...rest } = config;
+    void _drop;
+    if (mode === "all") {
+      store.saveConfig(rest);
+      out("Learning from every folder here; new folders join automatically.\n");
+      return;
+    }
+    const raw = await rl.question(mode === "exclude" ? "Folders to leave out (numbers or names, comma-separated): " : "Folders to learn from (numbers or names, comma-separated): ");
+    const picked = [...new Set(raw.split(/[,\s]+/).map((x) => x.trim()).filter(Boolean).map((x) => /^\d+$/.test(x) ? folders[Number(x) - 1]?.folder : folders.find((f) => f.folder === x)?.folder).filter((x) => !!x))];
+    const next = select2(void 0, mode, picked);
+    store.saveConfig(next ? { ...rest, sources: next } : rest);
+    if (mode === "exclude") out(picked.length ? `Learning from every folder but ${picked.join(", ")}; new folders join automatically.
+` : "Learning from every folder here; new folders join automatically.\n");
+    else out(picked.length ? `Learning from ${picked.join(", ")} only; new folders stay out until you add them (bunshin sources include <folder>).
+` : "Nothing here takes part until you add a folder (bunshin sources include <folder>).\n");
+  } finally {
+    rl.close();
+  }
+}
 var shellQuote;
 var init_setup = __esm({
   "src/setup.ts"() {
@@ -7924,6 +8516,7 @@ async function handleMcp(msg, opts) {
       const cwd = opts.cwd ?? process.cwd();
       const store = opts.store !== void 0 ? opts.store : Store.discover(cwd);
       if (!store) return reply(text("Bunshin is not set up in this project (run `bunshin setup`). Proceed with general knowledge.", true));
+      if (!cwdInPool(store.config(), cwd, store.root)) return reply(text("This folder is not part of Bunshin's learning pool (`bunshin sources`). Proceed with general knowledge.", true));
       try {
         if (name === "bunshin_recall") {
           const taskAbstract = typeof args.task_abstract === "string" ? args.task_abstract : "";
@@ -7931,8 +8524,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));
@@ -7987,7 +8580,9 @@ var init_mcp = __esm({
   "src/v2/mcp.ts"() {
     "use strict";
     init_v22();
+    init_source();
     init_store();
+    init_store2();
     init_library();
     DEFAULT_PROTOCOL = "2025-06-18";
     MCP_TOOLS = [
@@ -8001,7 +8596,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
@@ -8164,9 +8760,9 @@ __export(sync_exports2, {
   resolveConflict: () => resolveConflict,
   runSync: () => runSync
 });
-import { createHash as createHash6 } from "node:crypto";
-import path17 from "node:path";
-import fs22 from "node:fs";
+import { createHash as createHash7 } from "node:crypto";
+import path19 from "node:path";
+import fs24 from "node:fs";
 async function api(config, method, route, body, timeoutMs = 1e4) {
   const ctrl = new AbortController();
   const timer = setTimeout(() => ctrl.abort(), timeoutMs);
@@ -8204,22 +8800,22 @@ async function mothershipLookup(config, ids, timeoutMs = 8e3) {
   }
 }
 async function runSync(store) {
-  const lock = path17.join(store.root, "sync.lock");
+  const lock = path19.join(store.root, "sync.lock");
   const deadline = Date.now() + 12e4;
   for (; ; ) {
     try {
-      fs22.writeFileSync(lock, String(process.pid), { flag: "wx", mode: 384 });
+      fs24.writeFileSync(lock, String(process.pid), { flag: "wx", mode: 384 });
       break;
     } catch (error) {
       if (error.code !== "EEXIST") throw error;
       try {
-        const owner = Number(fs22.readFileSync(lock, "utf8"));
+        const owner = Number(fs24.readFileSync(lock, "utf8"));
         if (Number.isInteger(owner) && owner > 0) {
           try {
             process.kill(owner, 0);
           } catch (error2) {
             if (error2.code === "ESRCH") {
-              fs22.unlinkSync(lock);
+              fs24.unlinkSync(lock);
               continue;
             }
           }
@@ -8238,7 +8834,7 @@ async function runSync(store) {
     return await syncStore(store);
   } finally {
     try {
-      fs22.unlinkSync(lock);
+      fs24.unlinkSync(lock);
     } catch {
     }
   }
@@ -8266,9 +8862,9 @@ async function syncStore(store) {
       result.errors.push(String(e instanceof Error ? e.message : e));
     }
   }
-  const acknowledgementsFile = path17.join(store.root, "synced-traces.json");
+  const acknowledgementsFile = path19.join(store.root, "synced-traces.json");
   const acknowledgements = readJson(acknowledgementsFile, {});
-  const fingerprint2 = (trace) => createHash6("sha256").update(JSON.stringify(trace)).digest("hex");
+  const fingerprint2 = (trace) => createHash7("sha256").update(JSON.stringify(trace)).digest("hex");
   const traces = store.allTraces().filter((t) => acknowledgements[t.id] !== fingerprint2(t)).slice(0, 50);
   for (const t of traces) {
     try {
@@ -8521,11 +9117,11 @@ __export(demo_exports, {
   runDemo: () => runDemo
 });
 import assert from "node:assert/strict";
-import fs23 from "node:fs";
+import fs25 from "node:fs";
 import os4 from "node:os";
-import path18 from "node:path";
+import path20 from "node:path";
 async function runDemo(write) {
-  const root = fs23.mkdtempSync(path18.join(os4.tmpdir(), "bunshin-demo-"));
+  const root = fs25.mkdtempSync(path20.join(os4.tmpdir(), "bunshin-demo-"));
   try {
     const store = Store.init(root, { ...APR_ENGINEER, apiUrl: "" });
     const { lessons, constraint, workflow } = aprScenario();
@@ -8542,7 +9138,7 @@ Task: ${APR_TASK}
     write(result.text);
     write("\nPASS: Collections constraint and workflow recalled; C-suite, other-company, and superseded lessons excluded.\n");
   } finally {
-    fs23.rmSync(root, { recursive: true, force: true });
+    fs25.rmSync(root, { recursive: true, force: true });
   }
 }
 var init_demo = __esm({
@@ -8555,21 +9151,21 @@ var init_demo = __esm({
 });
 
 // src/v2/gitremote.ts
-import fs24 from "node:fs";
-import path19 from "node:path";
-import { createHash as createHash7 } from "node:crypto";
+import fs26 from "node:fs";
+import path21 from "node:path";
+import { createHash as createHash8 } from "node:crypto";
 function saveGitCredential(apiUrl, apiKey) {
   const file = gitCredentialFile();
-  fs24.mkdirSync(path19.dirname(file), { recursive: true, mode: 448 });
+  fs26.mkdirSync(path21.dirname(file), { recursive: true, mode: 448 });
   let all = {};
   try {
-    all = JSON.parse(fs24.readFileSync(file, "utf8"));
+    all = JSON.parse(fs26.readFileSync(file, "utf8"));
   } catch {
   }
   all[apiUrl.replace(/\/$/, "")] = apiKey;
   const tmp = `${file}.${process.pid}.tmp`;
-  fs24.writeFileSync(tmp, JSON.stringify(all, null, 2) + "\n", { mode: 384 });
-  fs24.renameSync(tmp, file);
+  fs26.writeFileSync(tmp, JSON.stringify(all, null, 2) + "\n", { mode: 384 });
+  fs26.renameSync(tmp, file);
 }
 function resolveGitKey(apiUrl) {
   const base = apiUrl.replace(/\/$/, "");
@@ -8577,20 +9173,20 @@ function resolveGitKey(apiUrl) {
   const origin = urlOrigin(base);
   if (process.env.BUNSHIN_API_KEY && origin && trustedOrigins().has(origin)) return process.env.BUNSHIN_API_KEY;
   try {
-    const all = JSON.parse(fs24.readFileSync(gitCredentialFile(), "utf8"));
+    const all = JSON.parse(fs26.readFileSync(gitCredentialFile(), "utf8"));
     if (all[base]) return all[base];
   } catch {
   }
-  const dir = path19.join(homeDir(), ".config/bunshin/credentials");
+  const dir = path21.join(homeDir(), ".config/bunshin/credentials");
   let files = [];
   try {
-    files = fs24.readdirSync(dir).filter((f) => f.endsWith(".json"));
+    files = fs26.readdirSync(dir).filter((f) => f.endsWith(".json"));
   } catch {
     return void 0;
   }
   for (const f of files.sort()) {
     try {
-      const c = JSON.parse(fs24.readFileSync(path19.join(dir, f), "utf8"));
+      const c = JSON.parse(fs26.readFileSync(path21.join(dir, f), "utf8"));
       if (c.apiKey && c.apiUrl?.replace(/\/$/, "") === base) return c.apiKey;
     } catch {
     }
@@ -8598,7 +9194,7 @@ function resolveGitKey(apiUrl) {
   return void 0;
 }
 function refsDigest(refs) {
-  return createHash7("sha256").update(
+  return createHash8("sha256").update(
     [...refs].sort((a, b) => a.ref.localeCompare(b.ref)).map((r) => `${r.sha} ${r.ref}`).join("\n")
   ).digest("hex").slice(0, 12);
 }
@@ -8611,7 +9207,7 @@ var init_gitremote = __esm({
     ZERO_SHA = "0".repeat(40);
     REMOTE_PATH = "/v1/git/repos/";
     remoteUrl = (apiUrl, repo) => `bunshin::${apiUrl.replace(/\/$/, "")}${REMOTE_PATH}${repo}`;
-    gitCredentialFile = () => path19.join(homeDir(), ".config/bunshin/git-credentials.json");
+    gitCredentialFile = () => path21.join(homeDir(), ".config/bunshin/git-credentials.json");
     GitApiError = class extends Error {
       constructor(status, message, body = null) {
         super(message);
@@ -8703,19 +9299,19 @@ __export(gitrepo_exports, {
   githubReferences: () => githubReferences,
   repoFromUrl: () => repoFromUrl
 });
-import fs25 from "node:fs";
-import path20 from "node:path";
+import fs27 from "node:fs";
+import path22 from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
-function git2(cwd, args, opts = {}) {
+function git3(cwd, args, opts = {}) {
   const r = spawnSync2("git", ["-C", cwd, ...args], { encoding: "utf8", stdio: opts.inherit ? ["ignore", "inherit", "inherit"] : ["ignore", "pipe", "pipe"], maxBuffer: 256 * 1024 * 1024 });
   const res = { ok: r.status === 0, out: r.stdout ?? "", err: r.stderr ?? "" };
   if (!res.ok && !opts.allowFail) throw new Error(`git ${args.join(" ")} failed: ${(res.err || res.out).trim()}`);
   return res;
 }
 function onPath(name) {
-  for (const dir of (process.env.PATH ?? "").split(path20.delimiter)) {
+  for (const dir of (process.env.PATH ?? "").split(path22.delimiter)) {
     try {
-      fs25.accessSync(path20.join(dir, name), fs25.constants.X_OK);
+      fs27.accessSync(path22.join(dir, name), fs27.constants.X_OK);
       return true;
     } catch {
     }
@@ -8767,7 +9363,7 @@ async function connect(args, cwd, prompt = true, reuseKey = true) {
   return client;
 }
 function toplevel(dir) {
-  const r = git2(dir, ["rev-parse", "--show-toplevel"], { allowFail: true });
+  const r = git3(dir, ["rev-parse", "--show-toplevel"], { allowFail: true });
   if (!r.ok) throw new Error(`${dir} is not inside a git repository`);
   return r.out.trim();
 }
@@ -8775,7 +9371,7 @@ function githubReferences(root, repo) {
   const [owner, name] = repo.split("/");
   const esc = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const pattern = `github\\.com[:/]${esc(owner)}/${esc(name)}|--repo[ =]${esc(owner)}/${esc(name)}|gh repo clone ${esc(owner)}/${esc(name)}`;
-  const r = git2(root, ["grep", "-n", "-I", "-E", pattern, "HEAD", "--"], { allowFail: true });
+  const r = git3(root, ["grep", "-n", "-I", "-E", pattern, "HEAD", "--"], { allowFail: true });
   return r.out.split("\n").filter(Boolean).map((l) => l.replace(/^HEAD:/, ""));
 }
 function switchOrigin(root, url, out) {
@@ -8784,41 +9380,41 @@ function switchOrigin(root, url, out) {
   let keptAs = null;
   if (old && old !== url) {
     keptAs = rs.has("github") ? `github-${Date.now()}` : "github";
-    git2(root, ["remote", "rename", "origin", keptAs]);
+    git3(root, ["remote", "rename", "origin", keptAs]);
   }
-  if (rs.has("bunshin") && rs.get("bunshin") === url) git2(root, ["remote", "rename", "bunshin", "origin"]);
-  else if (old !== url) git2(root, ["remote", "add", "origin", url]);
-  git2(root, ["fetch", "--quiet", "--tags", "origin"]);
-  git2(root, ["remote", "set-head", "origin", "--auto"], { allowFail: true });
+  if (rs.has("bunshin") && rs.get("bunshin") === url) git3(root, ["remote", "rename", "bunshin", "origin"]);
+  else if (old !== url) git3(root, ["remote", "add", "origin", url]);
+  git3(root, ["fetch", "--quiet", "--tags", "origin"]);
+  git3(root, ["remote", "set-head", "origin", "--auto"], { allowFail: true });
   const originRefs = refMap(root, "refs/remotes/origin");
-  for (const b of git2(root, ["for-each-ref", "--format=%(refname:short)", "refs/heads"]).out.split("\n").filter(Boolean)) {
-    if (originRefs.has(`refs/remotes/origin/${b}`)) git2(root, ["branch", `--set-upstream-to=origin/${b}`, b], { allowFail: true });
+  for (const b of git3(root, ["for-each-ref", "--format=%(refname:short)", "refs/heads"]).out.split("\n").filter(Boolean)) {
+    if (originRefs.has(`refs/remotes/origin/${b}`)) git3(root, ["branch", `--set-upstream-to=origin/${b}`, b], { allowFail: true });
   }
   out(`origin \u2192 ${url}${keptAs ? ` (the old origin is now the remote "${keptAs}")` : ""}
 `);
 }
 async function cmdImport(args, cwd, out, err) {
   requireHelper();
-  const root = toplevel(path20.resolve(str4(args.flags.path) ?? args._[1] ?? cwd));
-  if (git2(root, ["rev-parse", "--is-shallow-repository"]).out.trim() === "true") throw new Error("this clone is shallow; fetch the full history first: git fetch --unshallow");
+  const root = toplevel(path22.resolve(str4(args.flags.path) ?? args._[1] ?? cwd));
+  if (git3(root, ["rev-parse", "--is-shallow-repository"]).out.trim() === "true") throw new Error("this clone is shallow; fetch the full history first: git fetch --unshallow");
   const rs = remotes(root);
   const originUrl = rs.get("origin");
-  const name = str4(args.flags.name) ?? (originUrl && !originUrl.startsWith("bunshin::") ? repoFromUrl(originUrl) : null) ?? `${path20.basename(path20.dirname(root))}/${path20.basename(root)}`;
+  const name = str4(args.flags.name) ?? (originUrl && !originUrl.startsWith("bunshin::") ? repoFromUrl(originUrl) : null) ?? `${path22.basename(path22.dirname(root))}/${path22.basename(root)}`;
   const client = await connect(args, cwd);
   const url = remoteUrl(client.apiUrl, name);
   const fromOrigin = !!originUrl && !originUrl.startsWith("bunshin::") && !bool3(args.flags.local);
   if (fromOrigin) {
     out(`Fetching ${originUrl} \u2026
 `);
-    const f = git2(root, ["fetch", "--quiet", "--prune", "--tags", "origin"], { allowFail: true });
+    const f = git3(root, ["fetch", "--quiet", "--prune", "--tags", "origin"], { allowFail: true });
     if (!f.ok) err(`! could not fetch origin (${f.err.trim().split("\n")[0]}); importing what this clone already has from it
 `);
   }
   const branches = fromOrigin ? [...refMap(root, "refs/remotes/origin").entries()].filter(([ref]) => ref !== "refs/remotes/origin/HEAD").map(([ref, sha2]) => ({ src: ref, dst: ref.replace("refs/remotes/origin/", "refs/heads/"), sha: sha2 })) : [...refMap(root, "refs/heads").entries()].map(([ref, sha2]) => ({ src: ref, dst: ref, sha: sha2 }));
   const tags = [...refMap(root, "refs/tags").entries()].map(([ref, sha2]) => ({ src: ref, dst: ref, sha: sha2 }));
   if (!branches.length) throw new Error("nothing to import: no branches found");
-  const originHead = git2(root, ["symbolic-ref", "--quiet", "refs/remotes/origin/HEAD"], { allowFail: true }).out.trim().replace("refs/remotes/origin/", "");
-  const current = git2(root, ["symbolic-ref", "--quiet", "--short", "HEAD"], { allowFail: true }).out.trim();
+  const originHead = git3(root, ["symbolic-ref", "--quiet", "refs/remotes/origin/HEAD"], { allowFail: true }).out.trim().replace("refs/remotes/origin/", "");
+  const current = git3(root, ["symbolic-ref", "--quiet", "--short", "HEAD"], { allowFail: true }).out.trim();
   const defaultBranch = str4(args.flags["default-branch"]) ?? (fromOrigin && originHead ? originHead : current || "main");
   if (!branches.some((b) => b.dst === `refs/heads/${defaultBranch}`)) throw new Error(`default branch ${defaultBranch} is not among the imported branches`);
   if (fromOrigin) {
@@ -8828,7 +9424,7 @@ async function cmdImport(args, cwd, out, err) {
       if (!remote) err(`! local branch ${b} is not on the origin and was not imported (push it to Bunshin afterwards if you need it)
 `);
       else if (remote !== sha2) {
-        const ahead = git2(root, ["rev-list", "--count", `${remote}..${sha2}`], { allowFail: true }).out.trim();
+        const ahead = git3(root, ["rev-list", "--count", `${remote}..${sha2}`], { allowFail: true }).out.trim();
         if (ahead && ahead !== "0") err(`! ${b} has ${ahead} local commit${ahead === "1" ? "" : "s"} not on the origin; after the switch, \`git push\` sends them to Bunshin
 `);
       }
@@ -8851,13 +9447,13 @@ async function cmdImport(args, cwd, out, err) {
     out(`${name} exists and is empty; importing into it
 `);
   }
-  if (rs.has("bunshin")) git2(root, ["remote", "set-url", "bunshin", url]);
-  else git2(root, ["remote", "add", "bunshin", url]);
+  if (rs.has("bunshin")) git3(root, ["remote", "set-url", "bunshin", url]);
+  else git3(root, ["remote", "add", "bunshin", url]);
   const specs = [...branches, ...tags].map((r) => `${r.src}:${r.dst}`);
-  const commits = git2(root, ["rev-list", "--count", "--all"]).out.trim();
+  const commits = git3(root, ["rev-list", "--count", "--all"]).out.trim();
   out(`Pushing ${branches.length} branch${branches.length === 1 ? "" : "es"}, ${tags.length} tag${tags.length === 1 ? "" : "s"} (${commits} commits) \u2026
 `);
-  const push2 = git2(root, ["push", "--quiet", "bunshin", ...specs], { allowFail: true });
+  const push2 = git3(root, ["push", "--quiet", "bunshin", ...specs], { allowFail: true });
   if (!push2.ok) throw new Error(`push to Bunshin failed: ${push2.err.trim()}`);
   const info = await client.info(name);
   const want = [...branches, ...tags].map((r) => ({ ref: r.dst, sha: r.sha }));
@@ -8879,7 +9475,7 @@ ${refsToGithub.length} line${refsToGithub.length === 1 ? "" : "s"} in the reposi
     if (refsToGithub.length > 40) out(`  \u2026 and ${refsToGithub.length - 40} more (git grep for ${name})
 `);
   }
-  if (fs25.existsSync(path20.join(root, ".github"))) out(`
+  if (fs27.existsSync(path22.join(root, ".github"))) out(`
 Note: .github/ (Actions, CODEOWNERS, templates) only works on GitHub; Bunshin does not run it.
 `);
   out(`
@@ -8890,7 +9486,7 @@ New machines clone with:             bunshin repo clone ${name}
 }
 async function cmdAttach(args, cwd, out, err) {
   requireHelper();
-  const root = toplevel(path20.resolve(str4(args.flags.path) ?? cwd));
+  const root = toplevel(path22.resolve(str4(args.flags.path) ?? cwd));
   const rs = remotes(root);
   const originUrl = rs.get("origin");
   const name = str4(args.flags.name) ?? args._[1] ?? (originUrl ? repoFromUrl(originUrl) : null);
@@ -8904,9 +9500,9 @@ async function cmdAttach(args, cwd, out, err) {
   }
   const info = await client.info(name);
   if (!info.refs.length) throw new Error(`${name} in Bunshin is empty; import it first (bunshin repo import)`);
-  if (rs.has("bunshin")) git2(root, ["remote", "set-url", "bunshin", url]);
-  else git2(root, ["remote", "add", "bunshin", url]);
-  git2(root, ["fetch", "--quiet", "--tags", "bunshin"]);
+  if (rs.has("bunshin")) git3(root, ["remote", "set-url", "bunshin", url]);
+  else git3(root, ["remote", "add", "bunshin", url]);
+  git3(root, ["fetch", "--quiet", "--tags", "bunshin"]);
   if (originUrl) {
     const behind = [];
     for (const [ref, sha2] of refMap(root, "refs/remotes/origin")) {
@@ -8914,7 +9510,7 @@ async function cmdAttach(args, cwd, out, err) {
       const b = ref.replace("refs/remotes/origin/", "");
       const theirs = info.refs.find((r) => r.ref === `refs/heads/${b}`)?.sha;
       if (!theirs) behind.push(`${b} (missing in Bunshin)`);
-      else if (theirs !== sha2 && !git2(root, ["merge-base", "--is-ancestor", sha2, theirs], { allowFail: true }).ok) behind.push(`${b} (the old origin has commits Bunshin lacks)`);
+      else if (theirs !== sha2 && !git3(root, ["merge-base", "--is-ancestor", sha2, theirs], { allowFail: true }).ok) behind.push(`${b} (the old origin has commits Bunshin lacks)`);
     }
     if (behind.length && !bool3(args.flags.force)) {
       err(`The old origin has work that is not in Bunshin:
@@ -8925,7 +9521,7 @@ Push it to Bunshin first (git push bunshin <branch>), or re-run with --force.
     }
   }
   switchOrigin(root, url, out);
-  const status = git2(root, ["status", "-sb"]).out.split("\n")[0];
+  const status = git3(root, ["status", "-sb"]).out.split("\n")[0];
   out(`${status}
 `);
   return 0;
@@ -8938,12 +9534,12 @@ async function cmdClone(args, cwd, out) {
   const dir = args._[2] ?? name.split("/")[1];
   const r = spawnSync2("git", ["clone", remoteUrl(client.apiUrl, name), dir], { cwd, stdio: "inherit" });
   if (r.status !== 0) return r.status ?? 1;
-  out(`Cloned ${name} into ${path20.resolve(cwd, dir)}
+  out(`Cloned ${name} into ${path22.resolve(cwd, dir)}
 `);
   return 0;
 }
 async function cmdVerify(args, cwd, out, err) {
-  const root = toplevel(path20.resolve(str4(args.flags.path) ?? cwd));
+  const root = toplevel(path22.resolve(str4(args.flags.path) ?? cwd));
   const rs = remotes(root);
   const originUrl = rs.get("origin") ?? "";
   if (!originUrl.startsWith("bunshin::")) throw new Error("origin is not a Bunshin repository (run bunshin repo attach)");
@@ -8964,7 +9560,7 @@ async function cmdVerify(args, cwd, out, err) {
 `);
     }
   }
-  const fsck = git2(root, ["fsck", "--connectivity-only", "--no-dangling"], { allowFail: true });
+  const fsck = git3(root, ["fsck", "--connectivity-only", "--no-dangling"], { allowFail: true });
   if (!fsck.ok) {
     problems++;
     err(`! git fsck: ${fsck.err.trim().split("\n")[0]}
@@ -9054,12 +9650,12 @@ var init_gitrepo = __esm({
     bool3 = (v) => v === true || v === "true";
     remotes = (root) => {
       const m = /* @__PURE__ */ new Map();
-      for (const name of git2(root, ["remote"]).out.split("\n").filter(Boolean)) m.set(name, git2(root, ["remote", "get-url", name]).out.trim());
+      for (const name of git3(root, ["remote"]).out.split("\n").filter(Boolean)) m.set(name, git3(root, ["remote", "get-url", name]).out.trim());
       return m;
     };
     refMap = (root, prefix) => {
       const m = /* @__PURE__ */ new Map();
-      for (const line of git2(root, ["for-each-ref", "--format=%(objectname) %(refname)", prefix]).out.split("\n").filter(Boolean)) {
+      for (const line of git3(root, ["for-each-ref", "--format=%(objectname) %(refname)", prefix]).out.split("\n").filter(Boolean)) {
         const [sha2, ref] = line.split(" ");
         m.set(ref, sha2);
       }
@@ -9106,22 +9702,22 @@ __export(runner_exports, {
   setupText: () => setupText
 });
 import { spawnSync as spawnSync3 } from "node:child_process";
-import fs26 from "node:fs";
+import fs28 from "node:fs";
 import os5 from "node:os";
-import path21 from "node:path";
+import path23 from "node:path";
 function runnerHome(home = process.env.BUNSHIN_RUNNER_HOME || os5.homedir()) {
-  return path21.join(home, ".bunshin", "runner");
+  return path23.join(home, ".bunshin", "runner");
 }
 function readInstalled(home) {
   try {
-    return JSON.parse(fs26.readFileSync(path21.join(runnerHome(home), "config.json"), "utf8"));
+    return JSON.parse(fs28.readFileSync(path23.join(runnerHome(home), "config.json"), "utf8"));
   } catch {
     return null;
   }
 }
 function connection(args, cwd) {
   const saved = readInstalled();
-  const store = saved && path21.resolve(cwd).startsWith(runnerHome()) ? null : Store.discover(cwd);
+  const store = saved && path23.resolve(cwd).startsWith(runnerHome()) ? null : Store.discover(cwd);
   const config = store?.config();
   const key = str5(args.flags.key) || process.env.BUNSHIN_RUNNER_KEY || process.env.BUNSHIN_API_KEY || config?.apiKey || saved?.key || "";
   const apiUrl = (str5(args.flags["api-url"]) || process.env.BUNSHIN_API_URL || config?.apiUrl || saved?.apiUrl || DEFAULT_API).replace(/\/$/, "");
@@ -9181,9 +9777,9 @@ async function runOnce(c, args, out, err) {
     const [job] = await lease(c, args);
     if (!job) break;
     const started = Date.now();
-    const scratch = fs26.mkdtempSync(path21.join(os5.tmpdir(), "bunshin-job-"));
+    const scratch = fs28.mkdtempSync(path23.join(os5.tmpdir(), "bunshin-job-"));
     const res = await askJson(config, { system: job.system, user: job.prompt, schema: job.schema, enforceSchema: false, timeoutMs: 15 * 6e4, maxTokens: 16e3, cwd: scratch }).finally(
-      () => fs26.rmSync(scratch, { recursive: true, force: true })
+      () => fs28.rmSync(scratch, { recursive: true, force: true })
     );
     const model = config.backend === "codex-cli" ? config.codexModel ?? "codex default" : config.backend === "pi-cli" ? config.piModel ?? "pi default" : config.model;
     if (!res.ok) {
@@ -9210,7 +9806,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) {
@@ -9273,24 +9869,24 @@ function renderCheck(id, c) {
 }
 function logAnswer(entry) {
   try {
-    fs26.mkdirSync(runnerHome(), { recursive: true });
-    fs26.appendFileSync(path21.join(runnerHome(), "log.jsonl"), `${JSON.stringify({ at: (/* @__PURE__ */ new Date()).toISOString(), ...entry })}
+    fs28.mkdirSync(runnerHome(), { recursive: true });
+    fs28.appendFileSync(path23.join(runnerHome(), "log.jsonl"), `${JSON.stringify({ at: (/* @__PURE__ */ new Date()).toISOString(), ...entry })}
 `);
   } catch {
   }
 }
 function which(name) {
-  for (const d of [...(process.env.PATH || "").split(path21.delimiter), path21.join(os5.homedir(), ".local", "bin")]) {
-    if (d && fs26.existsSync(path21.join(d, name))) return path21.join(d, name);
+  for (const d of [...(process.env.PATH || "").split(path23.delimiter), path23.join(os5.homedir(), ".local", "bin")]) {
+    if (d && fs28.existsSync(path23.join(d, name))) return path23.join(d, name);
   }
   return null;
 }
 function scheduledCommand(backend) {
-  const node = path21.dirname(process.execPath);
-  const npx = fs26.existsSync(path21.join(node, "npx")) ? path21.join(node, "npx") : which("npx") ?? "npx";
+  const node = path23.dirname(process.execPath);
+  const npx = fs28.existsSync(path23.join(node, "npx")) ? path23.join(node, "npx") : which("npx") ?? "npx";
   const bin = BIN_OF[backend] ? which(BIN_OF[backend]) : null;
-  const dirs = [.../* @__PURE__ */ new Set([node, ...bin ? [path21.dirname(bin)] : [], path21.join(os5.homedir(), ".local", "bin"), "/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin", "/usr/sbin", "/sbin"])];
-  return { argv: [npx, "-y", PKG2, "runner", "--once"], path: dirs.join(path21.delimiter) };
+  const dirs = [.../* @__PURE__ */ new Set([node, ...bin ? [path23.dirname(bin)] : [], path23.join(os5.homedir(), ".local", "bin"), "/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin", "/usr/sbin", "/sbin"])];
+  return { argv: [npx, "-y", PKG2, "runner", "--once"], path: dirs.join(path23.delimiter) };
 }
 function launchdPlist(backend, everyMinutes, home = runnerHome()) {
   const cmd = scheduledCommand(backend);
@@ -9305,8 +9901,8 @@ function launchdPlist(backend, everyMinutes, home = runnerHome()) {
   <dict><key>PATH</key><string>${xml(cmd.path)}</string></dict>
   <key>WorkingDirectory</key><string>${xml(home)}</string>
   <key>StartInterval</key><integer>${everyMinutes * 60}</integer>
-  <key>StandardOutPath</key><string>${xml(path21.join(home, "runner.log"))}</string>
-  <key>StandardErrorPath</key><string>${xml(path21.join(home, "runner.log"))}</string>
+  <key>StandardOutPath</key><string>${xml(path23.join(home, "runner.log"))}</string>
+  <key>StandardErrorPath</key><string>${xml(path23.join(home, "runner.log"))}</string>
   <key>ProcessType</key><string>Background</string>
   <key>LowPriorityIO</key><true/>
 </dict>
@@ -9317,19 +9913,19 @@ function cronLine(backend, everyMinutes, home = runnerHome()) {
   const cmd = scheduledCommand(backend);
   const when = everyMinutes >= 60 ? `17 */${Math.max(1, Math.round(everyMinutes / 60))} * * *` : `*/${everyMinutes} * * * *`;
   const q = (v) => `'${v.replace(/'/g, `'\\''`)}'`;
-  return `${when} cd ${q(home)} && PATH=${q(cmd.path)} ${cmd.argv.map(q).join(" ")} >> ${q(path21.join(home, "runner.log"))} 2>&1 ${CRON_MARK}`;
+  return `${when} cd ${q(home)} && PATH=${q(cmd.path)} ${cmd.argv.map(q).join(" ")} >> ${q(path23.join(home, "runner.log"))} 2>&1 ${CRON_MARK}`;
 }
 function launchAgentsDir(opts) {
-  return opts.launchAgents ?? path21.join(process.env.BUNSHIN_RUNNER_HOME || os5.homedir(), "Library", "LaunchAgents");
+  return opts.launchAgents ?? path23.join(process.env.BUNSHIN_RUNNER_HOME || os5.homedir(), "Library", "LaunchAgents");
 }
 function installSchedule(backend, everyMinutes, opts = {}) {
   const platform = opts.platform ?? process.platform;
   const run2 = opts.run ?? realRun;
   if (platform === "darwin") {
     const dir = launchAgentsDir(opts);
-    const plist = path21.join(dir, `${LAUNCHD_LABEL}.plist`);
-    fs26.mkdirSync(dir, { recursive: true });
-    fs26.writeFileSync(plist, launchdPlist(backend, everyMinutes));
+    const plist = path23.join(dir, `${LAUNCHD_LABEL}.plist`);
+    fs28.mkdirSync(dir, { recursive: true });
+    fs28.writeFileSync(plist, launchdPlist(backend, everyMinutes));
     const domain = `gui/${process.getuid?.() ?? 501}`;
     run2("launchctl", ["bootout", `${domain}/${LAUNCHD_LABEL}`]);
     const r = run2("launchctl", ["bootstrap", domain, plist]);
@@ -9349,10 +9945,10 @@ function removeSchedule(opts = {}) {
   const platform = opts.platform ?? process.platform;
   const run2 = opts.run ?? realRun;
   if (platform === "darwin") {
-    const plist = path21.join(launchAgentsDir(opts), `${LAUNCHD_LABEL}.plist`);
+    const plist = path23.join(launchAgentsDir(opts), `${LAUNCHD_LABEL}.plist`);
     run2("launchctl", ["bootout", `gui/${process.getuid?.() ?? 501}/${LAUNCHD_LABEL}`]);
-    if (!fs26.existsSync(plist)) return "no schedule";
-    fs26.rmSync(plist, { force: true });
+    if (!fs28.existsSync(plist)) return "no schedule";
+    fs28.rmSync(plist, { force: true });
     return `removed ${plist}`;
   }
   const current = run2("crontab", ["-l"]);
@@ -9379,10 +9975,10 @@ async function install(args, cwd, out, err, opts = {}) {
   }
   const every = Math.max(15, Number(str5(args.flags.every) ?? 60) || 60);
   const home = runnerHome();
-  fs26.mkdirSync(home, { recursive: true, mode: 448 });
+  fs28.mkdirSync(home, { recursive: true, mode: 448 });
   const saved = { apiUrl: c.apiUrl, key: c.key, backend, ...config.model && str5(args.flags.model) ? { model: config.model } : {}, name: c.name, every };
-  fs26.writeFileSync(path21.join(home, "config.json"), JSON.stringify(saved, null, 2) + "\n", { mode: 384 });
-  fs26.chmodSync(path21.join(home, "config.json"), 384);
+  fs28.writeFileSync(path23.join(home, "config.json"), JSON.stringify(saved, null, 2) + "\n", { mode: 384 });
+  fs28.chmodSync(path23.join(home, "config.json"), 384);
   let schedule;
   try {
     schedule = installSchedule(backend, every, opts);
@@ -9395,7 +9991,7 @@ Run it yourself: npx -y ${PKG2} runner --once
   out(`\u2713 Runner "${c.name}" answers ${c.apiUrl}'s model jobs with ${BACKEND_NAME[backend] ?? backend} on this computer.
 `);
   out(schedule.kind === "none" ? `  No scheduler here: run \`npx -y ${PKG2} runner --once\` on a schedule yourself.
-` : `  Every ${every} minutes while this computer is on (${schedule.kind}). Log: ${path21.join(home, "runner.log")}
+` : `  Every ${every} minutes while this computer is on (${schedule.kind}). Log: ${path23.join(home, "runner.log")}
 `);
   out(`  Stop: npx -y ${PKG2} runner uninstall
 `);
@@ -9412,9 +10008,9 @@ Answering what waits now\u2026
 function uninstall(out, opts = {}) {
   out(`${removeSchedule(opts)}
 `);
-  const file = path21.join(runnerHome(), "config.json");
-  if (fs26.existsSync(file)) {
-    fs26.rmSync(file, { force: true });
+  const file = path23.join(runnerHome(), "config.json");
+  if (fs28.existsSync(file)) {
+    fs28.rmSync(file, { force: true });
     out(`removed ${file} (revoke the key in the console: Agent keys)
 `);
   }
@@ -9594,7 +10190,7 @@ async function cmdRunner(args, cwd, out, err, opts = {}) {
       out(text2);
       return 0;
     }
-    fs26.writeFileSync(file, text2, { mode: 384 });
+    fs28.writeFileSync(file, text2, { mode: 384 });
     const left = Math.round((Date.parse(job.leaseUntil) - Date.now()) / 6e4);
     out(
       [
@@ -9612,7 +10208,7 @@ async function cmdRunner(args, cwd, out, err, opts = {}) {
     const id = args._[2];
     const file = args._[3] ?? "-";
     if (!id) throw new Error("usage: bunshin runner validate <job id> <file|->");
-    const text2 = file === "-" ? fs26.readFileSync(0, "utf8") : fs26.readFileSync(file, "utf8");
+    const text2 = file === "-" ? fs28.readFileSync(0, "utf8") : fs28.readFileSync(file, "utf8");
     const r = await call(c, "POST", `/jobs/${id}/check`, { answer: text2, runner: c.name }, 12e4);
     out(renderCheck(id, r.body));
     return r.body.ok ? 0 : 1;
@@ -9621,7 +10217,7 @@ async function cmdRunner(args, cwd, out, err, opts = {}) {
     const id = args._[2];
     const file = args._[3] ?? "-";
     if (!id) throw new Error("usage: bunshin runner submit <job id> <file|-> [--force]");
-    const text2 = file === "-" ? fs26.readFileSync(0, "utf8") : fs26.readFileSync(file, "utf8");
+    const text2 = file === "-" ? fs28.readFileSync(0, "utf8") : fs28.readFileSync(file, "utf8");
     const check = await call(c, "POST", `/jobs/${id}/check`, { answer: text2, runner: c.name }, 12e4).catch(() => null);
     if (check?.body && (check.status < 400 || check.body.problems)) {
       out(renderCheck(id, check.body));
@@ -9645,7 +10241,7 @@ async function cmdRunner(args, cwd, out, err, opts = {}) {
     const since = Date.parse(str5(args.flags.since) ?? "") || Date.now() - 12 * 36e5;
     const entries = (() => {
       try {
-        return fs26.readFileSync(path21.join(runnerHome(), "log.jsonl"), "utf8").split("\n").filter(Boolean).map((l) => JSON.parse(l)).filter((e) => Date.parse(e.at) >= since);
+        return fs28.readFileSync(path23.join(runnerHome(), "log.jsonl"), "utf8").split("\n").filter(Boolean).map((l) => JSON.parse(l)).filter((e) => Date.parse(e.at) >= since);
       } catch {
         return [];
       }
@@ -9698,7 +10294,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";
@@ -9714,9 +10310,9 @@ var init_runner = __esm({
 });
 
 // src/v2/importer.ts
-import { execFileSync as execFileSync3 } from "node:child_process";
-import fs27 from "node:fs";
-import path22 from "node:path";
+import { execFileSync as execFileSync6 } from "node:child_process";
+import fs29 from "node:fs";
+import path24 from "node:path";
 function rewriteRepoPaths(text2, repoName2, pack) {
   const re = new RegExp(`(?<=^|[\\s\`'"(=:])(?:~|\\$\\{?[A-Za-z_][A-Za-z0-9_]*\\}?)?(?:/[\\w.@+-]+)*/${escapeRe(repoName2)}(?=[/\\s\`'")\\]]|[.,;:](?:\\s|$)|$)`, "gm");
   return text2.replace(re, `~/.bunshin/library/${pack}`);
@@ -9755,7 +10351,7 @@ function buildDocs(files, opts) {
     const main2 = `${dir}/SKILL.md`;
     const text2 = rw(files.get(main2).content);
     const fm = frontmatterDescription(text2);
-    const name = path22.posix.basename(dir);
+    const name = path24.posix.basename(dir);
     const bundle = {};
     for (const p of all.filter((x) => x.startsWith(`${dir}/`))) {
       claimed.add(p);
@@ -9837,45 +10433,45 @@ ${Object.keys(loose).map((p) => `- \`${p}\``).join("\n")}
   }
   return docs.sort((a, b) => a.path.localeCompare(b.path));
 }
-function git3(root, args) {
-  return execFileSync3("git", ["-C", root, ...args], { encoding: "utf8", maxBuffer: 256 * 1024 * 1024 });
+function git4(root, args) {
+  return execFileSync6("git", ["-C", root, ...args], { encoding: "utf8", maxBuffer: 256 * 1024 * 1024 });
 }
 function gitBuf(root, args) {
-  return execFileSync3("git", ["-C", root, ...args], { maxBuffer: 256 * 1024 * 1024 });
+  return execFileSync6("git", ["-C", root, ...args], { maxBuffer: 256 * 1024 * 1024 });
 }
 function isGitRepo(root) {
   try {
-    return git3(root, ["rev-parse", "--is-inside-work-tree"]).trim() === "true";
+    return git4(root, ["rev-parse", "--is-inside-work-tree"]).trim() === "true";
   } catch {
     return false;
   }
 }
 function workingTreeFiles(root) {
   const out = /* @__PURE__ */ new Map();
-  const list2 = isGitRepo(root) ? git3(root, ["ls-files", "-z"]).split("\0").filter(Boolean) : (function walk(dir, base = "") {
-    return fs27.readdirSync(dir, { withFileTypes: true }).flatMap((e) => {
+  const list2 = isGitRepo(root) ? git4(root, ["ls-files", "-z"]).split("\0").filter(Boolean) : (function walk(dir, base = "") {
+    return fs29.readdirSync(dir, { withFileTypes: true }).flatMap((e) => {
       if (e.name === ".git" || e.name === "node_modules") return [];
       const rel = base ? `${base}/${e.name}` : e.name;
-      return e.isDirectory() ? walk(path22.join(dir, e.name), rel) : e.isFile() ? [rel] : [];
+      return e.isDirectory() ? walk(path24.join(dir, e.name), rel) : e.isFile() ? [rel] : [];
     });
   })(root);
   for (const rel of list2) {
-    const abs = path22.join(root, rel);
+    const abs = path24.join(root, rel);
     let buf;
     try {
-      buf = fs27.readFileSync(abs);
+      buf = fs29.readFileSync(abs);
     } catch {
       continue;
     }
     if (!isText(buf)) continue;
-    const exec = (fs27.statSync(abs).mode & 73) !== 0;
+    const exec = (fs29.statSync(abs).mode & 73) !== 0;
     out.set(rel, { content: buf.toString("utf8"), ...exec ? { mode: "x" } : {} });
   }
   return out;
 }
 function commitsOf(root, since) {
   const range = since ? [`${since}..HEAD`] : ["HEAD"];
-  return git3(root, ["log", "--reverse", "--topo-order", "--format=%H%x1f%an%x1f%aI%x1f%s", ...range]).split("\n").filter(Boolean).map((l) => {
+  return git4(root, ["log", "--reverse", "--topo-order", "--format=%H%x1f%an%x1f%aI%x1f%s", ...range]).split("\n").filter(Boolean).map((l) => {
     const [sha2, author, at, subject] = l.split("");
     return { sha: sha2, author, at, subject: subject ?? "" };
   });
@@ -9888,7 +10484,7 @@ function readAt(root, sha2, rel, mode) {
 }
 function treeAt(root, sha2) {
   const out = /* @__PURE__ */ new Map();
-  for (const line of git3(root, ["ls-tree", "-r", "-z", sha2]).split("\0").filter(Boolean)) {
+  for (const line of git4(root, ["ls-tree", "-r", "-z", sha2]).split("\0").filter(Boolean)) {
     const m = /^(\d+) blob [0-9a-f]+\t(.+)$/.exec(line);
     if (!m) continue;
     const f = readAt(root, sha2, m[2], m[1]);
@@ -9902,7 +10498,7 @@ function diffDocs(prev, next) {
   return { docs: next.filter((d) => before.get(d.path) !== fingerprint(d)), removed: [...before.keys()].filter((p) => !after.has(p)) };
 }
 function readSkillSystem(root, opts) {
-  const repoName2 = path22.basename(path22.resolve(root));
+  const repoName2 = path24.basename(path24.resolve(root));
   const build = (files2) => buildDocs(files2, { pack: opts.pack, repoName: repoName2, ...opts.rewrite === false ? { rewrite: false } : {} });
   const tree = build(workingTreeFiles(root));
   if (!opts.history || !isGitRepo(root)) return { versions: [{ summary: `import ${opts.pack}`, docs: tree, removed: [], complete: true }], docs: tree };
@@ -9914,7 +10510,7 @@ function readSkillSystem(root, opts) {
   commits.forEach((c, i) => {
     if (!prevSha) files = treeAt(root, c.sha);
     else {
-      const changes = git3(root, ["diff-tree", "-r", "-z", "--no-renames", "--no-commit-id", prevSha, c.sha]).split("\0").filter(Boolean);
+      const changes = git4(root, ["diff-tree", "-r", "-z", "--no-renames", "--no-commit-id", prevSha, c.sha]).split("\0").filter(Boolean);
       for (let k = 0; k + 1 < changes.length; k += 2) {
         const m = /^:\d+ (\d+) [0-9a-f]+ [0-9a-f]+ ([A-Z])/.exec(changes[k]);
         const rel = changes[k + 1];
@@ -9979,7 +10575,7 @@ var init_importer = __esm({
     escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     looksGenerated = (text2) => /generated by|do not edit( by hand)?/i.test(text2.slice(0, 600));
     isStopHook = (text2) => /"decision"\s*:\s*"block"|decision.{0,4}block/.test(text2) && /REASON=/.test(text2);
-    isUpdateHook = (p, text2) => /auto-?update/i.test(path22.basename(p)) || /git (pull|fetch)/.test(text2) && /SessionStart|session start/i.test(text2);
+    isUpdateHook = (p, text2) => /auto-?update/i.test(path24.basename(p)) || /git (pull|fetch)/.test(text2) && /SessionStart|session start/i.test(text2);
     fingerprint = (d) => JSON.stringify(d);
     REWRITE_SYSTEM = `You adapt a company's skill documents after its skill system moved into Bunshin.
 
@@ -10015,8 +10611,8 @@ __export(skills_exports, {
   cmdSkill: () => cmdSkill,
   parsePin: () => parsePin
 });
-import fs28 from "node:fs";
-import path23 from "node:path";
+import fs30 from "node:fs";
+import path25 from "node:path";
 function requireOnline(store, what) {
   if (!canCall(store.config())) throw new Error(`${what} needs the hosted library: run \`bunshin setup\` first`);
 }
@@ -10025,9 +10621,9 @@ async function cmdImport2(store, args, cwd, out, err) {
     err("usage: bunshin import skills <dir> [--pack <name>] [--layer org|team:<unit>] [--owner-team <unit>] [--no-history] [--dry-run] [--propose-rewrites]\n");
     return 1;
   }
-  const root = path23.resolve(cwd, args._[2]);
-  if (!fs28.existsSync(root)) throw new Error(`${root} does not exist`);
-  const pack = str6(args.flags.pack) ?? path23.basename(root);
+  const root = path25.resolve(cwd, args._[2]);
+  if (!fs30.existsSync(root)) throw new Error(`${root} does not exist`);
+  const pack = str6(args.flags.pack) ?? path25.basename(root);
   const history = args.flags.history !== false && !bool4(args.flags["no-history"]);
   const read = readSkillSystem(root, { pack, history, ...str6(args.flags.since) ? { since: str6(args.flags.since) } : {} });
   const kinds = /* @__PURE__ */ new Map();
@@ -10062,7 +10658,7 @@ async function cmdImport2(store, args, cwd, out, err) {
   const propose = args.flags["propose-rewrites"];
   if (propose) {
     const only = typeof propose === "string" && propose !== "true" ? propose.split(",").map((x) => x.trim()).filter(Boolean) : [];
-    await proposeRewrites(store, read.docs.filter((d) => !only.length || only.some((o) => d.path.includes(o))), pack, path23.basename(root), out, err);
+    await proposeRewrites(store, read.docs.filter((d) => !only.length || only.some((o) => d.path.includes(o))), pack, path25.basename(root), out, err);
   }
   out("Run `bunshin sync` on each machine (it runs at session start) to install the skills, instructions and files.\n");
   return 0;
@@ -10202,7 +10798,7 @@ ${report.skills} skills, ${report.references} references, ${report.errors.length
       }
       const graph = str6(args.flags.graph) ?? (bool4(args.flags.graph) ? "SKILLS-GRAPH.md" : void 0);
       if (graph) {
-        fs28.writeFileSync(path23.resolve(cwd, graph), renderSkillGraph(report));
+        fs30.writeFileSync(path25.resolve(cwd, graph), renderSkillGraph(report));
         out(`graph written to ${graph}
 `);
       }
@@ -10269,12 +10865,12 @@ async function cmdLibrary(store, args, cwd, out, err) {
     }
     case "status": {
       const d = deployedState(config);
-      const p = deployPaths();
+      const p = deployPaths(process.env, config.orgId);
       const pending = d.docs.filter((x) => x.pending);
       out(`deployed: ${d.libraryVersion ? `lib@${d.libraryVersion}` : "nothing yet"}; ${d.docs.filter((x) => x.kind === "skill").length} skills, ${d.docs.filter((x) => x.kind === "instructions").length} instruction documents, ${d.docs.filter((x) => x.kind === "pack").length} pack documents
 `);
-      out(`  skills:        ${p.claudeSkills}, ${p.codexSkills}
-  instructions:  ${p.claudeMd}, ${p.agentsMd}
+      out(`  skills:        ${p.claudeSkills}, ${p.codexSkills} (this workspace's own copy)
+  linked into:   ${d.linked.length ? d.linked.join(", ") : "no project yet (each project gets links when a session runs there)"}
   files:         ${p.library}
 `);
       for (const x of pending) out(`  edited here, awaiting the nightly: ${x.name}
@@ -10282,16 +10878,7 @@ async function cmdLibrary(store, args, cwd, out, err) {
       return 0;
     }
     case "workspace": {
-      const target = args._[2];
-      if (bool4(args.flags.clear)) setDeployWorkspace(null);
-      else if (target) setDeployWorkspace(target);
-      const ws = deployWorkspace();
-      const p = deployPaths();
-      out(ws ? `workspace: ${ws}
-` : "workspace: none (skills and instructions are user-wide)\n");
-      out(`  skills:        ${p.claudeSkills}, ${p.codexSkills}
-  instructions:  ${p.claudeMd}, ${p.agentsMd}
-`);
+      out("Skills no longer go to one shared folder: each workspace keeps its own copy and links it into the projects its sessions run in, so they never reach another workspace's projects. See `bunshin library status`.\n");
       return 0;
     }
     case "pin": {
@@ -10301,9 +10888,9 @@ async function cmdLibrary(store, args, cwd, out, err) {
 `;
       const file = str6(args.flags.write) ?? (bool4(args.flags.write) ? ".claude/skills-version" : void 0);
       if (file) {
-        const abs = path23.resolve(cwd, file);
-        fs28.mkdirSync(path23.dirname(abs), { recursive: true });
-        fs28.writeFileSync(abs, line);
+        const abs = path25.resolve(cwd, file);
+        fs30.mkdirSync(path25.dirname(abs), { recursive: true });
+        fs30.writeFileSync(abs, line);
         out(`${file}: ${line}`);
       } else out(line);
       return 0;
@@ -10313,12 +10900,12 @@ async function cmdLibrary(store, args, cwd, out, err) {
       const to = str6(args.flags.to);
       if (!to) throw new Error("--to <dir> is required");
       const pinFile = str6(args.flags.pin);
-      const pin = str6(args.flags.git) ? { git: str6(args.flags.git) } : pinFile ? parsePin(fs28.readFileSync(path23.resolve(cwd, pinFile), "utf8")) : parsePin(args._[2] ?? "");
+      const pin = str6(args.flags.git) ? { git: str6(args.flags.git) } : pinFile ? parsePin(fs30.readFileSync(path25.resolve(cwd, pinFile), "utf8")) : parsePin(args._[2] ?? "");
       const q = pin.git ? `git=${pin.git}` : pin.version ? `version=${pin.version}` : "";
       if (!q) throw new Error("name a version: lib@N, --git <sha>, or --pin <file>");
       const snap = await v2api(config, "GET", `/library/snapshot?${q}`, void 0, { timeoutMs: 12e4 });
-      const dir = path23.resolve(cwd, to);
-      if (fs28.existsSync(dir) && fs28.readdirSync(dir).length && !bool4(args.flags.force)) throw new Error(`${dir} is not empty (use --force)`);
+      const dir = path25.resolve(cwd, to);
+      if (fs30.existsSync(dir) && fs30.readdirSync(dir).length && !bool4(args.flags.force)) throw new Error(`${dir} is not empty (use --force)`);
       const pack = str6(args.flags.pack);
       const docs = snap.sections.filter((s) => !pack || s.pack === pack);
       const res = materialize(docs, dir);
@@ -10357,27 +10944,27 @@ __export(reflect_exports, {
   buildLesson: () => buildLesson,
   runReflection: () => runReflection
 });
-import fs29 from "node:fs";
-import path24 from "node:path";
-import { createHash as createHash8 } from "node:crypto";
+import fs31 from "node:fs";
+import path26 from "node:path";
+import { createHash as createHash9 } from "node:crypto";
 async function runReflection(store, opts) {
   const empty = { lessonIds: [], used: [], missed: [], attribution: [] };
-  const lock = path24.join(store.root, `reflect-${createHash8("sha256").update(opts.sessionId).digest("hex")}.lock`);
+  const lock = path26.join(store.root, `reflect-${createHash9("sha256").update(opts.sessionId).digest("hex")}.lock`);
   const deadline = Date.now() + 66e4;
   for (; ; ) {
     try {
-      fs29.writeFileSync(lock, String(process.pid), { flag: "wx", mode: 384 });
+      fs31.writeFileSync(lock, String(process.pid), { flag: "wx", mode: 384 });
       break;
     } catch (error) {
       if (error.code !== "EEXIST") throw error;
       try {
-        const owner = Number(fs29.readFileSync(lock, "utf8"));
+        const owner = Number(fs31.readFileSync(lock, "utf8"));
         if (Number.isInteger(owner) && owner > 0) {
           try {
             process.kill(owner, 0);
           } catch (error2) {
             if (error2.code === "ESRCH") {
-              fs29.unlinkSync(lock);
+              fs31.unlinkSync(lock);
               continue;
             }
           }
@@ -10392,7 +10979,7 @@ async function runReflection(store, opts) {
     return await reflectSession(store, opts);
   } finally {
     try {
-      fs29.unlinkSync(lock);
+      fs31.unlinkSync(lock);
     } catch {
     }
   }
@@ -10734,11 +11321,11 @@ __export(cli_exports, {
   parseArgs: () => parseArgs,
   version: () => version
 });
-import fs30 from "node:fs";
-import path25 from "node:path";
+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 === "--") {
@@ -10835,7 +11422,7 @@ async function main(argv, opts = {}) {
       if (harness !== "codex" && harness !== "claude-code" && harness !== "pi") throw new Error("Choose your agent: bunshin setup --harness codex, claude-code, or pi.");
       const agent = harness === "claude-code" ? "claude" : harness;
       if (!executable2(agent)) throw new Error(`${agent} was not found. Install and sign in to your agent, then run setup again.`);
-      const prior = new Store(path25.join(cwd, ".bunshin"));
+      const prior = new Store(path27.join(cwd, ".bunshin"));
       const existing = prior.trusted ? prior.config() : { apiUrl: "", apiKey: void 0 };
       const apiUrl = str7(args.flags["api-url"]);
       const key = bool5(args.flags["key-stdin"]) ? await new Promise((resolve, reject) => {
@@ -10847,23 +11434,45 @@ async function main(argv, opts = {}) {
         process.stdin.on("end", () => resolve(value.trim()));
         process.stdin.on("error", reject);
       }) : process.env.BUNSHIN_API_KEY || (!apiUrl || apiUrl === existing.apiUrl) && existing.apiKey || await readKey2();
+      const hooksFlag = str7(args.flags.hooks);
+      if (hooksFlag && hooksFlag !== "user" && hooksFlag !== "project") throw new Error("--hooks must be user (every session under this folder) or project (this folder only)");
+      const only = str7(args.flags.only);
+      const exclude = str7(args.flags.exclude);
+      const listed = (v) => v.split(",").map((x) => x.trim().replace(/\/+$/, "")).filter(Boolean);
       out("Connecting to Bunshin\u2026\n");
-      const result = await setupProject2({ cwd, harness, apiKey: key, apiUrl, noHooks: bool5(args.flags["no-hooks"]) });
+      const result = await setupProject2({
+        cwd,
+        harness,
+        apiKey: key,
+        apiUrl,
+        noHooks: bool5(args.flags["no-hooks"]),
+        ...hooksFlag ? { hooks: hooksFlag } : {},
+        ...bool5(args.flags.all) ? { sources: null } : only || exclude ? { sources: { ...only ? { only: listed(only) } : {}, ...exclude ? { exclude: listed(exclude) } : {} } } : {}
+      });
+      if (result.config.hooks === "user" && !only && !exclude && !bool5(args.flags.all) && process.stdin.isTTY && !bool5(args.flags["key-stdin"])) {
+        const { askSources: askSources2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
+        await askSources2(new Store(path27.join(cwd, ".bunshin")), out);
+      }
       out(`Connected as ${result.profile.role}${result.profile.orgUnit ? ` in ${result.profile.orgUnit}` : " (company-wide)"}.
 `);
-      out(`Project: ${cwd}
+      out(result.config.hooks === "user" ? `Folder: ${cwd} (every session in it or below it uses this workspace)
+Key saved privately outside the folder.
+` : `Project: ${cwd}
 Key saved privately outside the project.
 `);
       if (result.hooks?.error) throw new Error(`Connected, but hooks could not be configured: ${result.hooks.error}. Fix the file and run setup again.`);
       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})
 `);
       if (result.hooks?.sharedWithWorktrees) out("Codex shares these hooks with the repository\u2019s linked worktrees. Each connected worktree keeps its own Bunshin store.\n");
       if (harness === "codex" && result.hooks) out("Run codex interactively in this project. Review and accept project trust, then run /hooks and review and trust the five Bunshin hooks.\n");
       else if (harness === "pi" && result.hooks) out("Open Pi in this project and approve its project extension. Check it with /bunshin status.\n");
+      else if (result.hooks && result.config.hooks === "user") out("Open a new Claude Code session in any project under this folder to load the hooks. Sessions elsewhere are untouched.\nChange which folders take part with: bunshin sources\n");
       else if (result.hooks) out(`Open a new Claude Code session in this project to load the hooks${result.mcp?.installed ? " and approve the bunshin MCP server (.mcp.json)" : ""}.
 `);
       else out("Hooks are disabled. Run setup again without --no-hooks to configure them.\n");
@@ -10879,7 +11488,7 @@ Key saved privately outside the project.
   if (cmd === "mcp") {
     const { runMcpServer: runMcpServer2 } = await Promise.resolve().then(() => (init_mcp(), mcp_exports));
     const root = str7(args.flags.root);
-    await runMcpServer2({ cwd, ...root ? { store: new Store(path25.resolve(root)) } : {}, version: version() });
+    await runMcpServer2({ cwd, ...root ? { store: new Store(path27.resolve(root)) } : {}, version: version() });
     return 0;
   }
   if (cmd === "demo") {
@@ -10906,6 +11515,14 @@ Key saved privately outside the project.
   }
   if (skipped.length && cmd === "status") err(`! ${untrustedNote(skipped[0])}
 `);
+  if (["learn", "reflect", "recall", "load", "suggest"].includes(cmd) && !str7(args.flags.root)) {
+    const { cwdInPool: cwdInPool2, topFolder: topFolder2 } = await Promise.resolve().then(() => (init_source(), source_exports));
+    if (!cwdInPool2(store.config(), cwd, store.root)) {
+      err(`bunshin: ${topFolder2(cwd, store.root)} is not part of this store's learning pool. Add it with \`bunshin sources include ${topFolder2(cwd, store.root)}\`.
+`);
+      return 1;
+    }
+  }
   try {
     switch (cmd) {
       case "status":
@@ -10957,6 +11574,9 @@ Key saved privately outside the project.
         return await (await Promise.resolve().then(() => (init_skills(), skills_exports))).cmdLibrary(store, args, cwd, out, err);
       case "ui":
         return await (await Promise.resolve().then(() => (init_uicmd(), uicmd_exports))).cmdUi(store, args, out, err, version());
+      case "sources":
+      case "source":
+        return (await Promise.resolve().then(() => (init_commands(), commands_exports))).cmdSources(store, args, cwd, out, err);
       default:
         err(`bunshin: unknown command "${cmd}"
 
@@ -10972,7 +11592,7 @@ ${HELP2}`);
 function openStore(args, cwd) {
   const root = str7(args.flags.root);
   if (root) {
-    const store = new Store(path25.resolve(root));
+    const store = new Store(path27.resolve(root));
     store.ensureLayout();
     return store;
   }
@@ -10988,7 +11608,7 @@ async function cmdInit(args, cwd, out, err) {
     orgId: str7(args.flags["org-id"]),
     userId: str7(args.flags["user-id"]),
     apiUrl: str7(args.flags["api-url"]),
-    apiKey: bool5(args.flags["key-stdin"]) ? fs30.readFileSync(0, "utf8").trim() || void 0 : str7(args.flags["api-key"]),
+    apiKey: bool5(args.flags["key-stdin"]) ? fs32.readFileSync(0, "utf8").trim() || void 0 : str7(args.flags["api-key"]),
     scope: bool5(args.flags.global) ? "global" : str7(args.flags.scope),
     harness,
     noHooks: args.flags.hooks === false || bool5(args.flags["no-hooks"]),
@@ -11031,10 +11651,10 @@ function cmdStatus(store, args, out, v2) {
   const conflicts = store.listConflicts().filter((c) => c.status === "open");
   const metrics = store.readMetrics(void 0);
   const last50 = metrics?.windows?.find((w) => w.name === "last50");
-  const hookFiles = config.harness === "codex" ? [.../* @__PURE__ */ new Set([path25.join(process.env.CODEX_HOME ?? path25.join(homeDir(), ".codex"), "hooks.json"), codexProjectHooks(path25.dirname(store.root)).file])] : config.harness === "claude-code" ? [path25.join(homeDir(), ".claude", "settings.json"), path25.join(path25.dirname(store.root), ".claude", "settings.local.json")] : config.harness === "pi" ? [path25.join(homeDir(), ".pi/agent/extensions/bunshin.js"), path25.join(path25.dirname(store.root), ".pi/extensions/bunshin.js")] : [];
+  const hookFiles = config.harness === "codex" ? [.../* @__PURE__ */ new Set([path27.join(process.env.CODEX_HOME ?? path27.join(homeDir(), ".codex"), "hooks.json"), codexProjectHooks(path27.dirname(store.root)).file])] : config.harness === "claude-code" ? [path27.join(homeDir(), ".claude", "settings.json"), path27.join(path27.dirname(store.root), ".claude", "settings.local.json")] : config.harness === "pi" ? [path27.join(homeDir(), ".pi/agent/extensions/bunshin.js"), path27.join(path27.dirname(store.root), ".pi/extensions/bunshin.js")] : [];
   const hooks = config.harness === "pi" ? hookFiles.filter((file) => {
     try {
-      return fs30.readFileSync(file, "utf8").startsWith("// Managed by Bunshin setup.");
+      return fs32.readFileSync(file, "utf8").startsWith("// Managed by Bunshin setup.");
     } catch {
       return false;
     }
@@ -11052,7 +11672,7 @@ function cmdStatus(store, args, out, v2) {
     mothership: config.apiUrl ? { apiUrl: config.apiUrl, key: config.apiKey ? "set" : "missing", lastSyncAt: config.lastSyncAt ?? null } : null,
     llmBackend: resolveBackend(config) ?? "none (set ANTHROPIC_API_KEY or install the claude/codex CLI)",
     hooks: { [config.harness]: hooks },
-    hookFiles: hookFiles.filter((file) => fs30.existsSync(file)),
+    hookFiles: hookFiles.filter((file) => fs32.existsSync(file)),
     recallQuality: last50 ? { precision: last50.precision, recall: last50.recall, f1: last50.f1, traces: last50.traces } : null,
     v2
   };
@@ -11068,6 +11688,8 @@ function cmdStatus(store, args, out, v2) {
   out(`user         ${config.userId} \u2014 ${config.role} @ ${config.orgUnit} (org ${config.orgId})
 `);
   out(`context      ${v2.context.id} (${v2.context.kind}; layers ${v2.context.layers.join(", ")})
+`);
+  if (v2.source) out(`source       ${!v2.source.inPool ? `${v2.source.folder} is outside the learning pool (\`bunshin sources\`)` : v2.source.id ?? "none (the store's own folder)"}
 `);
   out(`library      ${v2.bundle ? `${v2.bundle.sections} bundle section(s), generated ${v2.bundle.generatedAt}` : "no bundle yet"}; ${v2.repo.sections} working-tree section(s)${v2.repo.name ? ` in ${v2.repo.name}` : ""}
 `);
@@ -11093,7 +11715,7 @@ function cmdStatus(store, args, out, v2) {
 }
 function hookCount(file) {
   try {
-    const raw = JSON.parse(fs30.readFileSync(file, "utf8"));
+    const raw = JSON.parse(fs32.readFileSync(file, "utf8"));
     let n = 0;
     for (const groups of Object.values(raw.hooks ?? {})) {
       for (const g of groups ?? []) {
@@ -11213,7 +11835,7 @@ function cmdLessonAdd(store, args, out, err) {
   let content = str7(args.flags.content) ?? "";
   if (!content || content === "-" || args._.includes("-")) {
     try {
-      content = fs30.readFileSync(0, "utf8");
+      content = fs32.readFileSync(0, "utf8");
     } catch {
     }
   }
@@ -11279,7 +11901,7 @@ async function cmdReflect(store, args, cwd, out, err) {
   }
   const { runReflection: runReflection2 } = await Promise.resolve().then(() => (init_reflect4(), reflect_exports));
   const result = await runReflection2(store, {
-    sessionId: str7(args.flags.session) ?? path25.basename(transcript).replace(/\.jsonl?$/, ""),
+    sessionId: str7(args.flags.session) ?? path27.basename(transcript).replace(/\.jsonl?$/, ""),
     transcriptPath: transcript,
     cwd,
     force: bool5(args.flags.force)
@@ -11404,6 +12026,10 @@ Usage: bunshin <command> [options]
   setup --harness codex|claude-code|pi   connect this project to your hosted workspace
     --api-url <url> --no-hooks    paste the key at the hidden prompt; profile is read from Bunshin
     --key-stdin                  read the key from stdin (for automated setup)
+    --hooks user                 a folder of projects: hooks in your user settings, so every
+                                 session under this folder uses its workspace (default: project)
+    --only a,b | --exclude c | --all
+                                 which of the folder's projects take part (asked when omitted)
   setup --robot --robot-id <id> --arm so101 --gripper <g> --mount <m> --cameras scene,wrist
         --domain <d> --site <s> --cell <c> [--depth] [--api-url <url>] [--harness claude-code]
                                 register this machine as a robot context (x-bunshin-context)
@@ -11413,10 +12039,14 @@ Usage: bunshin <command> [options]
     --harness claude-code|codex|pi|other  --no-hooks  --remove-hooks
 
   status [--json]               store, context, library, outbox, hooks and sync health
-  recall "<task, abstractly>" [--hypothetical "<lesson>"] [--id a,b] [--limit n] [--json]
-                                pull candidates from the library (offline: local view)
+  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] [--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>]]
@@ -11436,9 +12066,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
@@ -11449,9 +12078,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
@@ -11475,7 +12104,7 @@ Global: --root <dir> (use this .bunshin store)  --version  --help
 Env: BUNSHIN_API_KEY, BUNSHIN_HARNESS, BUNSHIN_DISABLE, BUNSHIN_CHILD, BUNSHIN_CLAUDE_BIN,
      CLAUDE_CODE_SESSION_ID (learn / mcp session), ANTHROPIC_API_KEY (non-fork reflection)
 `;
-    untrustedNote = (root) => `${root} was not created by you (e.g. it is committed to the repository), so Bunshin ignores it. If it is yours, run \`bunshin setup\` (or \`bunshin init\`) in ${path25.dirname(root)} to trust it.`;
+    untrustedNote = (root) => `${root} was not created by you (e.g. it is committed to the repository), so Bunshin ignores it. If it is yours, run \`bunshin setup\` (or \`bunshin init\`) in ${path27.dirname(root)} to trust it.`;
   }
 });