@tablation/crew 0.48.0 → 0.49.1

package/dist/cli.js

@@ -7470,6 +7470,17 @@ import { join as join13 } from "path";
 import { parse as parseYaml } from "yaml";
 import { TablationClient as TablationClient3, StaleWriteError as StaleWriteError8, TablationApiError as TablationApiError2 } from "@tablation/client";
 
+// src/prompt-additions.ts
+var PROMPT_ADDITIONS_SEPARATOR = "---\n\nAdditional instructions from this workspace. Where they conflict with anything above, these take precedence.";
+function appendAdditions(text, additions) {
+  if (typeof additions !== "string" || additions.trim() === "") return text;
+  return `${text}
+
+${PROMPT_ADDITIONS_SEPARATOR}
+
+${additions}`;
+}
+
 // src/agents.ts
 import { readFileSync as readFileSync10, existsSync as existsSync10 } from "fs";
 import { join as join12 } from "path";
@@ -7510,9 +7521,9 @@ async function resolveAgentId(route, role, opts) {
     return void 0;
   }
 }
-async function fetchDivergedPrompt(route, role, opts) {
+async function fetchPersonaPrompt(route, role, opts) {
   const agentId = await resolveAgentId(route, role, opts);
-  if (!agentId || !route.resolved) return void 0;
+  if (!agentId || !route.resolved) return {};
   const client2 = new TablationClient2({
     baseUrl: `${route.baseUrl}/api`,
     apiKey: resolveApiKey(route),
@@ -7525,8 +7536,17 @@ async function fetchDivergedPrompt(route, role, opts) {
     agentsModelId = agentsModel.id;
     row = await client2.records.get(agentsModelId, agentId);
   } catch {
-    return void 0;
+    return {};
   }
+  const additions = typeof row.prompt_additions === "string" && row.prompt_additions.trim() !== "" ? row.prompt_additions : void 0;
+  const divergedPrompt = await divergedRowPrompt(route, role, row, agentId, agentsModelId, opts);
+  return { divergedPrompt, additions };
+}
+function personaPromptOptions(p) {
+  return { divergedPrompt: p.divergedPrompt, personaAdditions: p.additions };
+}
+async function divergedRowPrompt(route, role, row, agentId, agentsModelId, opts) {
+  if (!route.resolved) return void 0;
   const defaultPrompt = personaDefaultPrompt(route.promptsDir, role);
   if (row.prompt === defaultPrompt) return void 0;
   const cached = route.resolved.agentPersonas?.[role];
@@ -7572,8 +7592,8 @@ async function fetchSeatPersona(route, role, opts) {
   }
 }
 async function currentPersonaPrompt(route, role, opts) {
-  const diverged = await fetchDivergedPrompt(route, role, opts);
-  return diverged ?? personaDefaultPrompt(route.promptsDir, role);
+  const { divergedPrompt, additions } = await fetchPersonaPrompt(route, role, opts);
+  return appendAdditions(divergedPrompt ?? personaDefaultPrompt(route.promptsDir, role), additions);
 }
 async function fetchHistoryEntries(route, agentsModelId, recordId, userAgent, limit = 50) {
   const url = `${route.baseUrl.replace(/\/+$/, "")}/api/data-models/${agentsModelId}/records/${recordId}/history?limit=${limit}`;
@@ -8031,14 +8051,18 @@ async function fetchSkillOverrides(route, opts) {
   const out = {};
   for (const row of rows) {
     const name = row.name;
-    if (row.prompt === local.get(name)?.prompt) continue;
-    if (row.prompt_customized !== true && row.prompt === row.prompt_baseline) continue;
-    const cached = cache[name];
-    if (cached?.skillId === row.id && cached.lastSyncedUpdatedAt === row.updated_at) continue;
-    out[name] = row.prompt;
+    const edited = isEditedSkillRow(row, local.get(name)?.prompt, cache[name]);
+    const base = edited ? row.prompt : local.get(name)?.prompt ?? row.prompt;
+    const composed = appendAdditions(base, row.prompt_additions);
+    if (edited || composed !== base) out[name] = composed;
   }
   return out;
 }
+function isEditedSkillRow(row, localPrompt, cached) {
+  if (row.prompt === localPrompt) return false;
+  if (row.prompt_customized !== true && row.prompt === row.prompt_baseline) return false;
+  return !(cached?.skillId === row.id && cached.lastSyncedUpdatedAt === row.updated_at);
+}
 function skillMarkerWarnings(promptsDir, personaPrompts) {
   const shipped = new Set(listLocalSkills(promptsDir).map((s) => s.name));
   const out = [];
@@ -8122,7 +8146,7 @@ function planAgentRun(o) {
   const common = usesCommon ? readFileSync12(commonPath, "utf8") : "";
   const brief = readFileSync12(briefPath, "utf8");
   const effectiveCommon = o.divergedPrompt ? "" : common;
-  const effectiveBrief = o.divergedPrompt ?? brief;
+  const effectiveBrief = appendAdditions(o.divergedPrompt ?? brief, o.personaAdditions);
   const localSkills = new Map(listLocalSkills(o.route.promptsDir).map((s) => [s.name, s.prompt]));
   let expanded;
   try {
@@ -8667,8 +8691,13 @@ ${v.reason[0].toUpperCase()}${v.reason.slice(1)}. Set back to \`in_progress\`, s
 async function enforceHandoff(i) {
   try {
     const t = await i.writer.ticket(i.ticketId);
-    if (t.status !== i.contract.statuses.handoff) return { kind: "not-handed-off" };
+    const st = i.contract.statuses;
     const log = { ticket: t.issue_id, step: "handoff" };
+    const claimed = [st.verifying, st.verified, st.deployed].some((s) => s && t.status === s);
+    if (t.status !== st.handoff && !claimed) {
+      i.log.emit(`${t.issue_id} is at ${t.status}, not handed off \u2014 nothing to check`, log);
+      return { kind: "not-handed-off" };
+    }
     const v = inspectHandoff(i.dir, i.cfg, t, i.role);
     if (v.kind === "unverified") {
       i.log.warn(`${t.issue_id} is at ${t.status} but the push was not checked: ${v.why}`, log);
@@ -8679,6 +8708,10 @@ async function enforceHandoff(i) {
       i.log.emit(`${t.issue_id} pushed at ${v.sha.slice(0, 7)} \u2014 handed on to QA`, log);
       return { kind: "pushed", sha: v.sha };
     }
+    if (claimed) {
+      i.log.warn(`${t.issue_id} is at ${t.status} but its branch is not on the remote at HEAD: ${v.reason}`, log);
+      return { kind: "failed", why: v.reason };
+    }
     const heldBy = i.hold ? t[i.hold.column] : void 0;
     await i.writer.updateTicket(t.id, {
       status: i.contract.statuses.building,
@@ -11196,7 +11229,7 @@ async function showLogEntry(route, entryId, opts = {}) {
       }
     };
   }
-  const prompt = match.prompt ?? "";
+  const prompt = appendAdditions(match.prompt ?? "", match.prompt_additions);
   const actualSha = createHash3("sha256").update(prompt).digest("hex");
   const exact = !!entry.prompt_sha && actualSha === entry.prompt_sha;
   return {
@@ -12665,7 +12698,7 @@ async function runRoleAgent(role, decision, ctx) {
     cycle: emit.cycle,
     ticket: ticketHint,
     repo: ticketRepo,
-    divergedPrompt: await fetchDivergedPrompt(route, role, { userAgent: ship.userAgent }),
+    ...personaPromptOptions(await fetchPersonaPrompt(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 })
@@ -13844,7 +13877,7 @@ ${changed2.map((c) => `  - ${c}
             cycle: wemit.cycle,
             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 }),
+            ...personaPromptOptions(await fetchPersonaPrompt(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 })
@@ -13941,7 +13974,7 @@ ${changed2.map((c) => `  - ${c}
           cycle: wemit.cycle,
           ticket: fleetTicketHint,
           repo: fleetTicketRepo,
-          divergedPrompt: await fetchDivergedPrompt(w.route, w.role, { userAgent: cfg.ship.userAgent }),
+          ...personaPromptOptions(await fetchPersonaPrompt(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 })
@@ -14150,7 +14183,7 @@ ${changed2.map((c) => `  - ${c}
           cycle: emit.cycle,
           ticket: ticketHint,
           repo: ticketRepo,
-          divergedPrompt: await fetchDivergedPrompt(route, current, { userAgent: cfg.ship.userAgent }),
+          ...personaPromptOptions(await fetchPersonaPrompt(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 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.48.0",
+  "version": "0.49.1",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",