@bunshin-cc/bunshin 0.8.0 → 0.8.1

package/dist/bin.js

@@ -1127,6 +1127,23 @@ function scopePath(tree, source) {
 function inBoundary(section, reader) {
   return !isScopeLayer(section.layer) || reader.layers.includes(section.layer);
 }
+function parentScope(tree, layer) {
+  const k = layerKind(layer);
+  if (k === "source") {
+    const g = tree.sources[layerValue(layer)]?.group ?? null;
+    return g && tree.groups.some((x) => x.id === g) ? groupLayer(g) : "org";
+  }
+  if (k === "group") {
+    const g = tree.groups.find((x) => x.id === layerValue(layer));
+    return g?.parent && tree.groups.some((x) => x.id === g.parent) ? groupLayer(g.parent) : "org";
+  }
+  return null;
+}
+function ancestorScopes(tree, layer) {
+  const out = [];
+  for (let cur = parentScope(tree, layer); cur && !out.includes(cur); cur = parentScope(tree, cur)) out.push(cur);
+  return out;
+}
 function sourcesIn(tree, layer) {
   if (layer === "org") return Object.keys(tree.sources);
   if (layerKind(layer) === "source") return [layerValue(layer)];
@@ -1172,13 +1189,11 @@ function layerValue(layer) {
   const i = layer.indexOf(":");
   return i < 0 ? "" : layer.slice(i + 1);
 }
+function privateLayer(ctx) {
+  return ctx.kind === "robot" ? `robot:${ctx.id}` : `user:${ctx.userId}`;
+}
 function layersFor(ctx) {
-  if (ctx.kind === "robot" && ctx.robot) {
-    return ["fleet", `arm:${ctx.robot.armModel}`, `mount:${ctx.robot.mount}`, `robot:${ctx.id}`];
-  }
-  const team = ctx.person?.team ?? "";
-  const dept = department(team);
-  return ["org", ...dept ? [`dept:${dept}`] : [], ...team ? [`team:${team}`] : [], `user:${ctx.userId}`];
+  return ["org", privateLayer(ctx)];
 }
 function isLocalLayer(layer) {
   const kind = layerKind(layer);
@@ -1191,6 +1206,7 @@ function withScope(layers, scope) {
   return i < 0 ? [...layers, ...path28] : [...layers.slice(0, i), ...path28, ...layers.slice(i)];
 }
 function readerFor(ctx, ownerClearance, scope) {
+  if (ctx.kind === "robot" && !scope?.source) scope = { ...scope, source: `robot:${ctx.id}` };
   const source = scope?.source ? { source: scope.source } : {};
   if (ctx.kind === "robot") {
     const rank = (c) => c === "private" ? 0 : CLEARANCE_RANK[c];
@@ -1213,9 +1229,6 @@ function explainSectionAccess(section, reader) {
   const kind = layerKind(section.layer);
   if (kind === "user" && section.layer !== `user:${reader.userId}`) return { allowed: false, reason: "other-user" };
   if (kind === "robot" && section.layer !== `robot:${reader.contextId}`) return { allowed: false, reason: "other-robot" };
-  if ((kind === "arm" || kind === "mount") && reader.role === "robot" && !reader.layers.includes(section.layer)) {
-    return { allowed: false, reason: "other-hardware" };
-  }
   const access = explainAccess(
     {
       clearance: section.clearance,
@@ -1236,42 +1249,25 @@ 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;
+    if (!reader.layers.includes(section.layer)) return 0.05;
     const path28 = reader.layers.filter((l) => {
       const k = layerKind(l);
       return k === "group" || k === "source";
     });
     return 0.6 + 0.4 * ((path28.indexOf(section.layer) + 1) / path28.length);
   }
-  if (reader.layers.includes(section.layer)) {
-    const order = reader.role === "robot" ? FLEET_LAYER_ORDER : COMPANY_LAYER_ORDER;
-    return 0.5 + 0.5 * (order.indexOf(kind) / Math.max(1, order.length - 1));
-  }
-  if (kind === "team") {
-    const team = layerValue(section.layer);
-    if (department(team) === department(reader.team)) return 0.3;
-    return 0.05;
-  }
-  if (kind === "dept") return 0.1;
-  return 0.2;
+  if (isLocalLayer(section.layer)) return reader.layers.includes(section.layer) ? 1 : 0;
+  return 0.5;
 }
 function reachesReader(section, reader) {
-  if (reader.layers.includes(section.layer) || section.kind === "guardrail") return true;
-  const kind = layerKind(section.layer);
-  if (kind === "org" || kind === "dept" || FLEET_LAYER_ORDER.includes(kind)) return canRead(section, reader);
-  if (kind !== "team") return false;
-  return [layerValue(section.layer), ...section.allowedTeams ?? []].some((t) => !!t && orgUnitUnder(reader.team, t));
+  return reader.layers.includes(section.layer) && canRead(section, reader);
 }
-var COMPANY_LAYER_ORDER, FLEET_LAYER_ORDER;
 var init_layers = __esm({
   "../core/src/v2/layers.ts"() {
     "use strict";
     init_permissions();
     init_text();
     init_scopes();
-    COMPANY_LAYER_ORDER = ["org", "dept", "team", "user"];
-    FLEET_LAYER_ORDER = ["fleet", "arm", "mount", "robot"];
   }
 });
 
@@ -1455,6 +1451,9 @@ var init_document = __esm({
 });
 
 // ../core/src/v2/sections/markdown.ts
+function repoLayer(repo) {
+  return `source:${repo.includes("/") ? "repo" : "folder"}:${repo}`;
+}
 function repoSectionId(repo, path28, anchor = "") {
   return anchor ? `repo:${repo}/${path28}#${anchor}` : `repo:${repo}/${path28}`;
 }
@@ -1487,7 +1486,7 @@ function parseRepoDoc(doc, opts) {
     id: meta.id ? repoSectionId(doc.repo, doc.path, meta.id) : repoSectionId(doc.repo, doc.path),
     orgId: opts.orgId,
     kind,
-    layer: `team:${owner}`,
+    layer: opts.layer ?? repoLayer(doc.repo),
     title,
     body: doc.text,
     when,
@@ -2081,8 +2080,9 @@ var init_engine = __esm({
 
 // ../core/src/v2/guidelines.ts
 function reflectionGuidelines(sections, reader, opts = {}) {
+  const covering = opts.layer ? /* @__PURE__ */ new Set(["org", opts.layer, ...opts.tree ? ancestorScopes(opts.tree, opts.layer) : []]) : void 0;
   const pool = reader ? servable(sections, reader) : sections;
-  return pool.filter((s) => s.delivery === "reflect" && s.status === "active" && (!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 }));
+  return pool.filter((s) => s.delivery === "reflect" && s.status === "active" && (!reader || inBoundary(s, reader))).filter((s) => !covering || covering.has(s.layer)).sort((a, b) => generality(a.layer) - generality(b.layer) || a.id.localeCompare(b.id)).map((s) => ({ id: s.id, title: s.title, layer: s.layer, body: s.body }));
 }
 function guidelineRules(body) {
   const at = body.search(/^## /m);
@@ -2120,7 +2120,7 @@ var init_guidelines = __esm({
     init_engine();
     init_scopes();
     GUIDELINES_ANCHOR = "rules";
-    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;
+    generality = (l) => ({ org: 0, group: 1, source: 2, robot: 3, user: 3 })[layerKind(l)] ?? 4;
   }
 });
 
@@ -3129,6 +3129,17 @@ var init_generalize = __esm({
   }
 });
 
+// ../core/src/v2/adopt.ts
+var init_adopt = __esm({
+  "../core/src/v2/adopt.ts"() {
+    "use strict";
+    init_text();
+    init_layers();
+    init_scopes();
+    init_sources();
+  }
+});
+
 // ../core/src/v2/index.ts
 var init_v2 = __esm({
   "../core/src/v2/index.ts"() {
@@ -3153,6 +3164,7 @@ var init_v2 = __esm({
     init_sources();
     init_scopes();
     init_generalize();
+    init_adopt();
   }
 });
 
@@ -3329,7 +3341,8 @@ function indexWorkingTree(v2, config, cwd, opts = {}) {
   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 source = sourceFor(root, v2.store.root);
+  const sameRepo = cached && cached.ownerTeam === ownerTeam && cached.format === INDEX_FORMAT;
   const repo = sameRepo && cached.repo && !opts.force ? cached.repo : repoName(root);
   const fresh = sameRepo && cached.repo === repo && cached.paths && cached.listedAt && now - Date.parse(cached.listedAt) < LIST_TTL_MS && !opts.force;
   const paths = fresh ? cached.paths : listDocs(root);
@@ -3352,11 +3365,12 @@ function indexWorkingTree(v2, config, cwd, opts = {}) {
     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 }) };
+      files[rel] = { mtimeMs: stat.mtimeMs, size: stat.size, sections: parseRepoDoc({ repo, path: rel, text: text2 }, { orgId: config.orgId, ownerTeam, layer: source ? sourceLayer(source) : "org" }) };
     } catch {
     }
   }
   const index = {
+    format: INDEX_FORMAT,
     repo,
     ownerTeam,
     listedAt: fresh ? cached.listedAt : new Date(now).toISOString(),
@@ -3397,11 +3411,12 @@ function relativeToRoot(root, file, cwd = root) {
   }
   return null;
 }
-var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc, deployedSkill;
+var DOC_NAMES, SKIP_DIRS, LIST_TTL_MS, rootCache, isDoc, deployedSkill, INDEX_FORMAT;
 var init_repo = __esm({
   "src/v2/repo.ts"() {
     "use strict";
     init_v22();
+    init_source();
     DOC_NAMES = /* @__PURE__ */ new Set(["spec.md", "testing.md", "skill.md"]);
     SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".bunshin"]);
     LIST_TTL_MS = 6e4;
@@ -3412,6 +3427,7 @@ var init_repo = __esm({
       return DOC_NAMES.has(parts[parts.length - 1].toLowerCase());
     };
     deployedSkill = (root, rel) => /(^|\/)SKILL\.md$/i.test(rel) && fs6.existsSync(path5.join(root, path5.posix.dirname(rel), ".bunshin.json"));
+    INDEX_FORMAT = 2;
   }
 });
 
@@ -4381,6 +4397,11 @@ function childDir(root, name) {
   const dir = path8.join(root, name);
   return path8.dirname(path8.resolve(dir)) === path8.resolve(root) && insideRoot(root, dir) ? dir : null;
 }
+function layerRank(layer, tree) {
+  const kind = layerKind(layer);
+  if (kind === "group") return 1 + (tree ? groupChain(tree, layerValue(layer)).length : 0);
+  return kind === "source" ? 1e3 : kind === "user" || kind === "robot" ? 2e3 : 0;
+}
 function planDeploy(bundle, p, harnesses) {
   const active = bundle.sections.filter((s) => s.status === "active" || s.status === "stale");
   const byName = /* @__PURE__ */ new Map();
@@ -4391,7 +4412,7 @@ function planDeploy(bundle, p, harnesses) {
       continue;
     }
     const prev = byName.get(s.skill.name);
-    if (!prev || (LAYER_RANK[layerKind(s.layer)] ?? 0) > (LAYER_RANK[layerKind(prev.layer)] ?? 0)) byName.set(s.skill.name, s);
+    if (!prev || layerRank(s.layer, bundle.scopes) > layerRank(prev.layer, bundle.scopes)) byName.set(s.skill.name, s);
   }
   const skills = [...byName.values()].sort((a, b) => a.skill.name.localeCompare(b.skill.name));
   const instructions = active.filter((s) => s.delivery === "always" && !s.skill && !s.profileOf).sort((a, b) => (a.packPath ?? a.title).localeCompare(b.packPath ?? b.title));
@@ -5013,7 +5034,7 @@ ${EXCLUDE_END}
   } catch {
   }
 }
-var settingsFile, orgKey, sha, BLOCK_BEGIN, BLOCK_END, MANIFEST, MAX_FILE, isExecutable, safeJoin, SAFE_NAME, neutralizeMarkers, LAYER_RANK, docMarker, BORN_SLACK_MS, LINK_DIRS, EXCLUDE_BEGIN, EXCLUDE_END;
+var settingsFile, orgKey, sha, BLOCK_BEGIN, BLOCK_END, MANIFEST, MAX_FILE, isExecutable, safeJoin, SAFE_NAME, neutralizeMarkers, docMarker, BORN_SLACK_MS, LINK_DIRS, EXCLUDE_BEGIN, EXCLUDE_END;
 var init_deploy = __esm({
   "src/v2/deploy.ts"() {
     "use strict";
@@ -5038,7 +5059,6 @@ 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, 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 = {
@@ -6129,7 +6149,8 @@ async function uploadIndex(store, cwd, deadline = Date.now() + 3e4) {
     }
   });
   const commit = repoCommit(root);
-  const res = await v2api(config, "POST", "/sections/index", { repo: index.repo, ...commit ? { commit } : {}, ownerTeam: index.ownerTeam, docs }, { deadline, timeoutMs: 3e4 });
+  const source = sourceFor(root, store.root);
+  const res = await v2api(config, "POST", "/sections/index", { repo: index.repo, ...commit ? { commit } : {}, ...source ? { source } : {}, ownerTeam: index.ownerTeam, docs }, { deadline, timeoutMs: 3e4 });
   return typeof res.indexed === "number" ? res.indexed : docs.length;
 }
 var isLocalId, carriesTrace;
@@ -8030,7 +8051,7 @@ function cmdSuggest(store, args, cwd, out, err) {
     orgId: config.orgId,
     contextId: view.ctx.id,
     authorUserId: config.userId,
-    target: known ? { sectionId: known } : { layer: "fleet", storage: { type: "harness", path: rel, symbol: symbol ?? "" } },
+    target: known ? { sectionId: known } : { storage: { type: "harness", path: rel, symbol: symbol ?? "" } },
     op: { op: "append", text: rationale },
     rationale,
     evidenceEpisodeIds: sessionId ? [episodeIdFor(view.ctx.id, sessionId)] : [],

package/package.json

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