@sechroom/cli 2026.6.136-rc.c2c1009c → 2026.6.138-rc.a8484373

package/dist/index.js

@@ -2943,57 +2943,104 @@ I can pin this checkout's lane so operator skills + the continuity hook resolve
   writePin(code || void 0, design || void 0);
 }
 
-// src/setup/skills-offer.ts
+// src/setup/skill-resolution.ts
+var SYSTEM_WORKSPACE_ID = "wsp_system";
 var ROLE_TAG = "sechroom:role:skill-template";
+function tagsOf(row) {
+  const m = row?.item ?? row;
+  return m?.tags ?? m?.Tags ?? [];
+}
 function tagValue(tags, prefix) {
   return tags.find((t) => t.startsWith(prefix))?.slice(prefix.length);
 }
-async function maybeOfferSkills(cfg, personalWorkspaceId, opts) {
-  if (!personalWorkspaceId || opts.dryRun) return;
-  const surface = opts.surface ?? "claude-code";
-  let rows = [];
+function bodyOf(row) {
+  const m = row?.item ?? row;
+  return m?.text ?? m?.Text ?? "";
+}
+function skillsFromRows(rows, surface, source) {
+  const out = /* @__PURE__ */ new Map();
+  for (const row of rows ?? []) {
+    const tags = tagsOf(row);
+    if (!tags.includes(ROLE_TAG)) continue;
+    if (tagValue(tags, "target:") !== surface) continue;
+    const name = tagValue(tags, "skill:");
+    if (!name) continue;
+    out.set(name, { name, body: bodyOf(row), source });
+  }
+  return out;
+}
+function resolveSkills(systemRows, personalRows, surface) {
+  const merged = skillsFromRows(systemRows, surface, "system");
+  for (const [name, skill] of skillsFromRows(
+    personalRows,
+    surface,
+    "personal"
+  )) {
+    merged.set(name, skill);
+  }
+  return [...merged.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+
+// src/setup/skills-offer.ts
+async function fetchFeedRows(cfg, workspaceId) {
   try {
     const client = await makeClient(cfg);
     const feed = await client.GET("/workspaces/{workspaceId}/memories/feed", {
       params: {
-        path: { workspaceId: personalWorkspaceId },
+        path: { workspaceId },
+        // cascadeWorkspaces: skills land in an "Operator Skills" SUB-workspace;
+        // includeText: the feed omits bodies by default, we need them for SKILL.md.
         query: { limit: 200, cascadeWorkspaces: true, includeText: true }
       }
     }).then((r) => r.data).catch(() => void 0);
-    rows = feed?.results ?? feed?.Results ?? [];
+    return feed?.results ?? feed?.Results ?? [];
   } catch {
-    return;
+    return [];
   }
-  const skills = rows.map((r) => r.item ?? r).filter((m) => {
-    const tags = m.tags ?? m.Tags ?? [];
-    return tags.includes(ROLE_TAG) && tagValue(tags, "target:") === surface;
-  });
-  if (skills.length === 0) return;
-  const byName = /* @__PURE__ */ new Map();
-  for (const m of skills) {
-    const name = tagValue(m.tags ?? m.Tags ?? [], "skill:");
-    if (name) byName.set(name, m);
+}
+async function maybeOfferSkills(cfg, personalWorkspaceId, opts) {
+  const surface = opts.surface ?? "claude-code";
+  const [systemRows, personalRows] = await Promise.all([
+    fetchFeedRows(cfg, SYSTEM_WORKSPACE_ID),
+    personalWorkspaceId ? fetchFeedRows(cfg, personalWorkspaceId) : Promise.resolve([])
+  ]);
+  const resolved = resolveSkills(systemRows, personalRows, surface);
+  if (resolved.length === 0) return;
+  if (opts.dryRun) {
+    process.stderr.write(
+      `
+Would materialise ${style.bold(String(resolved.length))} operator skill(s) for ${surface}:
+` + resolved.map((s) => `  ${s.name} ${style.dim(`[${s.source}]`)}`).join("\n") + "\n"
+    );
+    return;
   }
-  const names = [...byName.keys()].sort();
-  if (names.length === 0) return;
+  const names = resolved.map((s) => s.name);
   process.stderr.write(
     `
-Found ${style.bold(String(names.length))} operator skill(s) installed in your workspace: ${names.join(", ")}.
+Found ${style.bold(String(names.length))} operator skill(s) available to you: ${names.join(", ")}.
 `
   );
   const dir = join5(homedir5(), ".claude", "skills");
   const materialise = opts.yes ? true : canPrompt() ? await promptYesNo(`Write them to ${dir}/ so ${surface} can use them?`) : false;
   if (!materialise) return;
   const written = [];
-  for (const [name, m] of byName) {
-    const body = m.text ?? m.Text ?? "";
-    mkdirSync5(join5(dir, name), { recursive: true });
-    writeFileSync5(join5(dir, name, "SKILL.md"), body.endsWith("\n") ? body : body + "\n");
-    written.push(name);
+  for (const s of resolved) {
+    mkdirSync5(join5(dir, s.name), { recursive: true });
+    writeFileSync5(
+      join5(dir, s.name, "SKILL.md"),
+      s.body.endsWith("\n") ? s.body : s.body + "\n"
+    );
+    written.push(s.name);
   }
-  process.stderr.write(`${style.green("\u2713")} wrote ${written.length} skill(s) to ${dir}
-`);
-  await ensureLanePin(cfg, { yes: opts.yes, dryRun: opts.dryRun, clients: [surface] });
+  process.stderr.write(
+    `${style.green("\u2713")} wrote ${written.length} skill(s) to ${dir}
+`
+  );
+  await ensureLanePin(cfg, {
+    yes: opts.yes,
+    dryRun: opts.dryRun,
+    clients: [surface]
+  });
 }
 
 // src/commands/setup.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sechroom/cli",
-  "version": "2026.6.136-rc.c2c1009c",
+  "version": "2026.6.138-rc.a8484373",
   "description": "Sechroom CLI — a thin, generated client over the Sechroom HTTP API. An agent/human surface alongside MCP.",
   "type": "module",
   "license": "UNLICENSED",