@tablation/crew 0.37.0 → 0.39.0

package/dist/cli.js

@@ -1806,6 +1806,7 @@ var DEFAULT_BASE_URL = "https://app.tablation.com";
 var DEFAULT_MAX_THINKING_TOKENS = 4096;
 var DEFAULT_REPOS_BASE_PATH = "~/Crew";
 var ROLE_NAMES = ["dev", "design", "qa", "triage", "pair"];
+var SELF_CONTAINED_ROLES = /* @__PURE__ */ new Set(["pair", "triage"]);
 var ROLE_LABEL = {
   dev: "Dev",
   design: "Design",
@@ -6606,9 +6607,9 @@ var alreadyReported = (ticket, g, comments) => comments.some((c) => c.ticket_id
 
 // src/agent.ts
 import { spawn as spawn2 } from "child_process";
-import { readFileSync as readFileSync8, existsSync as existsSync9, statSync as statSync5, mkdirSync as mkdirSync6, writeFileSync as writeFileSync7, createWriteStream } from "fs";
+import { readFileSync as readFileSync9, existsSync as existsSync10, statSync as statSync5, mkdirSync as mkdirSync6, writeFileSync as writeFileSync7, createWriteStream } from "fs";
 import { finished } from "stream/promises";
-import { join as join10, dirname as dirname6 } from "path";
+import { join as join11, dirname as dirname6 } from "path";
 import { createHash as createHash2 } from "crypto";
 
 // src/environment.ts
@@ -6952,6 +6953,199 @@ async function reportAgentRun(target, run2) {
   return { agentLogId: entry.id };
 }
 
+// src/skill-include.ts
+var SkillIncludeError = class extends Error {
+};
+var MAX_INCLUDE_DEPTH = 3;
+var MAX_INCLUDED_BYTES = 2e5;
+var MARKER = /\{\{[ \t]*skill:[ \t]*([^{}\r\n]*?)[ \t]*\}\}/g;
+function skillMarkerNames(text) {
+  const names = [];
+  for (const m of text.matchAll(MARKER)) {
+    const name = m[1].trim();
+    if (name && !names.includes(name)) names.push(name);
+  }
+  return names;
+}
+function expandSkillMarkers(text, lookup, opts = {}) {
+  const maxDepth = opts.maxDepth ?? MAX_INCLUDE_DEPTH;
+  const maxBytes = opts.maxBytes ?? MAX_INCLUDED_BYTES;
+  const warnings = [];
+  let included = 0;
+  const expand2 = (source, chain) => source.replace(MARKER, (literal, rawName) => {
+    const name = rawName.trim();
+    if (!name) return literal;
+    if (chain.includes(name)) {
+      warnings.push(`skill include "${name}" left literal: it includes itself (${[...chain, name].join(" \u2192 ")})`);
+      return literal;
+    }
+    if (chain.length >= maxDepth) {
+      warnings.push(`skill include "${name}" left literal: nested deeper than ${maxDepth} levels`);
+      return literal;
+    }
+    const body = lookup(name);
+    if (body === void 0) throw new SkillIncludeError(`no skill named "${name}" for the include ${literal}`);
+    const trimmed = body.replace(/^\n+/, "").replace(/\n+$/, "");
+    const bytes = Buffer.byteLength(trimmed, "utf8");
+    if (included + bytes > maxBytes) {
+      warnings.push(`skill include "${name}" left literal: it would exceed the ${maxBytes}-byte include budget`);
+      return literal;
+    }
+    included += bytes;
+    return expand2(trimmed, [...chain, name]);
+  });
+  return { text: expand2(text, []), warnings };
+}
+
+// src/skills.ts
+import { readFileSync as readFileSync8, readdirSync as readdirSync2, existsSync as existsSync9 } from "fs";
+import { join as join10 } from "path";
+import { parse as parseYaml } from "yaml";
+import { TablationClient as TablationClient2, StaleWriteError as StaleWriteError6, TablationApiError } from "@tablation/client";
+var SkillSyncError = class extends Error {
+};
+function parseSkillFile(path) {
+  const text = readFileSync8(path, "utf8");
+  const match = /^---\n([\s\S]*?)\n---\n([\s\S]*)$/.exec(text);
+  if (!match) throw new SkillSyncError(`${path}: missing YAML frontmatter (expected a leading --- block)`);
+  const frontmatter = match[1];
+  const body = match[2];
+  const meta = parseYaml(frontmatter);
+  if (typeof meta.name !== "string" || !meta.name) throw new SkillSyncError(`${path}: frontmatter is missing "name"`);
+  if (typeof meta.description !== "string" || !meta.description) {
+    throw new SkillSyncError(`${path}: frontmatter is missing "description"`);
+  }
+  return { name: meta.name, description: meta.description, prompt: body, file: path };
+}
+function listLocalSkills(promptsDir) {
+  const dir = join10(promptsDir, "skills");
+  if (!existsSync9(dir)) return [];
+  return readdirSync2(dir).filter((f) => f.endsWith(".md")).map((f) => parseSkillFile(join10(dir, f)));
+}
+async function syncSkills(route, opts) {
+  if (!route.resolved) {
+    throw new SkillSyncError(`route "${route.route}" has no resolved ids \u2014 run \`crew connect\` first`);
+  }
+  const workspaceId = route.resolved.workspaceId;
+  const client2 = new TablationClient2({
+    baseUrl: `${route.baseUrl}/api`,
+    apiKey: resolveApiKey(route),
+    headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
+  });
+  let skillsModel;
+  try {
+    skillsModel = await client2.dataModels.get("agent_skills", workspaceId);
+  } catch (e) {
+    if (e instanceof TablationApiError && e.status === 404) {
+      throw new SkillSyncError(
+        `workspace ${workspaceId} has no Agent Skills table yet \u2014 every workspace auto-provisions one; an older workspace may still need its one-time backfill`
+      );
+    }
+    throw e;
+  }
+  const local = listLocalSkills(route.promptsDir);
+  const rows = await client2.records.list(skillsModel.id, { limit: 200 });
+  const cache = route.resolved.agentSkills ?? {};
+  const outcomes = [];
+  const agentSkills = { ...cache };
+  for (const skill of local) {
+    const row = rows.find((r) => r.name === skill.name);
+    if (!row) {
+      if (opts.dryRun) {
+        outcomes.push({ name: skill.name, action: "created", skillId: "(dry run)" });
+        continue;
+      }
+      const created = await client2.records.create(skillsModel.id, {
+        name: skill.name,
+        description: skill.description,
+        prompt: skill.prompt
+      });
+      agentSkills[skill.name] = { skillId: created.id, lastSyncedUpdatedAt: created.updated_at };
+      outcomes.push({ name: skill.name, action: "created", skillId: created.id });
+      continue;
+    }
+    if (row.description === skill.description && row.prompt === skill.prompt) {
+      agentSkills[skill.name] = { skillId: row.id, lastSyncedUpdatedAt: row.updated_at };
+      outcomes.push({ name: skill.name, action: "unchanged", skillId: row.id });
+      continue;
+    }
+    const knownBaseline = cache[skill.name]?.skillId === row.id ? cache[skill.name]?.lastSyncedUpdatedAt : void 0;
+    if (!knownBaseline) {
+      outcomes.push({ name: skill.name, action: "diverged", skillId: row.id });
+      continue;
+    }
+    if (opts.dryRun) {
+      outcomes.push({ name: skill.name, action: "updated", skillId: row.id });
+      continue;
+    }
+    try {
+      const updated = await client2.records.update(
+        skillsModel.id,
+        row.id,
+        { description: skill.description, prompt: skill.prompt },
+        knownBaseline
+      );
+      agentSkills[skill.name] = { skillId: row.id, lastSyncedUpdatedAt: updated.updated_at };
+      outcomes.push({ name: skill.name, action: "updated", skillId: row.id });
+    } catch (e) {
+      if (e instanceof StaleWriteError6) {
+        outcomes.push({ name: skill.name, action: "diverged", skillId: row.id });
+        continue;
+      }
+      throw e;
+    }
+  }
+  return { outcomes, agentSkills };
+}
+function describeSkillSyncOutcome(o) {
+  switch (o.action) {
+    case "created":
+      return `${o.name}: created (${o.skillId})`;
+    case "updated":
+      return `${o.name}: prompt updated from crew's local file`;
+    case "unchanged":
+      return `${o.name}: already in sync`;
+    case "diverged":
+      return `${o.name}: HAS LOCAL EDITS \u2014 crew's default is newer but was NOT applied; review ${o.skillId} in the app before syncing again`;
+  }
+}
+async function fetchSkillOverrides(route, opts) {
+  if (!route.resolved) return {};
+  const client2 = new TablationClient2({
+    baseUrl: `${route.baseUrl}/api`,
+    apiKey: resolveApiKey(route),
+    headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
+  });
+  let rows;
+  try {
+    const model = await client2.dataModels.get("agent_skills", route.resolved.workspaceId);
+    rows = await client2.records.list(model.id, { limit: 200 });
+  } catch {
+    return {};
+  }
+  const local = new Map(listLocalSkills(route.promptsDir).map((s) => [s.name, s]));
+  const cache = route.resolved.agentSkills ?? {};
+  const out = {};
+  for (const row of rows) {
+    const name = row.name;
+    if (row.prompt === local.get(name)?.prompt) continue;
+    const cached = cache[name];
+    if (cached?.skillId === row.id && cached.lastSyncedUpdatedAt === row.updated_at) continue;
+    out[name] = row.prompt;
+  }
+  return out;
+}
+function skillMarkerWarnings(promptsDir, personaPrompts) {
+  const shipped = new Set(listLocalSkills(promptsDir).map((s) => s.name));
+  const out = [];
+  for (const [role, text] of Object.entries(personaPrompts)) {
+    for (const name of skillMarkerNames(text ?? "")) {
+      if (!shipped.has(name)) out.push(`${role}: brief includes {{skill: ${name}}} but this prompt set ships no skill with that name`);
+    }
+  }
+  return out;
+}
+
 // src/ticket-attribution.ts
 var TICKET_KEY_RE = /\b[A-Z][A-Z0-9]{1,9}-\d+\b/g;
 function ticketMentions(text) {
@@ -7006,34 +7200,45 @@ var AgentError = class extends Error {
 var AgentSpawnError = class extends AgentError {
 };
 function planAgentRun(o) {
-  const briefPath = join10(o.route.promptsDir, "personas", `lane-${o.role}.md`);
-  if (!existsSync9(briefPath)) {
+  const briefPath = join11(o.route.promptsDir, "personas", `lane-${o.role}.md`);
+  if (!existsSync10(briefPath)) {
     throw new AgentError(`no brief at ${briefPath} \u2014 refusing to run an unscoped session`);
   }
-  const commonPath = join10(o.route.promptsDir, "personas", "common.md");
-  if (!existsSync9(commonPath)) throw new AgentError(`no shared policy at ${commonPath}`);
+  const commonPath = join11(o.route.promptsDir, "personas", "common.md");
+  const usesCommon = !SELF_CONTAINED_ROLES.has(o.role) && existsSync10(commonPath);
   const now = o.now ?? (() => Date.now());
   const routeLabel = routeSlug(o.route.route);
-  const digestPath2 = join10(o.stateDir, `digest-${routeLabel}-${o.role}.md`);
+  const digestPath2 = join11(o.stateDir, `digest-${routeLabel}-${o.role}.md`);
   let digest;
   let ageSeconds;
-  if (existsSync9(digestPath2)) {
+  if (existsSync10(digestPath2)) {
     ageSeconds = Math.floor((now() - statSync5(digestPath2).mtimeMs) / 1e3);
-    if (ageSeconds <= DIGEST_MAX_AGE_SECONDS) digest = readFileSync8(digestPath2, "utf8");
+    if (ageSeconds <= DIGEST_MAX_AGE_SECONDS) digest = readFileSync9(digestPath2, "utf8");
   }
-  const common = readFileSync8(commonPath, "utf8");
-  const brief = readFileSync8(briefPath, "utf8");
+  const common = usesCommon ? readFileSync9(commonPath, "utf8") : "";
+  const brief = readFileSync9(briefPath, "utf8");
   const effectiveCommon = o.divergedPrompt ? "" : common;
   const effectiveBrief = o.divergedPrompt ?? brief;
+  const localSkills = new Map(listLocalSkills(o.route.promptsDir).map((s) => [s.name, s.prompt]));
+  let expanded;
+  try {
+    expanded = expandSkillMarkers(
+      `${effectiveCommon}${effectiveBrief}`,
+      (name) => o.skillOverrides?.[name] ?? localSkills.get(name)
+    );
+  } catch (e) {
+    if (e instanceof SkillIncludeError) throw new AgentError(`${e.message} \u2014 refusing to run an unscoped session`);
+    throw e;
+  }
   const prompt = assemblePrompt({
     roster: o.roster,
     environment: o.environment,
-    common: effectiveCommon,
-    brief: effectiveBrief,
+    common: "",
+    brief: expanded.text,
     digest
   });
-  const promptSha = createHash2("sha256").update(`${effectiveCommon}${effectiveBrief}`).digest("hex");
-  const streamsDir = join10(o.stateDir, "streams");
+  const promptSha = createHash2("sha256").update(expanded.text).digest("hex");
+  const streamsDir = join11(o.stateDir, "streams");
   const base = `${routeLabel}-${o.role}-${o.cycle}`;
   const seat = resolveSeat(o.ship, o.route, o.role, o.agentPersona ?? (o.agentModel ? { model: o.agentModel } : {}), o.repo);
   const { toolchain, model } = seat;
@@ -7069,7 +7274,7 @@ function planAgentRun(o) {
     harness: toolchain.harness,
     provider: toolchainProvider(toolchain),
     resolution: { toolchain: seat.toolchainWhy, model: seat.modelWhy },
-    warnings: seat.warnings,
+    warnings: [...seat.warnings ?? [], ...expanded.warnings],
     prompt,
     promptBytes: Buffer.byteLength(prompt, "utf8"),
     unsetEnv: adapter.unsetEnv,
@@ -7089,8 +7294,8 @@ function planAgentRun(o) {
     digestAttached: digest !== void 0,
     digestAgeSeconds: ageSeconds,
     model,
-    streamPath: join10(streamsDir, `${base}.jsonl`),
-    eventsPath: join10(streamsDir, `${base}.events.jsonl`),
+    streamPath: join11(streamsDir, `${base}.jsonl`),
+    eventsPath: join11(streamsDir, `${base}.events.jsonl`),
     ticket: o.ticket,
     agentLog,
     promptVersion: o.route.resolved?.agentPersonas?.[o.role]?.historyId,
@@ -7296,13 +7501,13 @@ function spawnAgent(plan, emit) {
 }
 
 // src/run-worktree.ts
-import { existsSync as existsSync11 } from "fs";
-import { dirname as dirname7, join as join12 } from "path";
+import { existsSync as existsSync12 } from "fs";
+import { dirname as dirname7, join as join13 } from "path";
 
 // src/ports.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync10 } from "fs";
-import { join as join11 } from "path";
+import { existsSync as existsSync11 } from "fs";
+import { join as join12 } from "path";
 var run = (cmd, args) => {
   try {
     return execFileSync2(cmd, args, { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
@@ -7347,7 +7552,7 @@ function ticketForPort(port, s = DEFAULT_PORTS) {
 }
 function worktreeExists(parent, prefix, n) {
   for (const name of [`${prefix}${n}`, `${prefix}${String(n).padStart(3, "0")}`]) {
-    if (existsSync10(join11(parent, name, ".git"))) return true;
+    if (existsSync11(join12(parent, name, ".git"))) return true;
   }
   return false;
 }
@@ -7421,7 +7626,7 @@ function planRunWorktree(dir, cfg, t, role) {
   const existing = worktreeForNumber(dir, num);
   const located = locateBranchForTicket(dir, cfg, t, role);
   const baseRef = hasRemote ? `${remote}/${base}` : base;
-  if (existing && !existing.prunable && existsSync11(existing.path)) {
+  if (existing && !existing.prunable && existsSync12(existing.path)) {
     const branch = existing.branch;
     if (status(existing.path).length > 0) return { action: "leave-dirty", path: existing.path, branch };
     if (!branch) return { action: "leave-unpushed", path: existing.path, branch: "(detached HEAD)" };
@@ -7435,7 +7640,7 @@ function planRunWorktree(dir, cfg, t, role) {
     if (countCommits(existing.path, `${baseRef}..HEAD`) > 0) return { action: "leave-unpushed", path: existing.path, branch };
     return { action: "recut", path: existing.path, branch, base: baseRef };
   }
-  const path = join12(dirname7(dir), worktreeForTicket(dir, cfg, t, role));
+  const path = join13(dirname7(dir), worktreeForTicket(dir, cfg, t, role));
   if (located?.where === "remote" || located && hasRemote && remoteBranchExists(dir, remote, located.branch)) {
     return { action: "cut-remote", path, branch: located.branch };
   }
@@ -7482,7 +7687,7 @@ function worktreeHoldsUnpushed(path, remote) {
 }
 async function finishRunWorktree(dir, cfg, branch) {
   const wt = worktrees(dir).find((w) => w.branch === branch && !w.prunable && w.path !== dir);
-  if (!wt || !existsSync11(wt.path)) return { kind: "none" };
+  if (!wt || !existsSync12(wt.path)) return { kind: "none" };
   if (cfg.hooks.handoff) return { kind: "kept-handoff", path: wt.path };
   if (status(wt.path).length > 0) return { kind: "kept-dirty", path: wt.path };
   if (remoteConfigured(dir, cfg.branch.remote) && worktreeHoldsUnpushed(wt.path, cfg.branch.remote)) {
@@ -7494,7 +7699,7 @@ async function finishRunWorktree(dir, cfg, branch) {
     if (pids.length) await killGently(pids);
   }
   gitOk(dir, ["worktree", "remove", wt.path]);
-  return existsSync11(wt.path) ? { kind: "kept-dirty", path: wt.path } : { kind: "removed", path: wt.path };
+  return existsSync12(wt.path) ? { kind: "kept-dirty", path: wt.path } : { kind: "removed", path: wt.path };
 }
 
 // src/handoff-guard.ts
@@ -7643,13 +7848,13 @@ async function retireRunWorktree(tracker, dir, cfg, t, role, seatId, shipName2,
 }
 
 // src/connect-wizard.ts
-import { delimiter, dirname as dirname8, join as join13 } from "path";
-import { accessSync as accessSync2, constants as constants2, existsSync as existsSync12, mkdirSync as mkdirSync7, writeFileSync as writeFileSync8 } from "fs";
+import { delimiter, dirname as dirname8, join as join14 } from "path";
+import { accessSync as accessSync2, constants as constants2, existsSync as existsSync13, mkdirSync as mkdirSync7, writeFileSync as writeFileSync8 } from "fs";
 import { stringify } from "yaml";
 var HOST_PASSENGERS_DOCS_URL = "https://crew.tablation.dev/host-passengers";
 function shouldRunWizard(opts) {
   if (!opts.isTTY) return false;
-  const exists = opts.configExists ?? existsSync12;
+  const exists = opts.configExists ?? existsSync13;
   return !configSearchPath(opts.crewHome).some((p) => exists(p));
 }
 function firstRunConfigPath() {
@@ -7666,7 +7871,7 @@ function defaultIsExecutable(p) {
 function findOnPath2(name, pathEnv, isExecutable = defaultIsExecutable) {
   for (const dir of pathEnv.split(delimiter)) {
     if (!dir) continue;
-    const candidate = join13(dir, name);
+    const candidate = join14(dir, name);
     if (isExecutable(candidate)) return candidate;
   }
   return void 0;
@@ -7761,8 +7966,8 @@ Wrote ${o.configPath}.
 }
 
 // src/release-run.ts
-import { readFileSync as readFileSync9, writeFileSync as writeFileSync9, existsSync as existsSync13, copyFileSync, mkdirSync as mkdirSync8, mkdtempSync, rmSync as rmSync6 } from "fs";
-import { dirname as dirname9, join as join14 } from "path";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync9, existsSync as existsSync14, copyFileSync, mkdirSync as mkdirSync8, mkdtempSync, rmSync as rmSync6 } from "fs";
+import { dirname as dirname9, join as join15 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 
 // src/release.ts
@@ -8420,13 +8625,13 @@ async function bump(o, size) {
     }
     return printed;
   }
-  const files = o.repo.release.versionFiles.map((f) => join14(o.cwd, f));
+  const files = o.repo.release.versionFiles.map((f) => join15(o.cwd, f));
   const first = files[0];
-  if (!existsSync13(first)) {
+  if (!existsSync14(first)) {
     o.emit.error(`no ${o.repo.release.versionFiles[0]} to read a version from`);
     return null;
   }
-  const current = JSON.parse(readFileSync9(first, "utf8")).version;
+  const current = JSON.parse(readFileSync10(first, "utf8")).version;
   if (!current) {
     o.emit.error(`no version field in ${o.repo.release.versionFiles[0]}`);
     return null;
@@ -8439,7 +8644,7 @@ async function bump(o, size) {
     return version;
   }
   for (const f of files) {
-    const src = readFileSync9(f, "utf8");
+    const src = readFileSync10(f, "utf8");
     const out = src.replace(/("version"\s*:\s*")[^"]*(")/, `$1${version}$2`);
     if (out === src) {
       o.emit.error(`no version field in ${f}`);
@@ -8452,13 +8657,13 @@ async function bump(o, size) {
 function writeChangelog(o, version, entries) {
   const file = o.repo.release.changelog;
   if (!file || entries.length === 0) return;
-  const path = join14(o.cwd, file);
+  const path = join15(o.cwd, file);
   const section = renderChangelogSection(version, (/* @__PURE__ */ new Date()).toISOString().slice(0, 10), entries);
   if (o.dryRun) {
     o.emit.emit(`would prepend ${entries.length} entr(ies) to ${file}`);
     return;
   }
-  const existing = existsSync13(path) ? readFileSync9(path, "utf8") : "# Changelog\n";
+  const existing = existsSync14(path) ? readFileSync10(path, "utf8") : "# Changelog\n";
   writeFileSync9(path, insertChangelogSection(existing, section));
 }
 async function confirm(o, expected) {
@@ -8540,8 +8745,8 @@ async function confirmLastRelease(o, decision) {
 function openReleaseCheckout(o) {
   const { remote, base } = o.repo.branch;
   const branch = `crew/release-${Date.now()}`;
-  const root = mkdtempSync(join14(tmpdir2(), "crew-release-"));
-  const dir = join14(root, "checkout");
+  const root = mkdtempSync(join15(tmpdir2(), "crew-release-"));
+  const dir = join15(root, "checkout");
   const close = () => {
     gitOk(o.cwd, ["worktree", "remove", "--force", dir]);
     rmSync6(root, { recursive: true, force: true });
@@ -8555,10 +8760,10 @@ function openReleaseCheckout(o) {
     throw e;
   }
   for (const f of o.repo.worktrees.copy) {
-    const src = join14(o.cwd, f);
-    if (!existsSync13(src)) continue;
-    mkdirSync8(dirname9(join14(dir, f)), { recursive: true });
-    copyFileSync(src, join14(dir, f));
+    const src = join15(o.cwd, f);
+    if (!existsSync14(src)) continue;
+    mkdirSync8(dirname9(join15(dir, f)), { recursive: true });
+    copyFileSync(src, join15(dir, f));
   }
   return { dir, branch, close };
 }
@@ -9027,7 +9232,7 @@ function missingReleaserWarning(repo, release, ships, now = Date.now()) {
 }
 
 // src/watch.ts
-import { watch as watchFile, existsSync as existsSync14, statSync as statSync6, openSync as openSync3, readSync, closeSync as closeSync3 } from "fs";
+import { watch as watchFile, existsSync as existsSync15, statSync as statSync6, openSync as openSync3, readSync, closeSync as closeSync3 } from "fs";
 var E = "\x1B[";
 var dim = (s) => `${E}2m${s}${E}0m`;
 var bold = (s) => `${E}1m${s}${E}0m`;
@@ -9128,7 +9333,7 @@ function renderHeaders(states, now = Date.now()) {
   return states.map((s) => renderHeader(s, now)).join("");
 }
 function readFrom(file, from) {
-  if (!existsSync14(file)) return { events: [], offset: from };
+  if (!existsSync15(file)) return { events: [], offset: from };
   const size = statSync6(file).size;
   if (size < from) return readFrom(file, 0);
   if (size === from) return { events: [], offset: from };
@@ -9368,9 +9573,9 @@ function nextRoles(decision, ran) {
 }
 
 // src/agents.ts
-import { readFileSync as readFileSync10, existsSync as existsSync15 } from "fs";
-import { join as join15 } from "path";
-import { TablationClient as TablationClient2, StaleWriteError as StaleWriteError6, TablationApiError } from "@tablation/client";
+import { readFileSync as readFileSync11, existsSync as existsSync16 } from "fs";
+import { join as join16 } from "path";
+import { TablationClient as TablationClient3, StaleWriteError as StaleWriteError7, TablationApiError as TablationApiError2 } from "@tablation/client";
 var PERSONA_NAME = {
   dev: "Developer",
   design: "Design",
@@ -9383,19 +9588,19 @@ var CREW_AGENT_COLUMN = "agent_id";
 var AgentsSyncError = class extends Error {
 };
 function personaDefaultPrompt(promptsDir, role) {
-  const briefPath = join15(promptsDir, "personas", `lane-${role}.md`);
-  if (!existsSync15(briefPath)) throw new AgentsSyncError(`no brief at ${briefPath}`);
-  if (role === "pair") return readFileSync10(briefPath, "utf8");
-  const commonPath = join15(promptsDir, "personas", "common.md");
-  if (!existsSync15(commonPath)) throw new AgentsSyncError(`no shared policy at ${commonPath}`);
-  return `${readFileSync10(commonPath, "utf8")}${readFileSync10(briefPath, "utf8")}`;
+  const briefPath = join16(promptsDir, "personas", `lane-${role}.md`);
+  if (!existsSync16(briefPath)) throw new AgentsSyncError(`no brief at ${briefPath}`);
+  if (SELF_CONTAINED_ROLES.has(role)) return readFileSync11(briefPath, "utf8");
+  const commonPath = join16(promptsDir, "personas", "common.md");
+  if (!existsSync16(commonPath)) return readFileSync11(briefPath, "utf8");
+  return `${readFileSync11(commonPath, "utf8")}${readFileSync11(briefPath, "utf8")}`;
 }
 async function resolveAgentId(route, role, opts) {
   const cached = route.resolved?.agentPersonas?.[role]?.agentId;
   if (cached) return cached;
   const seatId = route.resolved?.seats?.[role];
   if (!seatId || !route.resolved) return void 0;
-  const client2 = new TablationClient2({
+  const client2 = new TablationClient3({
     baseUrl: `${route.baseUrl}/api`,
     apiKey: resolveApiKey(route),
     headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
@@ -9410,7 +9615,7 @@ async function resolveAgentId(route, role, opts) {
 async function fetchDivergedPrompt(route, role, opts) {
   const agentId = await resolveAgentId(route, role, opts);
   if (!agentId || !route.resolved) return void 0;
-  const client2 = new TablationClient2({
+  const client2 = new TablationClient3({
     baseUrl: `${route.baseUrl}/api`,
     apiKey: resolveApiKey(route),
     headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
@@ -9448,7 +9653,7 @@ function choiceValue(v) {
 async function fetchSeatPersona(route, role, opts) {
   const agentId = await resolveAgentId(route, role, opts);
   if (!agentId || !route.resolved) return void 0;
-  const client2 = new TablationClient2({
+  const client2 = new TablationClient3({
     baseUrl: `${route.baseUrl}/api`,
     apiKey: resolveApiKey(route),
     headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
@@ -9496,7 +9701,7 @@ async function syncPersonas(route, opts) {
     throw new AgentsSyncError(`route "${route.route}" has no resolved ids \u2014 run \`crew connect\` first`);
   }
   const workspaceId = route.resolved.workspaceId;
-  const client2 = new TablationClient2({
+  const client2 = new TablationClient3({
     baseUrl: `${route.baseUrl}/api`,
     apiKey: resolveApiKey(route),
     headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
@@ -9505,7 +9710,7 @@ async function syncPersonas(route, opts) {
   try {
     agentsModel = await client2.dataModels.get("agents", workspaceId);
   } catch (e) {
-    if (e instanceof TablationApiError && e.status === 404) {
+    if (e instanceof TablationApiError2 && e.status === 404) {
       throw new AgentsSyncError(
         `workspace ${workspaceId} has no Agents table yet \u2014 every workspace auto-provisions one (ISSUE-465); an older workspace may still need its one-time backfill`
       );
@@ -9579,7 +9784,7 @@ async function syncPersonas(route, opts) {
       agentPersonas[role] = { agentId: row.id, lastSyncedUpdatedAt: updated.updated_at, ...historyId ? { historyId } : {} };
       outcomes.push({ role, action: "updated", agentId: row.id });
     } catch (e) {
-      if (e instanceof StaleWriteError6) {
+      if (e instanceof StaleWriteError7) {
         outcomes.push({ role, action: "diverged", agentId: row.id });
         continue;
       }
@@ -10064,119 +10269,6 @@ import {
   DeviceLoginError
 } from "@tablation/client";
 
-// src/skills.ts
-import { readFileSync as readFileSync11, readdirSync as readdirSync2, existsSync as existsSync16 } from "fs";
-import { join as join16 } from "path";
-import { parse as parseYaml } from "yaml";
-import { TablationClient as TablationClient3, StaleWriteError as StaleWriteError7, TablationApiError as TablationApiError2 } from "@tablation/client";
-var SkillSyncError = class extends Error {
-};
-function parseSkillFile(path) {
-  const text = readFileSync11(path, "utf8");
-  const match = /^---\n([\s\S]*?)\n---\n([\s\S]*)$/.exec(text);
-  if (!match) throw new SkillSyncError(`${path}: missing YAML frontmatter (expected a leading --- block)`);
-  const frontmatter = match[1];
-  const body = match[2];
-  const meta = parseYaml(frontmatter);
-  if (typeof meta.name !== "string" || !meta.name) throw new SkillSyncError(`${path}: frontmatter is missing "name"`);
-  if (typeof meta.description !== "string" || !meta.description) {
-    throw new SkillSyncError(`${path}: frontmatter is missing "description"`);
-  }
-  return { name: meta.name, description: meta.description, prompt: body, file: path };
-}
-function listLocalSkills(promptsDir) {
-  const dir = join16(promptsDir, "skills");
-  if (!existsSync16(dir)) return [];
-  return readdirSync2(dir).filter((f) => f.endsWith(".md")).map((f) => parseSkillFile(join16(dir, f)));
-}
-async function syncSkills(route, opts) {
-  if (!route.resolved) {
-    throw new SkillSyncError(`route "${route.route}" has no resolved ids \u2014 run \`crew connect\` first`);
-  }
-  const workspaceId = route.resolved.workspaceId;
-  const client2 = new TablationClient3({
-    baseUrl: `${route.baseUrl}/api`,
-    apiKey: resolveApiKey(route),
-    headers: { "User-Agent": opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" }
-  });
-  let skillsModel;
-  try {
-    skillsModel = await client2.dataModels.get("agent_skills", workspaceId);
-  } catch (e) {
-    if (e instanceof TablationApiError2 && e.status === 404) {
-      throw new SkillSyncError(
-        `workspace ${workspaceId} has no Agent Skills table yet \u2014 every workspace auto-provisions one; an older workspace may still need its one-time backfill`
-      );
-    }
-    throw e;
-  }
-  const local = listLocalSkills(route.promptsDir);
-  const rows = await client2.records.list(skillsModel.id, { limit: 200 });
-  const cache = route.resolved.agentSkills ?? {};
-  const outcomes = [];
-  const agentSkills = { ...cache };
-  for (const skill of local) {
-    const row = rows.find((r) => r.name === skill.name);
-    if (!row) {
-      if (opts.dryRun) {
-        outcomes.push({ name: skill.name, action: "created", skillId: "(dry run)" });
-        continue;
-      }
-      const created = await client2.records.create(skillsModel.id, {
-        name: skill.name,
-        description: skill.description,
-        prompt: skill.prompt
-      });
-      agentSkills[skill.name] = { skillId: created.id, lastSyncedUpdatedAt: created.updated_at };
-      outcomes.push({ name: skill.name, action: "created", skillId: created.id });
-      continue;
-    }
-    if (row.description === skill.description && row.prompt === skill.prompt) {
-      agentSkills[skill.name] = { skillId: row.id, lastSyncedUpdatedAt: row.updated_at };
-      outcomes.push({ name: skill.name, action: "unchanged", skillId: row.id });
-      continue;
-    }
-    const knownBaseline = cache[skill.name]?.skillId === row.id ? cache[skill.name]?.lastSyncedUpdatedAt : void 0;
-    if (!knownBaseline) {
-      outcomes.push({ name: skill.name, action: "diverged", skillId: row.id });
-      continue;
-    }
-    if (opts.dryRun) {
-      outcomes.push({ name: skill.name, action: "updated", skillId: row.id });
-      continue;
-    }
-    try {
-      const updated = await client2.records.update(
-        skillsModel.id,
-        row.id,
-        { description: skill.description, prompt: skill.prompt },
-        knownBaseline
-      );
-      agentSkills[skill.name] = { skillId: row.id, lastSyncedUpdatedAt: updated.updated_at };
-      outcomes.push({ name: skill.name, action: "updated", skillId: row.id });
-    } catch (e) {
-      if (e instanceof StaleWriteError7) {
-        outcomes.push({ name: skill.name, action: "diverged", skillId: row.id });
-        continue;
-      }
-      throw e;
-    }
-  }
-  return { outcomes, agentSkills };
-}
-function describeSkillSyncOutcome(o) {
-  switch (o.action) {
-    case "created":
-      return `${o.name}: created (${o.skillId})`;
-    case "updated":
-      return `${o.name}: prompt updated from crew's local file`;
-    case "unchanged":
-      return `${o.name}: already in sync`;
-    case "diverged":
-      return `${o.name}: HAS LOCAL EDITS \u2014 crew's default is newer but was NOT applied; review ${o.skillId} in the app before syncing again`;
-  }
-}
-
 // src/logbook.ts
 import { createHash as createHash3 } from "crypto";
 import { TablationClient as TablationClient4 } from "@tablation/client";
@@ -11653,6 +11745,7 @@ async function runRoleAgent(role, decision, ctx) {
     ticket: ticketHint,
     repo: ticketRepo,
     divergedPrompt: await fetchDivergedPrompt(route, role, { userAgent: ship.userAgent }),
+    skillOverrides: await fetchSkillOverrides(route, { userAgent: ship.userAgent }),
     agentPersona: await fetchSeatPersona(route, role, { userAgent: ship.userAgent }),
     resolvedAgentId: await resolveAgentId(route, role, { userAgent: ship.userAgent })
   });
@@ -12747,6 +12840,7 @@ ${changed2.map((c) => `  - ${c}
             ticket: w.decision.actionable.top?.issue_id,
             repo: repoTargetFor(w.route, w.decision.actionable.top?.repo_id)?.name,
             divergedPrompt: await fetchDivergedPrompt(w.route, w.role, { userAgent: cfg.ship.userAgent }),
+            skillOverrides: await fetchSkillOverrides(w.route, { userAgent: cfg.ship.userAgent }),
             agentPersona: await fetchSeatPersona(w.route, w.role, { userAgent: cfg.ship.userAgent }),
             resolvedAgentId: await resolveAgentId(w.route, w.role, { userAgent: cfg.ship.userAgent })
           });
@@ -12843,6 +12937,7 @@ ${changed2.map((c) => `  - ${c}
           ticket: fleetTicketHint,
           repo: fleetTicketRepo,
           divergedPrompt: await fetchDivergedPrompt(w.route, w.role, { userAgent: cfg.ship.userAgent }),
+          skillOverrides: await fetchSkillOverrides(w.route, { userAgent: cfg.ship.userAgent }),
           agentPersona: await fetchSeatPersona(w.route, w.role, { userAgent: cfg.ship.userAgent }),
           resolvedAgentId: await resolveAgentId(w.route, w.role, { userAgent: cfg.ship.userAgent })
         });
@@ -13051,6 +13146,7 @@ ${changed2.map((c) => `  - ${c}
           ticket: ticketHint,
           repo: ticketRepo,
           divergedPrompt: await fetchDivergedPrompt(route, current, { userAgent: cfg.ship.userAgent }),
+          skillOverrides: await fetchSkillOverrides(route, { userAgent: cfg.ship.userAgent }),
           agentPersona: await fetchSeatPersona(route, current, { userAgent: cfg.ship.userAgent }),
           resolvedAgentId: await resolveAgentId(route, current, { userAgent: cfg.ship.userAgent })
         });
@@ -13313,6 +13409,9 @@ ${changed2.map((c) => `  - ${c}
       for (const o of personaResult.outcomes) process.stdout.write(`${describeSyncOutcome(o)}
 `);
       for (const o of personaResult.crewLinks) process.stdout.write(`${describeCrewLink(o)}
+`);
+      const briefs = Object.fromEntries(ROLE_NAMES.map((r) => [r, personaDefaultPrompt(target.promptsDir, r)]));
+      for (const w of skillMarkerWarnings(target.promptsDir, briefs)) process.stderr.write(`crew agents sync: warning: ${w}
 `);
       let skillResult;
       try {