@pmelab/gtd 59.0.0 → 59.0.1

package/src/twins/EmittedScriptRecognizer.ts

@@ -16,7 +16,6 @@ import {
   softResetTo,
   updateRef,
   binaryGuard,
-  DID_NOT_RUN_COMMENT,
   failurePromptWrapper,
   fileExistsGuard,
   PRESENTATION_FAILURE_WARNING,
@@ -552,13 +551,11 @@ const recognizeGtdUncheck = (repo: InMemRepo, block: string): BlockOutcome | und
 }
 
 /**
- * `Emit.ts`'s `combinedScript` leading comment — `gtd land`/`gtd --workflow`'s
- * whole plain-text artifact opens with this line ahead of the required
- * script, so recognizing it as a no-op (like the retry-helper function
- * definition) keeps the `@inmem` tier green.
+ * A block of nothing but comments is a no-op in `sh` too — `combinedScript`'s
+ * leading `DID_NOT_RUN_COMMENT`, and the list of paths a start commits.
  */
-const recognizeDidNotRunComment = (block: string): BlockOutcome | undefined =>
-  block === DID_NOT_RUN_COMMENT ? { kind: "noop" } : undefined
+const recognizeCommentBlock = (block: string): BlockOutcome | undefined =>
+  block.split("\n").every((line) => line.startsWith("#")) ? { kind: "noop" } : undefined
 
 /** `combinedScript`'s optional half. Reports `noop` whatever the inner result, mirroring bash's `( … ) || <warning>`. Exception: under `git: false` any unrecognized inner block fails the outer script (git or not), so the in-memory twin knowingly diverges from `sh` rather than run git unseen. */
 const PRESENTATION_FAILURE_TEXT = `${extractQuotedTokens(PRESENTATION_FAILURE_WARNING)[0]!.replace(/\\n$/, "")}\n`
@@ -695,7 +692,7 @@ const recognizersFor = (
   git: boolean,
 ): ReadonlyArray<(block: string) => BlockOutcome | undefined> => [
   (block) => recognizeSetFlags(block),
-  (block) => recognizeDidNotRunComment(block),
+  (block) => recognizeCommentBlock(block),
   (block) => recognizePrecondition(repo, block),
   (block) => recognizeFileExistsGuard(repo, block),
   (block) => recognizeBinaryGuard(commands, block),

package/src/wire/Land.ts

@@ -71,5 +71,5 @@ export const landProseText = (subject: string): string => renderFormat(FMT_LAND_
  */
 export const renderLandPlain = (fields: LandFields, command = "land"): string =>
   fields.subject !== null
-    ? `${landProseText(fields.subject).trimEnd()}\n(run \`gtd ${command} --json=script | sh\` to get the landing script)\n`
+    ? `${landProseText(fields.subject).trimEnd()}\n(to land it: s=$(gtd ${command} --json=script) && sh -c "$s")\n`
     : noopText(fields.state)

package/src/workflow/load.ts

@@ -50,7 +50,7 @@ export interface ConfigOperations {
 // prints `message` verbatim and would print a duplicated `detail` twice.
 const configError = (diagnostics: readonly Diagnostic[]): GtdError =>
   new GtdError(
-    `gtd config:\n${diagnostics
+    `gtd: config:\n${diagnostics
       .filter((d) => d.severity === "error")
       .map((d) => `  - ${formatDiagnostic(d)}`)
       .join("\n")}`,
@@ -84,7 +84,7 @@ export const refuseLegacyRc: Effect.Effect<void, GtdError, Host | ConfigDiscover
     return yield* Effect.fail(
       new GtdError(
         [
-          "gtd config:",
+          "gtd: config:",
           ...found.map((file) => `  - ${file}: no longer read — delete it`),
           "  gtd 23 removed the .gtdrc files; move each key they set:",
           "    vars    → an option of the workflow factory in gtd.config.ts, or its `defaults` export",
@@ -129,7 +129,7 @@ export const load: Effect.Effect<
     try: () => loadWorkflows(module, shipped),
     catch: (e) =>
       new GtdError(
-        `gtd config:\n  - ${module.filepath}: ${e instanceof Error ? e.message : String(e)}`,
+        `gtd: config:\n  - ${module.filepath}: ${e instanceof Error ? e.message : String(e)}`,
       ),
   })
   const compiled = loaded.config
@@ -885,7 +885,7 @@ const replayToFirstStep = (
         outcome.kind === "failed" || outcome.kind === "refused"
           ? outcome.message.replace(/^gtd: /, "")
           : "the default entry must begin at a step — that step is where a finished process waits"
-      return Effect.fail(new GtdError(`gtd config:\n  - ${loaded.file.origin}: ${problem}`))
+      return Effect.fail(new GtdError(`gtd: config:\n  - ${loaded.file.origin}: ${problem}`))
     },
   )
 
@@ -912,7 +912,7 @@ const firstStep = (
     if (reads.length > 0) {
       return yield* Effect.fail(
         new GtdError(
-          `gtd config:\n  - ${loaded.file.origin}: the flow's first step on an ordinary start reads ${reads.join(" and ")} — that step is where a finished process waits, so it must not depend on a setting`,
+          `gtd: config:\n  - ${loaded.file.origin}: the flow's first step on an ordinary start reads ${reads.join(" and ")} — that step is where a finished process waits, so it must not depend on a setting`,
         ),
       )
     }
@@ -923,7 +923,7 @@ const firstStep = (
     if (atHead === name) return name
     return yield* Effect.fail(
       new GtdError(
-        `gtd config:\n  - ${loaded.file.origin}: the flow's first step on an ordinary start depends on the repository's files ("${name}" without them, "${atHead}" at HEAD) — that step is where a finished process waits, so it must not change as files do`,
+        `gtd: config:\n  - ${loaded.file.origin}: the flow's first step on an ordinary start depends on the repository's files ("${name}" without them, "${atHead}" at HEAD) — that step is where a finished process waits, so it must not change as files do`,
       ),
     )
   })

