@drisp/cli 0.7.1 → 0.7.3

package/dist/{WorkflowInstallWizard-BVWAIVBH.js → WorkflowInstallWizard-AJYDKFDL.js}

@@ -8,7 +8,7 @@ import {
   installWorkflowPlugins,
   resolveWorkflow,
   writeGlobalConfig
-} from "./chunk-TRNUPQQJ.js";
+} from "./chunk-TSIMXPJN.js";
 import "./chunk-G3PMV62Z.js";
 
 // src/setup/steps/WorkflowInstallWizard.tsx
@@ -93,4 +93,4 @@ function WorkflowInstallWizard({ source, onDone }) {
 export {
   WorkflowInstallWizard as default
 };
-//# sourceMappingURL=WorkflowInstallWizard-BVWAIVBH.js.map
+//# sourceMappingURL=WorkflowInstallWizard-AJYDKFDL.js.map

package/dist/{chunk-CPU4RLSW.js → chunk-6HOVFCCB.js}

@@ -55,7 +55,7 @@ import {
   verifyRendered,
   wakesFreshAfterHandover,
   workflowRegistryDir
-} from "./chunk-TRNUPQQJ.js";
+} from "./chunk-TSIMXPJN.js";
 import {
   __commonJS,
   __toESM
@@ -3487,6 +3487,7 @@ function createTokenAccumulator() {
   let openingContextSize = 0;
   let contextWindowSize = null;
   let hasMessageUsage = false;
+  const countedById = /* @__PURE__ */ new Map();
   function promptSize(usage) {
     return (usage.input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0);
   }
@@ -3544,10 +3545,13 @@ function createTokenAccumulator() {
         }
       } else {
         hasMessageUsage = true;
-        inputTokens += usage.input_tokens ?? 0;
-        outputTokens += usage.output_tokens ?? 0;
-        cacheRead += usage.cache_read_input_tokens ?? 0;
-        cacheWrite += usage.cache_creation_input_tokens ?? 0;
+        const messageId = isAssistantEnvelope ? parsed.message["id"] : parsed["id"];
+        const counted = typeof messageId === "string" ? countedById.get(messageId) : void 0;
+        inputTokens += (usage.input_tokens ?? 0) - (counted?.input_tokens ?? 0);
+        outputTokens += (usage.output_tokens ?? 0) - (counted?.output_tokens ?? 0);
+        cacheRead += (usage.cache_read_input_tokens ?? 0) - (counted?.cache_read_input_tokens ?? 0);
+        cacheWrite += (usage.cache_creation_input_tokens ?? 0) - (counted?.cache_creation_input_tokens ?? 0);
+        if (typeof messageId === "string") countedById.set(messageId, usage);
         if (!isSubagent) {
           observeRootContext(promptSize(usage));
         }
@@ -3601,6 +3605,7 @@ function createTokenAccumulator() {
     reset() {
       buffer = "";
       hasMessageUsage = false;
+      countedById.clear();
       inputTokens = 0;
       outputTokens = 0;
       cacheRead = 0;
@@ -14868,7 +14873,7 @@ async function restoreCheckpoint(store, input) {
 
 // ../../modules/runtime/src/software-version.ts
 import "fs";
-var runnerSoftwareVersion = true ? "0.7.1" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
+var runnerSoftwareVersion = true ? "0.7.3" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
 
 // ../../modules/runtime/src/connection.ts
 var RunnerDisconnectedError = class extends Error {
@@ -20125,7 +20130,7 @@ function sessionStore(store, runId, options = {}) {
 
 // ../../modules/runtime/src/workflow-executor.ts
 import { execFileSync as execFileSync9 } from "child_process";
-import { statSync as statSync2, writeFileSync as writeFileSync4 } from "fs";
+import { statSync as statSync3, writeFileSync as writeFileSync4 } from "fs";
 import { join as join8 } from "path";
 
 // src/core/build/workspace.ts
@@ -20393,8 +20398,20 @@ import { readFileSync as readFileSync3, realpathSync as realpathSync3 } from "fs
 import { join as join6, relative as relative3 } from "path";
 
 // src/core/build/answer.ts
+var GUIDANCE_ROUNDS = 10;
+function approvalAnswer(value) {
+  if (typeof value === "string")
+    return value.trim() === "" ? { kind: "none" } : { kind: "guidance", guidance: value.trim() };
+  if (typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 1 && value.choice === "start")
+    return { kind: "start" };
+  return { kind: "none" };
+}
 function isStartAnswer(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 1 && value.choice === "start";
+  return approvalAnswer(value).kind === "start";
+}
+function mergeGuidance(earlier, guidance) {
+  const rounds = earlier.at(-1) === guidance ? earlier : [...earlier, guidance];
+  return rounds.slice(-GUIDANCE_ROUNDS);
 }
 
 // src/core/build/planner.ts
@@ -21148,20 +21165,22 @@ async function closeOrphanedRuns(store, {
 
 // ../../modules/runtime/src/run-artifacts.ts
 import { createHash as createHash3 } from "crypto";
-import { mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync2, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir as tmpdir5 } from "os";
 import { dirname as dirname4, join as join7 } from "path";
 var ARTIFACT_MAX_BYTES = 64 * 1024;
 var ARTIFACT_NAME = /^[a-z][a-z0-9_]{0,63}$/;
 var NEVER_EMITTED = /* @__PURE__ */ new Set(["answer"]);
 var EMITTED_STATE = ".emitted.json";
+var MID_TURN_MAX_BYTES = 1024 * 1024;
+var MID_TURN_MIN_GAP_MS = 5e3;
 function runnerDataDirectory(databasePath) {
   return databasePath && databasePath !== ":memory:" ? dirname4(databasePath) : join7(tmpdir5(), "drisp-runner");
 }
 function runArtifactsDirectory(dataDirectory, runId) {
   return join7(dataDirectory, "artifacts", runId) + "/";
 }
-function runArtifactEmitter(directory, record) {
+function runArtifactEmitter(directory, record, midTurnMinGapMs = MID_TURN_MIN_GAP_MS) {
   mkdirSync2(directory, { recursive: true, mode: 448 });
   const statePath = join7(directory, EMITTED_STATE);
   let emitted = {};
@@ -21169,27 +21188,43 @@ function runArtifactEmitter(directory, record) {
     emitted = JSON.parse(readFileSync4(statePath, "utf8"));
   } catch {
   }
-  return () => {
+  const lastEmittedAt = {};
+  return (midTurn = false) => {
     let changed = false;
+    const now = Date.now();
     for (const entry of readdirSync2(directory, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
       if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
       const name = entry.name.slice(0, -".json".length);
       if (!ARTIFACT_NAME.test(name) || NEVER_EMITTED.has(name)) continue;
-      const bytes = readFileSync4(join7(directory, entry.name));
+      const path23 = join7(directory, entry.name);
+      let bytes;
+      try {
+        if (midTurn) {
+          if (statSync2(path23).size > MID_TURN_MAX_BYTES) continue;
+          if (now - (lastEmittedAt[name] ?? -Infinity) < midTurnMinGapMs) continue;
+        }
+        bytes = readFileSync4(path23);
+      } catch {
+        continue;
+      }
       const hash = createHash3("sha256").update(bytes).digest("hex");
       if (emitted[name] === hash) continue;
-      emitted[name] = hash;
-      changed = true;
       let json;
       try {
         json = JSON.parse(bytes.toString("utf8"));
       } catch {
+        if (midTurn) continue;
         record("run.artifact_rejected", { name, bytes: bytes.length });
+        emitted[name] = hash;
+        changed = true;
         continue;
       }
       const serialized = Buffer.byteLength(JSON.stringify(json));
       if (serialized > ARTIFACT_MAX_BYTES) record("run.artifact_rejected", { name, bytes: serialized });
       else record("run.artifact", { name, json });
+      emitted[name] = hash;
+      lastEmittedAt[name] = now;
+      changed = true;
     }
     if (changed) writeFileSync3(statePath, JSON.stringify(emitted));
   };
@@ -21225,7 +21260,7 @@ function delegationEnvironment(grant, hubUrl) {
 function requireProjectDirectory(projectDir) {
   let directory = false;
   try {
-    directory = statSync2(projectDir).isDirectory();
+    directory = statSync3(projectDir).isDirectory();
   } catch {
   }
   if (!directory)
@@ -21316,7 +21351,7 @@ function createWorkflowExecutor(dependencies = {}) {
           dependencies.dataDirectory ?? runnerDataDirectory(store.sql.database.name),
           grant.runId
         );
-        const emitArtifacts2 = runArtifactEmitter(artifacts, record);
+        const emitArtifacts2 = runArtifactEmitter(artifacts, record, (dependencies.artifactIntervalMs ?? 2e3) * 2.5);
         const loop = bootstrapped.workflow?.loop;
         const childLoop = grant.parent && loop ? { ...loop, maxRunTokens: Math.min(loop.maxRunTokens ?? Infinity, grant.parent.tokenCap) } : loop;
         const config2 = {
@@ -21360,6 +21395,8 @@ function createWorkflowExecutor(dependencies = {}) {
             record(APPROVAL_ANSWERED, { answer: continuation.answer, plan: pending2.plan });
           }
         }
+        const guidedPlan = continuation?.kind === "resume" && continuation.guidance?.trim() && pendingApproval(store, grant.runId) ? continuation.guidance : void 0;
+        if (guidedPlan !== void 0) writeFileSync4(join8(artifacts, "answer.json"), JSON.stringify(guidedPlan));
         let storedAnswer2;
         if (continuation?.kind === "answer") {
           const answer = permissionAnswerSchema.safeParse(continuation.answer);
@@ -21373,7 +21410,9 @@ function createWorkflowExecutor(dependencies = {}) {
             };
           }
         }
-        let prompt2 = continuation?.kind === "resume" ? continuation.guidance ?? "Continue the parked workflow." : continuation?.kind === "answer" ? `Human answer to the parked interruption:
+        let prompt2 = guidedPlan !== void 0 ? `The member wrote this before starting the Build, to change the plan:
+${guidedPlan}
+Run \`drisp build tick\` as in your later-wake instructions and act on its action.` : continuation?.kind === "resume" ? continuation.guidance ?? "Continue the parked workflow." : continuation?.kind === "answer" ? `Human answer to the parked interruption:
 ${JSON.stringify(continuation.answer)}` : grant.spec.prompt;
         const displayText2 = continuation?.kind === "resume" ? continuation.guidance : continuation?.kind === "answer" ? typeof continuation.answer === "string" ? continuation.answer : JSON.stringify(continuation.answer) : grant.spec.prompt;
         if (grant.previousRun) {
@@ -21403,6 +21442,13 @@ ${prompt2}`;
       const { workingDirectory, config, view, adapterResumeSessionId, storedAnswer, prompt, displayText, emitArtifacts } = setup2;
       const queue = createSteerQueue();
       queues.set(grant.runId, queue);
+      const sweep = setInterval(() => {
+        try {
+          emitArtifacts(true);
+        } catch {
+        }
+      }, dependencies.artifactIntervalMs ?? 2e3);
+      sweep.unref();
       const result = await trackHarnessProcesses(store, grant.runId, () => (dependencies.execute ?? runExec)({
         prompt,
         promptPresentation: displayText === void 0 ? { origin: "workflow" } : { origin: "human", displayText },
@@ -21440,6 +21486,7 @@ ${prompt2}`;
         json: false
       })).finally(() => {
         queues.delete(grant.runId);
+        clearInterval(sweep);
         emitArtifacts();
       });
       if (!result.workflowOutcome)
@@ -21862,7 +21909,8 @@ export {
   commitBuildFiles,
   lastCommitTouching,
   repoLayoutAt,
-  isStartAnswer,
+  approvalAnswer,
+  mergeGuidance,
   planBuild,
   finalizePlan,
   fallbackBranch,
@@ -21887,4 +21935,4 @@ export {
   runMachineRunners,
   writeIdentityOnce
 };
-//# sourceMappingURL=chunk-CPU4RLSW.js.map
+//# sourceMappingURL=chunk-6HOVFCCB.js.map

package/dist/{chunk-LCT645C4.js → chunk-7R3HR7VJ.js}

@@ -1,6 +1,6 @@
 import {
   runMachineRunners
-} from "./chunk-CPU4RLSW.js";
+} from "./chunk-6HOVFCCB.js";
 
 // src/app/entry/runnerDaemon.ts
 if (process.argv.includes("--help")) {
@@ -13,4 +13,4 @@ if (process.argv.includes("--help")) {
     process.exitCode = 1;
   });
 }
-//# sourceMappingURL=chunk-LCT645C4.js.map
+//# sourceMappingURL=chunk-7R3HR7VJ.js.map

package/dist/{chunk-TRNUPQQJ.js → chunk-TSIMXPJN.js}

@@ -21281,7 +21281,7 @@ var GATES = [
 ];
 
 // src/core/workflows/builtins/orchestrator/workflow.md
-var workflow_default = '# Orchestrator: plan and run a Build\n\nYou plan and run a Drisp Build of one Plan: the open issues of one Linear project. The Run\'s prompt names the\nLinear project, the Plan key and the project folder, which is your working directory. You never write code here:\neach issue is built by its own child Run, which `drisp build tick` starts.\n\nThe Runner sets these for you:\n\n- `DRISP_RUN_ARTIFACTS`: this Run\'s artifact directory. Files you write there are shown to the member.\n- `DRISP_RUN_ID`, `DRISP_RUNNER_ID`, `DRISP_RUN_TOKEN`, `DRISP_HUB_URL`: this Run, its Runner and its right to start\n  child Runs; `drisp build` reads them itself.\n\n## 1. Read Linear (first Turn)\n\nWith the `linear` MCP server, read the project and every issue in it, then write\n`$DRISP_RUN_ARTIFACTS/input/plan-input.json` (create the `input` directory) in exactly this shape. Every issue carries\nevery field, empty when it has none. `readAt` is the output of\n`node -e "console.log(new Date().toISOString())"` run just before you read Linear; never write a time yourself:\n\n```json\n{\n	"version": 1,\n	"readAt": "<the command\'s output, e.g. 2026-10-11T09:30:00.000Z>",\n	"project": {\n		"id": "<the project\'s `uuid`, not its `id`>",\n		"name": "<the project\'s `name`>",\n		"slugId": "<the last `-`-separated part of the project\'s `url`>"\n	},\n	"issues": [\n		{\n			"id": "<the issue\'s `uuid`, not its `id`>",\n			"identifier": "<the issue\'s `id`, e.g. DRI-12>",\n			"title": "<the issue\'s `title`>",\n			"url": "<the issue\'s `url`>",\n			"branchName": "<the issue\'s `gitBranchName`, or null>",\n			"state": {\n				"type": "<the issue\'s `statusType`: backlog|unstarted|started|completed|canceled|triage>",\n				"name": "<the issue\'s `status`>"\n			},\n			"labels": ["<each of the issue\'s `labels`>"],\n			"parentId": "<the parent issue\'s `uuid`, or null>",\n			"blockedBy": ["<the `uuid` of each issue in `relations.blockedBy`>"],\n			"prioritySortOrder": 0\n		}\n	]\n}\n```\n\nLinear\'s MCP names fields differently from this file, and the difference matters: the app finds each issue\'s row by\nits UUID, so a plan that carries identifiers shows no Build state on any row.\n\n- The MCP\'s `id` is the readable identifier (`DRI-12`, or `P-DRI-7` for a project); the UUID is in `uuid`. Every\n  `id`, `parentId` and `blockedBy` value in `plan-input.json` is a UUID (`7f7b03f7-accf-46b2-98fb-abadfed76594`).\n- An issue\'s `parentId` and `relations.blockedBy` from the MCP name issues by identifier. Look each one up: use the\n  `uuid` of the project\'s issue with that identifier, or `get_issue` it when it is outside the project.\n- Read relations with `get_issue` and `includeRelations: true`; read the project\'s issues with `list_issues` and\n  `fields` including `uuid`.\n- The project\'s `url` ends in its `slugId` (`\u2026/project/build-sandbox-b7640301cd64` \u2192 `b7640301cd64`).\n\n`drisp build plan` rejects a plan with an identifier where a UUID belongs and names the field to fix.\n\nInclude every issue of the project, done and canceled ones too: the plan decides what to skip. Then run:\n\n```sh\ndrisp build plan --input "$DRISP_RUN_ARTIFACTS/input/plan-input.json"\n```\n\nIt prints one JSON object. Act on its `status`.\n\n## 2. `needs_fills`\n\n`fills` lists issues that need a `fill.json` (`identifier`, `title`, `url`, `path`) and `templateVersion` is the value\neach fill must carry. For each listed issue: read it through `linear` (description, acceptance criteria, comments) and\nthe repo\'s ADRs and CONTEXT files it touches, then write its `fill.json` at `path`:\n\n```json\n{\n	"version": 1,\n	"templateVersion": "<templateVersion, copied exactly>",\n	"areas": ["macos|web|cli|hub|protocol|docs", "\u2026"],\n	"qa": "none|web|macos",\n	"sizeClass": "S|M|L",\n	"instructions": "<what the child needs beyond the issue>",\n	"ownWork": true\n}\n```\n\n- `areas`: the parts of the repo the change touches, each once.\n- `qa`: `web` when the change shows in a web page, `macos` when it shows in the macOS app, else `none`.\n- `sizeClass`: `S` for a change of a file or two, `M` for a feature across a few modules, `L` for a large or risky\n  change.\n- `instructions` (at most 6000 characters): start with one short paragraph saying what to build, then restate the\n  acceptance criteria, name the ADRs it touches and the parts of the codebase involved. Plain prose and `-` lists\n  only: no headings, code fences or HTML comments (`drisp build plan` rejects them).\n- `ownWork`: `false` only for an issue with sub-issues whose own description asks for nothing beyond them, such as\n  a PRD above its slices; the plan then skips it and waits for its sub-issues instead. Otherwise `true`.\n\nThen run `drisp build plan` again with the same `--input` path.\n\n## 3. `planned` or `failed`\n\nOn `planned` the Build plan is written and shown to the member, who decides whether to start it: end the Turn with\n`<!-- AWAITING_APPROVAL -->` as the Journal\'s last line. On `failed` the reason is shown instead: end with\n`<!-- WORKFLOW_COMPLETE -->`.\n\n## 4. Every later wake: tick\n\nYou are woken when the member answers the approval question and whenever one of your child Runs closes or parks.\nEach time: read Linear again into `$DRISP_RUN_ARTIFACTS/input/plan-input.json` as in step 1 (with a new `readAt`),\nthen run:\n\n```sh\ndrisp build tick --input "$DRISP_RUN_ARTIFACTS/input/plan-input.json"\n```\n\nIt prints one JSON object. Act on its `action`, and repeat until an action ends the Turn:\n\n- `refresh_input`: read Linear into the input again (a newer `readAt`) and tick again.\n- `repair`: for each of `issues`, read it in Linear first and skip an issue Linear now shows Done or Canceled (its\n  child got there first); otherwise move it to Done and post its `comment` verbatim through `linear`. Then read\n  Linear into the input again and tick again.\n- `rebase`: for each of `items`, in its `worktree`: `git rebase origin/main`, resolve the conflicts, then\n  `git push --force-with-lease origin <branch>` (the item\'s `branch`) if the branch is on the remote. Never push any\n  other branch. If a rebase cannot be resolved, `git rebase --abort`.\n  Then read Linear into the input again and tick again, adding `--rebase-failed <identifier>` for each that failed.\n- `wait`: end the Turn with `<!-- WAITING_ON_CHILDREN -->` as the Journal\'s last line.\n- `park`: end the Turn with `<!-- NEEDS_HUMAN: <message> -->` as the Journal\'s last line, copying `message`\n  verbatim.\n- `complete`: end the Turn with `<!-- WORKFLOW_COMPLETE -->` as the Journal\'s last line.\n\n## Rules\n\n- Never start, cancel or edit Runs, Workflows, worktrees or branches except as an action says; `drisp build` does\n  what is needed.\n- Never write to Linear except a `repair`; never open a pull request.\n- Write only `plan-input.json` and the `fill.json` files `drisp build plan` asks for. Never write `answer.json`.\n';
+var workflow_default = '# Orchestrator: plan and run a Build\n\nYou plan and run a Drisp Build of one Plan: the open issues of one Linear project. The Run\'s prompt names the\nLinear project, the Plan key and the project folder, which is your working directory. You never write code here:\neach issue is built by its own child Run, which `drisp build tick` starts.\n\nThe Runner sets these for you:\n\n- `DRISP_RUN_ARTIFACTS`: this Run\'s artifact directory. Files you write there are shown to the member.\n- `DRISP_RUN_ID`, `DRISP_RUNNER_ID`, `DRISP_RUN_TOKEN`, `DRISP_HUB_URL`: this Run, its Runner and its right to start\n  child Runs; `drisp build` reads them itself.\n\n## 1. Read Linear (first Turn)\n\nWith the `linear` MCP server, read the project and every issue in it, then write\n`$DRISP_RUN_ARTIFACTS/input/plan-input.json` (create the `input` directory) in exactly this shape. Every issue carries\nevery field, empty when it has none. `readAt` is the output of\n`node -e "console.log(new Date().toISOString())"` run just before you read Linear; never write a time yourself:\n\n```json\n{\n	"version": 1,\n	"readAt": "<the command\'s output, e.g. 2026-10-11T09:30:00.000Z>",\n	"project": {\n		"id": "<the project\'s `uuid`, not its `id`>",\n		"name": "<the project\'s `name`>",\n		"slugId": "<the last `-`-separated part of the project\'s `url`>"\n	},\n	"issues": [\n		{\n			"id": "<the issue\'s `uuid`, not its `id`>",\n			"identifier": "<the issue\'s `id`, e.g. DRI-12>",\n			"title": "<the issue\'s `title`>",\n			"url": "<the issue\'s `url`>",\n			"branchName": "<the issue\'s `gitBranchName`, or null>",\n			"state": {\n				"type": "<the issue\'s `statusType`: backlog|unstarted|started|completed|canceled|triage>",\n				"name": "<the issue\'s `status`>"\n			},\n			"labels": ["<each of the issue\'s `labels`>"],\n			"parentId": "<the parent issue\'s `uuid`, or null>",\n			"blockedBy": ["<the `uuid` of each issue in `relations.blockedBy`>"],\n			"prioritySortOrder": 0\n		}\n	]\n}\n```\n\nLinear\'s MCP names fields differently from this file, and the difference matters: the app finds each issue\'s row by\nits UUID, so a plan that carries identifiers shows no Build state on any row.\n\n- The MCP\'s `id` is the readable identifier (`DRI-12`, or `P-DRI-7` for a project); the UUID is in `uuid`. Every\n  `id`, `parentId` and `blockedBy` value in `plan-input.json` is a UUID (`7f7b03f7-accf-46b2-98fb-abadfed76594`).\n- An issue\'s `parentId` and `relations.blockedBy` from the MCP name issues by identifier. Look each one up: use the\n  `uuid` of the project\'s issue with that identifier, or `get_issue` it when it is outside the project.\n- Read relations with `get_issue` and `includeRelations: true`; read the project\'s issues with `list_issues` and\n  `fields` including `uuid`.\n- The project\'s `url` ends in its `slugId` (`\u2026/project/build-sandbox-b7640301cd64` \u2192 `b7640301cd64`).\n\n`drisp build plan` rejects a plan with an identifier where a UUID belongs and names the field to fix.\n\nInclude every issue of the project, done and canceled ones too: the plan decides what to skip. Then run:\n\n```sh\ndrisp build plan --input "$DRISP_RUN_ARTIFACTS/input/plan-input.json"\n```\n\nIt prints one JSON object. Act on its `status`.\n\n## 2. `needs_fills`\n\n`fills` lists issues that need a `fill.json` (`identifier`, `title`, `url`, `path`) and `templateVersion` is the value\neach fill must carry. For each listed issue: read it through `linear` (description, acceptance criteria, comments) and\nthe repo\'s ADRs and CONTEXT files it touches, then write its `fill.json` at `path`:\n\n```json\n{\n	"version": 1,\n	"templateVersion": "<templateVersion, copied exactly>",\n	"areas": ["macos|web|cli|hub|protocol|docs", "\u2026"],\n	"qa": "none|web|macos",\n	"sizeClass": "S|M|L",\n	"instructions": "<what the child needs beyond the issue>",\n	"ownWork": true\n}\n```\n\n- `areas`: the parts of the repo the change touches, each once.\n- `qa`: `web` when the change shows in a web page, `macos` when it shows in the macOS app, else `none`.\n- `sizeClass`: `S` for a change of a file or two, `M` for a feature across a few modules, `L` for a large or risky\n  change.\n- `instructions` (at most 6000 characters): start with one short paragraph saying what to build, then restate the\n  acceptance criteria, name the ADRs it touches and the parts of the codebase involved. Plain prose and `-` lists\n  only: no headings, code fences or HTML comments (`drisp build plan` rejects them).\n- `ownWork`: `false` only for an issue with sub-issues whose own description asks for nothing beyond them, such as\n  a PRD above its slices; the plan then skips it and waits for its sub-issues instead. Otherwise `true`.\n\nThen run `drisp build plan` again with the same `--input` path.\n\n## 3. `planned` or `failed`\n\nOn `planned` the Build plan is written and shown to the member, who decides whether to start it: end the Turn with\n`<!-- AWAITING_APPROVAL -->` as the Journal\'s last line. On `failed` the reason is shown instead: end with\n`<!-- WORKFLOW_COMPLETE -->`.\n\n## 4. Every later wake: tick\n\nYou are woken when the member answers the approval question (with Start, or with words of their own before it) and whenever one of your child Runs closes or parks.\nEach time: read Linear again into `$DRISP_RUN_ARTIFACTS/input/plan-input.json` as in step 1 (with a new `readAt`),\nthen run:\n\n```sh\ndrisp build tick --input "$DRISP_RUN_ARTIFACTS/input/plan-input.json"\n```\n\nIt prints one JSON object. Act on its `action`, and repeat until an action ends the Turn:\n\n- `refresh_input`: read Linear into the input again (a newer `readAt`) and tick again.\n- `replan`: the member wrote words before starting, and `guidance` lists every round of them, oldest first. Plan again\n  with them as the member\'s wishes: read the issues they concern (and the repo) as in step 2, rewrite the `fill.json`\n  of each issue the guidance changes (`instructions`, `areas`, `qa`, `sizeClass`, or `ownWork` to leave an issue out),\n  and run `drisp build plan` again with the same `--input` path. Then end as in step 3: with\n  `<!-- AWAITING_APPROVAL -->` on `planned`, `<!-- WORKFLOW_COMPLETE -->` on `failed`. Write nothing but those\n  `fill.json` files.\n- `repair`: for each of `issues`, read it in Linear first and skip an issue Linear now shows Done or Canceled (its\n  child got there first); otherwise move it to Done and post its `comment` verbatim through `linear`. Then read\n  Linear into the input again and tick again.\n- `rebase`: for each of `items`, in its `worktree`: `git rebase origin/main`, resolve the conflicts, then\n  `git push --force-with-lease origin <branch>` (the item\'s `branch`) if the branch is on the remote. Never push any\n  other branch. If a rebase cannot be resolved, `git rebase --abort`.\n  Then read Linear into the input again and tick again, adding `--rebase-failed <identifier>` for each that failed.\n- `wait`: end the Turn with `<!-- WAITING_ON_CHILDREN -->` as the Journal\'s last line.\n- `park`: end the Turn with `<!-- NEEDS_HUMAN: <message> -->` as the Journal\'s last line, copying `message`\n  verbatim.\n- `complete`: end the Turn with `<!-- WORKFLOW_COMPLETE -->` as the Journal\'s last line.\n\n## Rules\n\n- Never start, cancel or edit Runs, Workflows, worktrees or branches except as an action says; `drisp build` does\n  what is needed.\n- Never write to Linear except a `repair`; never open a pull request.\n- Write only `plan-input.json` and the `fill.json` files `drisp build plan` asks for. Never write `answer.json`.\n';
 
 // src/core/workflows/builtins/orchestrator/index.ts
 var ORCHESTRATOR_WORKFLOW_NAME = "orchestrator";
@@ -22322,6 +22322,10 @@ import path10 from "path";
 // src/core/workflows/continuationPolicy.ts
 var DEFAULT_RESTART_TOKENS = 2e3;
 var DEFAULT_WORKING_TOKENS = 8e3;
+function budgetTokens(memory) {
+  if (memory.cumulativeTokens === null) return null;
+  return Math.max(0, memory.cumulativeTokens - (memory.usage?.cacheRead ?? 0));
+}
 function resourceInterruption(stop) {
   const names2 = {
     tokens: "token budget",
@@ -23302,7 +23306,7 @@ function admitResult(result, previous, cfg) {
   const stop = admitContinuation({
     loop: cfg.loop,
     iteration: memory.iteration,
-    tokens: memory.cumulativeTokens,
+    tokens: budgetTokens(memory),
     checkpointPath: memory.checkpoint?.path,
     context: fresh ? context : void 0
   });
@@ -23750,7 +23754,7 @@ function createWorkflowRunner(input2) {
           cumulativeTokens: total,
           stop: {
             ...event.stop,
-            ...event.stop.cause === "tokens" ? { used: total } : {}
+            ...event.stop.cause === "tokens" ? { used: budgetTokens(memory) ?? total } : {}
           }
         };
       }
@@ -23785,7 +23789,7 @@ function createWorkflowRunner(input2) {
         const limit = admitContinuation({
           loop,
           iteration: memory.iteration,
-          tokens: memory.cumulativeTokens
+          tokens: budgetTokens(memory)
         });
         if (limit) {
           stop(limit);
@@ -23802,7 +23806,7 @@ function createWorkflowRunner(input2) {
           const decision = admitContinuation({
             loop,
             iteration: memory.iteration,
-            tokens: memory.cumulativeTokens,
+            tokens: budgetTokens(memory),
             context: {
               opening: usage.openingContextSize,
               required: required2,
@@ -24247,4 +24251,4 @@ export {
   compileWorkflowPlan,
   collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-TRNUPQQJ.js.map
+//# sourceMappingURL=chunk-TSIMXPJN.js.map

package/dist/cli.js

@@ -8,6 +8,7 @@ import {
   PORTABLE_PROVIDER_ENV_VARS,
   RUN_EXIT_CODE,
   ServiceNotEnabledError,
+  approvalAnswer,
   attachRuntimeEventLoop,
   behindMain,
   bootstrapRuntimeConfig,
@@ -70,7 +71,6 @@ import {
   isCommandPrefix,
   isGitHubRepository,
   isScopedPermissionsRequest,
-  isStartAnswer,
   lastCommitTouching,
   listAwaitingAttentionRuns,
   listHarnessAdapters,
@@ -82,6 +82,7 @@ import {
   machineInstallationId,
   makeSkippedProbe,
   mergeFeedItems,
+  mergeGuidance,
   messageGlyphs,
   overriddenIdentityPath,
   parseFrontmatter,
@@ -138,7 +139,7 @@ import {
   visualPositionToOffset,
   wrapText,
   writeIdentityOnce
-} from "./chunk-CPU4RLSW.js";
+} from "./chunk-6HOVFCCB.js";
 import {
   generateId as generateId2
 } from "./chunk-PQIB66SG.js";
@@ -196,7 +197,7 @@ import {
   workflowRegistryDir,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-TRNUPQQJ.js";
+} from "./chunk-TSIMXPJN.js";
 import {
   __toESM
 } from "./chunk-G3PMV62Z.js";
@@ -14411,6 +14412,16 @@ var notStarted = () => ({
   action: "complete",
   message: BUILD_STRINGS.notStarted
 });
+var guidanceFile = (artifacts) => path7.join(artifacts, "input", "guidance.json");
+function replan(artifacts, guidance) {
+  const earlier = readJson(guidanceFile(artifacts));
+  const rounds = mergeGuidance(
+    Array.isArray(earlier) ? earlier.filter((round) => typeof round === "string") : [],
+    guidance
+  );
+  writeFile(guidanceFile(artifacts), json(rounds));
+  return { action: "replan", guidance: rounds };
+}
 function pushBranch(worktree, branch) {
   git(worktree, ["push", "--quiet", "origin", `${branch}:${branch}`]);
 }
@@ -14479,8 +14490,11 @@ async function runBuildTick(deps) {
   if (parsedState.success && parsedState.data.orchestratorRunId === orchestratorRunId) {
     stored = parsedState.data;
   } else {
-    if (!isStartAnswer(readJson(path7.join(artifacts, "answer.json"))))
-      return notStarted();
+    const answer = approvalAnswer(
+      readJson(path7.join(artifacts, "answer.json"))
+    );
+    if (answer.kind === "guidance") return replan(artifacts, answer.guidance);
+    if (answer.kind !== "start") return notStarted();
     stored = {
       version: 1,
       orchestratorRunId,
@@ -15939,7 +15953,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-BVWAIVBH.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-AJYDKFDL.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx24(
           WorkflowInstallWizard,

package/dist/dashboard-daemon.js

@@ -1,6 +1,6 @@
-import "./chunk-LCT645C4.js";
-import "./chunk-CPU4RLSW.js";
+import "./chunk-7R3HR7VJ.js";
+import "./chunk-6HOVFCCB.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-TRNUPQQJ.js";
+import "./chunk-TSIMXPJN.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=dashboard-daemon.js.map

package/dist/runner.js

@@ -1,6 +1,6 @@
-import "./chunk-LCT645C4.js";
-import "./chunk-CPU4RLSW.js";
+import "./chunk-7R3HR7VJ.js";
+import "./chunk-6HOVFCCB.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-TRNUPQQJ.js";
+import "./chunk-TSIMXPJN.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=runner.js.map

package/package.json

@@ -17,7 +17,7 @@
 		"hooks",
 		"dashboard"
 	],
-	"version": "0.7.1",
+	"version": "0.7.3",
 	"license": "MIT",
 	"bin": {
 		"athena": "dist/cli.js",