@tablation/crew 0.47.3 → 0.49.0

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 {
@@ -9081,6 +9105,30 @@ function releaseIdle(i) {
 }
 var renderTag = (template, version) => template.replace(/\{version\}/g, version);
 
+// src/verified-tip.ts
+var PUSHED_RE = /^pushed ([0-9a-f]{40}) to \S+$/;
+function parsePushedSha(message) {
+  return PUSHED_RE.exec((message ?? "").trim())?.[1] ?? null;
+}
+function verifiedShaFor(ticket, verifiedShaColumn, pushedEvents) {
+  const col = ticket[verifiedShaColumn];
+  if (typeof col === "string" && /^[0-9a-f]{7,40}$/i.test(col.trim())) return col.trim();
+  const when = (e) => Date.parse(e.occurred_at ?? e.created_at ?? "") || 0;
+  const newest = pushedEvents.filter((e) => e.record_id === ticket.id && parsePushedSha(e.message)).sort((a, b) => when(b) - when(a))[0];
+  return newest ? parsePushedSha(newest.message) : null;
+}
+function movedPastVerified(cwd, branch, verified) {
+  const tip = gitOk(cwd, ["rev-parse", "-q", "--verify", `refs/heads/${branch}^{commit}`]);
+  const ver = gitOk(cwd, ["rev-parse", "-q", "--verify", `${verified}^{commit}`]);
+  if (!tip || !ver || tip === ver) return null;
+  if (isAncestor(cwd, tip, ver)) return null;
+  if (isAncestor(cwd, ver, tip)) {
+    const own = gitOk(cwd, ["rev-list", "--first-parent", "--no-merges", "--count", `${ver}..${tip}`]);
+    if (own === "0") return null;
+  }
+  return { tip, verified: ver };
+}
+
 // src/stamp.ts
 function planStamp(cwd, tickets, contract, fromSha, toSha, merged = /* @__PURE__ */ new Map()) {
   const range = fromSha ? `${fromSha.slice(0, 8)}..${toSha.slice(0, 8)}` : null;
@@ -9280,7 +9328,7 @@ ${h.prFailure.tail}
   }
   for (const q of outcome.requeues) {
     const t = q.ticket;
-    const body = `The branch is no longer what was verified: \`verified_sha\` is ${q.verified.slice(0, 8)}, the branch is now at ${q.head.slice(0, 8)}. Returned to ${contract.statuses.handoff} for QA to check what changed.`;
+    const body = `The branch is no longer what was verified: QA verified ${q.verified.slice(0, 8)}, the branch is now at ${q.head.slice(0, 8)}. Returned to ${contract.statuses.handoff} for QA to check what changed.`;
     if (dryRun) {
       emit.emit(`would return to ${contract.statuses.handoff} \u2014 branch moved past ${q.verified.slice(0, 8)}`, { ticket: t.issue_id });
       continue;
@@ -9691,6 +9739,11 @@ function reportHeld(o, held) {
   o.state?.noteHeldReported?.(signature);
 }
 async function runRelease(o) {
+  const movedPast2 = [];
+  const out = await runReleaseCycle(o, movedPast2);
+  return movedPast2.length ? { ...out, movedPast: movedPast2 } : out;
+}
+async function runReleaseCycle(o, movedPast2) {
   const scoped = (msg) => o.scope ? `${o.scope}: ${msg}` : msg;
   const tagPattern = o.repo.release.tagPattern ?? "v*";
   o.emit.enter("release");
@@ -9707,6 +9760,23 @@ async function runRelease(o) {
     }
     if (skipped.size) releasable = o.tickets.filter((t) => !skipped.has(t.id));
   }
+  if (o.verifiedShas?.size) {
+    const drop = /* @__PURE__ */ new Set();
+    for (const t of releasable) {
+      const verified = o.verifiedShas.get(t.id);
+      if (t.status !== o.contract.statuses.verified || !verified) continue;
+      const branch = locateBranchForTicket(o.cwd, o.repo, t)?.branch;
+      const moved = branch ? movedPastVerified(o.cwd, branch, verified) : null;
+      if (!moved) continue;
+      drop.add(t.id);
+      movedPast2.push({ ticket: t, verified: moved.verified, head: moved.tip });
+      o.emit.error(
+        `not releasing ${t.issue_id}: ${branch} is at ${moved.tip.slice(0, 8)}, past the ${moved.verified.slice(0, 8)} QA verified`,
+        { ticket: t.issue_id }
+      );
+    }
+    if (drop.size) releasable = releasable.filter((t) => !drop.has(t.id));
+  }
   const decision = decideRelease(o.cwd, releasable, o.contract, {
     tagPattern,
     base: o.repo.branch.base,
@@ -11150,7 +11220,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 {
@@ -12619,7 +12689,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 })
@@ -13462,6 +13532,21 @@ ${changed2.map((c) => `  - ${c}
       );
       reportUnplaceable(c.route, unplaceable, tracker.contract.statuses.verified, remit);
       const blockerInfo = blockerInfoMap(all, await tracker.ticketsByIds(missingBlockerIds(all)));
+      const verifiedStatus = tracker.contract.statuses.verified;
+      const verifiedTickets = tickets.filter((t) => t.status === verifiedStatus);
+      const verifiedShas = /* @__PURE__ */ new Map();
+      if (verifiedTickets.length && repo.release.mode !== "external") {
+        let pushedEvents = [];
+        try {
+          pushedEvents = await tracker.events("pushed");
+        } catch (e) {
+          remit.warn(`could not read hand-off events; not checking branches against what QA verified: ${e.message}`);
+        }
+        for (const t of verifiedTickets) {
+          const sha = verifiedShaFor(t, tracker.contract.columns.verifiedSha, pushedEvents);
+          if (sha) verifiedShas.set(t.id, sha);
+        }
+      }
       const outcome = await runRelease({
         cwd: target.dir,
         repo,
@@ -13470,6 +13555,7 @@ ${changed2.map((c) => `  - ${c}
         blockerInfo,
         emit: remit,
         scope,
+        verifiedShas,
         state: state.release(scope),
         reviewColumns: repo.release.mode === "external" ? await tracker.reviewColumns() : void 0,
         dryRun,
@@ -13565,6 +13651,18 @@ ${changed2.map((c) => `  - ${c}
           dryRun
         );
       }
+      if (outcome.movedPast?.length) {
+        await applyReview(
+          tracker,
+          tracker.contract,
+          { handoffs: [], requeues: outcome.movedPast },
+          repo.branch.remote,
+          remit,
+          releaseSeat(c),
+          { verifiedSha: false, prRef: false },
+          dryRun
+        );
+      }
       const news = describeRelease(outcome, scope);
       if (news) {
         const notified = await notify(c, cfg.ship, news, remit, dryRun);
@@ -13770,7 +13868,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 })
@@ -13867,7 +13965,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 })
@@ -14076,7 +14174,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.47.3",
+  "version": "0.49.0",
   "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",