@pmelab/gtd 64.2.0 → 65.0.0

package/claude/hooks/register.tsx

@@ -25,9 +25,8 @@ import type { Judgment } from "./judge"
 import { catchFrom, throwTo } from "./handoff"
 import { jobs } from "./jobs"
 import { documents, readDocument } from "./schema"
-import { READ_ONLY_GIT, ship } from "./ship"
 import { withRequirements } from "./sketch"
-import type { Shipped, ShipIo } from "./ship"
+import type { Done, GitIo } from "./git"
 import { collectAnswer } from "./delegate"
 import { decideCommand, decideContinue, decideJob, restId, TOOLS } from "./tools"
 import type { JobName } from "./tools"
@@ -72,7 +71,7 @@ let isDriving = false
 // bumped by every stop, so a queued continue that was mid-check sees it
 let stopCount = 0
 // subagents answering into a file: what each may touch (see tool.call)
-const delegates = new Map<string, { file: string; mayRun: RegExp | undefined }>()
+const delegates = new Map<string, { file: string }>()
 const ours = new Set<string>()
 // What each turn agent may read and write; reset on every spawn and resume,
 // since the steering file can differ per step.
@@ -295,8 +294,7 @@ async function wake($: $) {
   const r = await read($, run)
   const stop = r.stop
   if (!stop || !r.rest) return
-  const branch = stop.kind === "done" ? await shippable($) : undefined
-  if (!wakes(stop, branch)) return
+  if (!wakes(stop)) return
   const questions = stop.isJudge ? await openQuestions($) : undefined
   const text = wakePrompt({
     stop,
@@ -304,7 +302,6 @@ async function wake($: $) {
     notes: r.notes,
     isRepeat: r.isRepeat,
     questions,
-    branch,
   })
   await update($, run, (x) => ({ ...x, notes: undefined }))
   // Not from inside the hook that started the run: a prompt submitted there
@@ -321,16 +318,6 @@ async function openQuestions($: $) {
   }
 }
 
-// The branch a finished process can open its pull request from, if any.
-async function shippable($: $) {
-  const branch = (
-    await $.process.run(["git", "rev-parse", "--abbrev-ref", "HEAD"], { cwd: root })
-  ).stdout.trim()
-  if (["main", "master", "HEAD"].includes(branch)) return undefined
-  const summary = await $.process.run(["gtd", "summary"], { cwd: root })
-  return summary.exitCode === 0 ? branch : undefined
-}
-
 // A new process starts from the requirements written to the steering file an
 // idle rest names; the opening beat captures them like a hand-edit.
 async function begin($: $, requirements: string) {
@@ -440,8 +427,8 @@ function startJob(
   $: $,
   job: JobName,
   isInTurn: boolean,
-  work: () => Promise<Shipped>,
-  then?: (outcome: Shipped) => Promise<void>,
+  work: () => Promise<Done>,
+  then?: (outcome: Done) => Promise<void>,
 ) {
   const answer = background.start(job, work, true, async (outcome) => {
     if (then) await then(outcome)
@@ -457,7 +444,7 @@ function startJob(
 }
 
 async function throwNow($: $, target: string | undefined, isInTurn: boolean) {
-  const refused = decideJob(await read($, run), "handoff")
+  const refused = decideJob(await read($, run))
   if (refused) return refused
   return startJob(
     $,
@@ -474,7 +461,7 @@ async function throwNow($: $, target: string | undefined, isInTurn: boolean) {
         content: b.content,
         isIdle: isTrue(b.idle),
       }
-      return throwTo(shipIo($), rest, target, new Date().toISOString())
+      return throwTo(gitIo($), rest, target, new Date().toISOString())
     },
     async (thrown) => {
       if (!thrown.ok) return
@@ -490,7 +477,7 @@ async function throwNow($: $, target: string | undefined, isInTurn: boolean) {
 
 async function enterNow($: $, door: string, args: string[]) {
   if ((await read($, run)).isRunning) return "Stop the loop first: /gtd stop."
-  const entered = await enter(shipIo($), door, args)
+  const entered = await enter(gitIo($), door, args)
   if (entered.ok) await start($)
   return entered.text
 }
@@ -511,7 +498,7 @@ async function prNow($: $) {
   if (r.pr && !isReviewGate(r.stop)) {
     return "Review threads from an earlier /gtd pr wait for the review's first review gate."
   }
-  const io = shipIo($)
+  const io = gitIo($)
   const pr = await currentPr(io)
   if (typeof pr === "string") return pr
   const threads = await unresolvedThreads(io, pr)
@@ -585,7 +572,7 @@ async function prRest($: $, stop: Stop) {
 async function replyThreads($: $, stop: Stop) {
   const pr = (await read($, run)).pr
   if (!pr?.importedAt) return
-  const io = shipIo($)
+  const io = gitIo($)
   const found = await decided(
     io,
     pr.importedAt,
@@ -618,7 +605,7 @@ async function replyThreads($: $, stop: Stop) {
 // shown to the catcher first, never landed unseen.
 async function catchNow($: $, ref: string) {
   if ((await read($, run)).isRunning) return "Stop the loop first: /gtd stop."
-  const caught = await catchFrom(shipIo($), ref)
+  const caught = await catchFrom(gitIo($), ref)
   if (!caught.ok) return caught.text
   await findRoot($)
   const b = await docs($).next()
@@ -636,27 +623,11 @@ async function catchNow($: $, ref: string) {
   return caught.text
 }
 
-// Ship's text turns need git to read the process, so they run as a subagent.
-// Its answer is a file, not its hand-back: a hand-back never reaches a mod.
-// `mayRun`: the only shell commands the subagent may run; none when absent.
 type Delegate = {
   name: string
   description: string
   system: string
   tools: string[]
-  mayRun?: RegExp
-}
-
-const SHIPPER: Delegate = {
-  name: "shipper",
-  description:
-    "Writes commit messages and pull requests for gtd's ship, spawned by the gtd mod only",
-  system:
-    "You write commit messages and pull-request descriptions for gtd's ship command. Read the repository with git and the file tools as the instructions ask. Never modify the repository: no commits, no checkouts, no pushes.",
-  tools: ["Bash", "Read", "Grep", "Glob", "Write", "Skill"],
-  // It reads commit messages anyone on the branch wrote: read-only git, and
-  // no shell syntax to chain anything else onto it.
-  mayRun: READ_ONLY_GIT,
 }
 
 // gtd's llm judge persona; writing its answer file is its one tool.
@@ -693,7 +664,7 @@ async function delegate($: $, who: Delegate, prompt: string, model: string, deli
   const id = spawned.agentId
   if (!id) return undefined
   ours.add(id)
-  delegates.set(id, { file, mayRun: who.mayRun })
+  delegates.set(id, { file })
   // A timed-out agent may still be running: it keeps its tool limits until its
   // turn ends, where turn.complete drops them.
   return collectAnswer({
@@ -704,11 +675,6 @@ async function delegate($: $, who: Delegate, prompt: string, model: string, deli
   })
 }
 
-async function writer($: $, prompt: string) {
-  const model = (await $.env.get("GTD_PLANNERMODEL")) ?? "opus"
-  return delegate($, SHIPPER, prompt, model, "Your final answer, exactly as you would print it.")
-}
-
 // Where `gtd judge run` would pick its llm, a judge gate is put to a small
 // model as that provider does, but as a subagent of this session. Any doubt leaves the
 // gate to the person, which routes the workflow its cautious way.
@@ -729,39 +695,19 @@ async function judgeInSession($: $, j: Judgment) {
   }
 }
 
-function shipIo($: $): ShipIo {
+function gitIo($: $): GitIo {
   return {
     run: async (argv, stdin) => {
       const r = await $.process.run(argv, { cwd: root, stdin, timeoutMs: TEN_MINUTES })
       return { code: r.exitCode, out: r.stdout, err: r.stderr }
     },
-    complete: (prompt) => writer($, prompt),
     log: (line) => {
       for (const l of line.split("\n")) $.ui.log(l)
       if (background.busy()) $.ui.status(line.split("\n")[0]!)
     },
-    today: () => new Date().toISOString().slice(0, 10),
   }
 }
 
-async function shipNow($: $, isDry: boolean, isInTurn: boolean) {
-  const refused = decideJob(await read($, run), "ship")
-  if (refused) return refused
-  return startJob(
-    $,
-    "ship",
-    isInTurn,
-    async () => {
-      $.ui.status(isDry ? "previewing the pull request…" : "opening the pull request…")
-      return ship(shipIo($), isDry)
-    },
-    async (shipped) => {
-      // a failed ship leaves the run as it was; a dry run changes nothing
-      if (shipped.ok && !isDry) await dismiss($)
-    },
-  )
-}
-
 // Turns a missing CLI or a wrong directory into an instruction, not a stack trace.
 // The plugin is gtd's own npm package, so it runs the gtd it ships and the mod
 // and the CLI never disagree. A checkout without a build falls back to PATH.
@@ -986,8 +932,6 @@ async function command($: $, arg: string): Promise<string | undefined> {
       return rest[0]
         ? catchNow($, rest[0])
         : "Name the pull request or branch: /gtd catch <number|branch>."
-    case "ship":
-      return shipNow($, rest[0] === "-n" || rest[0] === "--dry-run", false)
     case "":
       return resume($)
     default:
@@ -997,7 +941,7 @@ async function command($: $, arg: string): Promise<string | undefined> {
 
 // A door wins over the bare `pr` verb; anything else is requirements.
 async function routed($: $, verb: string, rest: string[], arg: string) {
-  if (doorFor(await doors(shipIo($)), verb, rest)) return enterNow($, verb, rest)
+  if (doorFor(await doors(gitIo($)), verb, rest)) return enterNow($, verb, rest)
   return verb === "pr" && rest.length === 0 ? prNow($) : begin($, arg)
 }
 
@@ -1067,12 +1011,9 @@ function subagentDenial(agentId: string, e: Record<string, unknown>) {
   if (denial) return denial
   const delegated = delegates.get(agentId)
   if (!delegated) return undefined
-  if (e.tool === "Write" && e.file_path !== delegated.file) {
+  if ((e.tool === "Write" && e.file_path !== delegated.file) || e.tool === "Bash") {
     return `Write only your answer, to ${delegated.file}.`
   }
-  if (e.tool === "Bash" && !delegated.mayRun?.test(String(e.command).trim())) {
-    return "Only read-only git commands, without shell syntax, are allowed here."
-  }
   return undefined
 }
 
@@ -1111,7 +1052,7 @@ export const register: Register = (on) => {
       name: "gtd",
       description: "Drive gtd until it rests on you; pass requirements to start a new process",
       argumentHint:
-        "[requirements | <door> [args] | stop | status | ui | ship [-n] | pr | throw [@user] | catch <pr|branch>]",
+        "[requirements | <door> [args] | stop | status | ui | pr | throw [@user] | catch <pr|branch>]",
       immediate: true,
     })
     return next(e)
@@ -1191,9 +1132,6 @@ export const register: Register = (on) => {
   on("tool.call", { tool: "mcp__gtd__handoff" }, async ($, e) =>
     answer(await throwNow($, typeof e.to === "string" && e.to ? e.to : undefined, true), true),
   )
-  on("tool.call", { tool: "mcp__gtd__ship" }, async ($, e) =>
-    answer(await shipNow($, e.dryRun === true, true), true),
-  )
   on("tool.call", { tool: "mcp__gtd__browser" }, async ($) => answer(await browse($), true))
 
   on("agent.offer", ($, e, next) => (e.agent.startsWith("gtd:") ? { isOffered: false } : next(e)))

package/claude/hooks/tools.ts

@@ -10,7 +10,6 @@ export const TOOL = {
   continue: "mcp__gtd__continue",
   note: "mcp__gtd__note",
   handoff: "mcp__gtd__handoff",
-  ship: "mcp__gtd__ship",
   browser: "mcp__gtd__browser",
 } as const
 
@@ -44,12 +43,6 @@ export const TOOLS = [
       "Hands the gtd process to someone else: pushes the branch and opens or refreshes a draft pull request assigned to them. Call it only when the person asks. `to`: their GitHub username; omit it to leave the process for anyone.",
     inputSchema: { type: "object", properties: { to: { type: "string" } } },
   },
-  {
-    name: "ship",
-    description:
-      "Combines the finished gtd process into one commit, pushes it and opens or updates its pull request. Call it only after the person agreed. `dryRun` previews without writing anything.",
-    inputSchema: { type: "object", properties: { dryRun: { type: "boolean" } } },
-  },
   {
     name: "browser",
     description:
@@ -71,21 +64,21 @@ export type ContinueIo = {
   // the rest's own `gtd validate` script, run; ok when there is nothing to check
   validate(): Promise<{ ok: boolean; out: string }>
   judgment(): Promise<Judgment | undefined>
-  // a ship or hand-off running or queued: it writes the tree the driver would
+  // a hand-off running or queued: it writes the tree the driver would
   busy?: JobName
 }
 
-export type JobName = "ship" | "handoff"
+export type JobName = "handoff"
 
-export const JOB_NAME: Record<JobName, string> = { ship: "ship", handoff: "hand-off" }
+export const JOB_NAME: Record<JobName, string> = { handoff: "hand-off" }
 
 const busyText = (job: JobName) => `A ${JOB_NAME[job]} is still running: wait for its report.`
 
-// Only these leave the tree alone (ship and throw refuse for themselves); any
+// Only these leave the tree alone (throw refuses for itself); any
 // other verb, unknown ones included, may switch branch or write .gtd/. `stop`
 // is not here: `command` takes the bare word itself, and `stop <words>` is a
 // requirement. `ui` is not: its page writes steering files.
-const WHILE_BUSY = new Set(["status", "throw", "ship"])
+const WHILE_BUSY = new Set(["status", "throw"])
 
 export function decideCommand(arg: string, busy: JobName | undefined): string | undefined {
   if (!busy) return undefined
@@ -94,13 +87,9 @@ export function decideCommand(arg: string, busy: JobName | undefined): string |
 }
 
 // Pure: a refused job leaves the run, and so `continue`, as it was.
-export function decideJob(run: Run, job: JobName): string | undefined {
+export function decideJob(run: Run): string | undefined {
   if (run.isRunning) return "gtd is running a step: wait for it to rest."
   if (run.pending) return "A continue is already waiting for this turn to end."
-  const kind = run.stop?.kind
-  if (job === "ship" && (kind === "gate" || kind === "stalled" || kind === "error")) {
-    return "gtd still waits on the person at this step: answer it with continue first."
-  }
   return undefined
 }
 
@@ -116,9 +105,7 @@ export async function decideContinue(
   if (io.busy) return { refuse: busyText(io.busy) }
   const stop = run.stop
   if (!stop) return { refuse: "Nothing is waiting: gtd has no rest open. /gtd drives it." }
-  if (stop.kind === "done") {
-    return { refuse: `The process is finished: ${TOOL.ship} opens its pull request.` }
-  }
+  if (stop.kind === "done") return { refuse: "The process is finished: nothing waits here." }
   if (rest !== undefined && rest !== run.rest) {
     return {
       refuse: "gtd has moved on from that step; it no longer waits there. Nothing was changed.",

package/claude/hooks/wording.ts

@@ -2,7 +2,7 @@
 
 import type { Stop } from "../types"
 import type { Beat } from "./drive"
-import type { Shipped } from "./ship"
+import type { Done } from "./git"
 import { JOB_NAME } from "./tools"
 import type { JobName } from "./tools"
 
@@ -61,8 +61,8 @@ export function pushText(stop: Stop, repo: string, url?: string) {
 
 const capitalised = (s: string) => s[0]!.toUpperCase() + s.slice(1)
 
-export const jobHeadline = (job: JobName, outcome: Shipped) =>
+export const jobHeadline = (job: JobName, outcome: Done) =>
   `${outcome.ok ? "✔" : "✘"} ${capitalised(JOB_NAME[job])} ${outcome.ok ? "finished" : "failed"}`
 
-export const jobPushText = (job: JobName, outcome: Shipped, repo: string) =>
+export const jobPushText = (job: JobName, outcome: Done, repo: string) =>
   `${repo}: ${JOB_NAME[job]} ${outcome.ok ? "finished" : "failed"}. ${outcome.text}`.trim()

package/dist/chunks/{flows-dnIE_qbe.mjs → flows-DGs0W3HI.mjs}

@@ -60,6 +60,17 @@ const run = (name, body, options = {}) => ctx().step({
 	body,
 	options
 });
+/**
+* Squashes HEAD's tree, with `.gtd/` as the user's branch has it, into one commit on the user's branch
+* with `message`, and moves that branch there; HEAD stays on `gtd/<b>`.
+* Resolves to the new commit's hash, or `undefined` when nothing shipped.
+*/
+const ship = (name, message, options = {}) => ctx().step({
+	kind: "ship",
+	name,
+	message,
+	options
+});
 /** A judge gate: resolves to what the judge answered, for the flow to decide on. */
 const judge = (name, spec) => {
 	const { questions, evidence, ...options } = spec;
@@ -551,7 +562,8 @@ const CONFIG_KEYS = [
 	"modes",
 	"ui",
 	"skills",
-	"access"
+	"access",
+	"historyRemote"
 ];
 const MODE_KEYS = ["format", "validate"];
 const UI_KEYS = [
@@ -622,6 +634,10 @@ const configProblems = (value) => {
 		...unknownKeys(value, CONFIG_KEYS, []),
 		...value.modes === void 0 ? [] : recordOf(value.modes, ["modes"], "modes", modeProblems),
 		...value.ui === void 0 ? [] : uiProblems(value.ui, ["ui"]),
+		...value.historyRemote === void 0 || typeof value.historyRemote === "string" && value.historyRemote.trim() !== "" ? [] : [{
+			path: ["historyRemote"],
+			message: "must be a non-empty remote name"
+		}],
 		...value.skills === void 0 ? [] : recordOf(value.skills, ["skills"], "skill-name arrays", (v, path) => isStringArray(v) ? [] : [{
 			path,
 			message: "must be an array of skill names"
@@ -690,6 +706,7 @@ var flows_exports = /* @__PURE__ */ __exportAll({
 	sections: () => sections,
 	settings: () => settings,
 	settingsOf: () => settingsOf,
+	ship: () => ship,
 	showScript: () => showScript,
 	skillsFor: () => skillsFor,
 	start: () => start,
@@ -698,4 +715,4 @@ var flows_exports = /* @__PURE__ */ __exportAll({
 	writeScript: () => writeScript,
 	wrote: () => wrote
 });
-export { run as $, FLOWS_PROTOCOL as A, head as B, moveScript as C, revertScript as D, restoreScript as E, changesSince as F, mark as G, installContext as H, codeThreads as I, openQuestions as J, markedOptions as K, envSettings as L, accessFor as M, agent as N, showScript as O, changes as P, restart as Q, envSettingsOf as R, checkScript as S, removeScript as T, judge as U, human as V, kept as W, read as X, protocolMismatch as Y, refuse as Z, requireRevert as _, defineWorkflow as a, skillsFor as at, wrote as b, check as c, workflow as ct, hasThreadFor as d, scope as et, judgeDiffShape as f, requireReplies as g, requireProgress as h, configure as i, settingsOf as it, FlowsProtocolError as j, writeScript as k, codeChanges as l, requireAnswers as m, configProblems as n, sections as nt, isFactoryWorkflow as o, start as ot, numeric as p, matches as q, defineConfig as r, settings as rt, answered as s, threads as st, flows_exports as t, sectionBodies as tt, displayPath as u, requireThreadsClosed as v, quote as w, applyScript as x, seamGate as y, glob as z };
+export { run as $, FLOWS_PROTOCOL as A, head as B, moveScript as C, revertScript as D, restoreScript as E, changesSince as F, mark as G, installContext as H, codeThreads as I, openQuestions as J, markedOptions as K, envSettings as L, accessFor as M, agent as N, showScript as O, changes as P, restart as Q, envSettingsOf as R, checkScript as S, removeScript as T, judge as U, human as V, kept as W, read as X, protocolMismatch as Y, refuse as Z, requireRevert as _, defineWorkflow as a, ship as at, wrote as b, check as c, threads as ct, hasThreadFor as d, scope as et, judgeDiffShape as f, requireReplies as g, requireProgress as h, configure as i, settingsOf as it, FlowsProtocolError as j, writeScript as k, codeChanges as l, workflow as lt, requireAnswers as m, configProblems as n, sections as nt, isFactoryWorkflow as o, skillsFor as ot, numeric as p, matches as q, defineConfig as r, settings as rt, answered as s, start as st, flows_exports as t, sectionBodies as tt, displayPath as u, requireThreadsClosed as v, quote as w, applyScript as x, seamGate as y, glob as z };