package/src/workflow/skills.test.ts

@@ -17,24 +17,24 @@ describe("resolveScopeSkills", () => {
     const message = await failure(() => {
       throw new Error("boom")
     })
-    expect(message).toContain(`gtd config:\n  - ${FILE}: boom`)
+    expect(message).toContain(`gtd: config:\n  - ${FILE}: boom`)
   })
 
   it("rejects a non-object return", async () => {
     expect(await failure(() => ["a"])).toContain(
-      `gtd config:\n  - ${FILE}: skills export must return an object of scope -> skill names`,
+      `gtd: config:\n  - ${FILE}: skills export must return an object of scope -> skill names`,
     )
   })
 
   it("rejects a non-array value", async () => {
     expect(await failure(() => ({ a: "x" }))).toContain(
-      `gtd config:\n  - ${FILE}: skills export: "a" must be an array of skill names`,
+      `gtd: config:\n  - ${FILE}: skills export: "a" must be an array of skill names`,
     )
   })
 
   it("rejects a non-string entry", async () => {
     expect(await failure(() => ({ a: ["x", 1] }))).toContain(
-      `gtd config:\n  - ${FILE}: skills export: "a" must be an array of skill names`,
+      `gtd: config:\n  - ${FILE}: skills export: "a" must be an array of skill names`,
     )
   })
 
@@ -80,7 +80,7 @@ describe("resolveScopeAccess", () => {
 
   it("rejects a malformed export with the file", async () => {
     expect(message(await run({ access: () => ["a"] }))).toContain(
-      `gtd config:\n  - ${FILE}: access export must return an object`,
+      `gtd: config:\n  - ${FILE}: access export must return an object`,
     )
     expect(message(await run({ access: () => ({ a: { write: "x" } }) }))).toContain(
       `${FILE}: access export: "a": access.write must be an array`,

package/src/workflow/skills.ts

@@ -7,7 +7,7 @@ import type { Diagnostic } from "./Diagnostic.js"
 import { failOnErrors } from "./load.js"
 
 const fail = (origin: string, message: string): GtdError =>
-  new GtdError(`gtd config:\n  - ${origin}: ${message}`)
+  new GtdError(`gtd: config:\n  - ${origin}: ${message}`)
 
 const checkShape = (value: unknown): Record<string, readonly string[]> => {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {