@drisp/cli 0.7.5 → 0.7.6

package/dist/{WorkflowInstallWizard-4GRQGM42.js → WorkflowInstallWizard-YANLNMTP.js}

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

package/dist/{chunk-TG5EGPD2.js → chunk-2N7IBKJF.js}

@@ -54,7 +54,7 @@ import {
   verifyRendered,
   wakesFreshAfterHandover,
   workflowRegistryDir
-} from "./chunk-UQWOGG3L.js";
+} from "./chunk-W57EQYCM.js";
 import {
   __commonJS,
   __toESM
@@ -14892,7 +14892,7 @@ async function restoreCheckpoint(store, input) {
 
 // ../../modules/runtime/src/software-version.ts
 import "fs";
-var runnerSoftwareVersion = true ? "0.7.5" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
+var runnerSoftwareVersion = true ? "0.7.6" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
 
 // ../../modules/runtime/src/connection.ts
 var RunnerDisconnectedError = class extends Error {
@@ -21967,4 +21967,4 @@ export {
   runMachineRunners,
   writeIdentityOnce
 };
-//# sourceMappingURL=chunk-TG5EGPD2.js.map
+//# sourceMappingURL=chunk-2N7IBKJF.js.map

package/dist/{chunk-UQWOGG3L.js → chunk-W57EQYCM.js}

@@ -21468,6 +21468,10 @@ Merge with \`gh pr merge --squash --delete-branch --match-head-commit <sha>\`, w
 push. When it exits non-zero, \`gh pr view --json state\` decides: \`MERGED\` means the merge happened (a worktree
 cannot check out main afterwards); anything else means it did not.
 
+After a merge, and only then, run \`drisp build merged <pr url>\` in this worktree: it records the merged pull request as the
+\`pull_request\` run artifact and exits non-zero if the pull request is not merged. Never run it before the merge or
+after a failed one; if it fails only because GitHub has not caught up, wait a few seconds and run it again.
+
 ## Evidence comment
 
 Post exactly this on the Linear issue, filling the angle brackets:
@@ -24250,4 +24254,4 @@ export {
   compileWorkflowPlan,
   collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-UQWOGG3L.js.map
+//# sourceMappingURL=chunk-W57EQYCM.js.map

package/dist/{chunk-N4B7HLBN.js → chunk-Y6XJPUR2.js}

@@ -1,6 +1,6 @@
 import {
   runMachineRunners
-} from "./chunk-TG5EGPD2.js";
+} from "./chunk-2N7IBKJF.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-N4B7HLBN.js.map
+//# sourceMappingURL=chunk-Y6XJPUR2.js.map

package/dist/cli.js

@@ -140,7 +140,7 @@ import {
   visualPositionToOffset,
   wrapText,
   writeIdentityOnce
-} from "./chunk-TG5EGPD2.js";
+} from "./chunk-2N7IBKJF.js";
 import {
   generateId as generateId2
 } from "./chunk-PQIB66SG.js";
@@ -198,7 +198,7 @@ import {
   workflowRegistryDir,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-UQWOGG3L.js";
+} from "./chunk-W57EQYCM.js";
 import {
   __toESM
 } from "./chunk-G3PMV62Z.js";
@@ -206,10 +206,10 @@ import {
 // src/app/entry/cli.tsx
 import { render } from "ink";
 import meow from "meow";
-import fs10 from "fs";
+import fs11 from "fs";
 import { createRequire } from "module";
 import os5 from "os";
-import path10 from "path";
+import path11 from "path";
 import { fileURLToPath } from "url";
 
 // src/app/shell/sessionUiState.ts
@@ -5328,14 +5328,14 @@ function extractWebSearch(_input, response) {
   return { type: "text", content: extractTextContent(response), maxLines: 10 };
 }
 function extractNotebookEdit(input, _response) {
-  const path11 = typeof input["notebook_path"] === "string" ? input["notebook_path"] : "";
+  const path12 = typeof input["notebook_path"] === "string" ? input["notebook_path"] : "";
   const mode = typeof input["edit_mode"] === "string" ? input["edit_mode"] : "replace";
   const source = typeof input["new_source"] === "string" ? input["new_source"] : "";
-  if (!source) return { type: "text", content: `${mode} cell in ${path11}` };
+  if (!source) return { type: "text", content: `${mode} cell in ${path12}` };
   return {
     type: "code",
     content: source,
-    language: detectLanguage(path11),
+    language: detectLanguage(path12),
     maxLines: 10
   };
 }
@@ -5861,10 +5861,10 @@ function extractToolSubject(toolName, toolInput) {
       const parts = [];
       const pattern = str(input, "pattern");
       const glob = str(input, "glob");
-      const path11 = str(input, "path");
+      const path12 = str(input, "path");
       if (pattern) parts.push(`"${pattern}"`);
       if (glob) parts.push(glob);
-      if (path11) parts.push(`in ${path11}`);
+      if (path12) parts.push(`in ${path12}`);
       return parts.length > 0 ? parts.join("  ") : void 0;
     }
     case "Skill":
@@ -13095,7 +13095,7 @@ var thisMachine = (installationId) => ({
   os: `${platform()} ${release()}`.slice(0, 64),
   softwareVersion: runnerSoftwareVersion
 });
-var post = (origin, path11, body) => fetch(new URL(path11, origin), {
+var post = (origin, path12, body) => fetch(new URL(path12, origin), {
   method: "POST",
   headers: { "Content-Type": "application/json" },
   body: JSON.stringify(body)
@@ -13114,8 +13114,8 @@ async function alreadyConnected(existing, { forTeam, ownIdentity }) {
   const problem = own ? await credentialAccepted(own.config) ? void 0 : "lapsed" : forTeam(existing.orgId).length ? "other_runner" : "missing";
   const runner = { orgId: existing.orgId, runnerId: existing.runnerId, name: existing.name };
   if (own && problem === void 0) return { status: "already_connected", ...runner, path: own.path };
-  const path11 = (own ?? forTeam(existing.orgId)[0])?.path;
-  return { status: "identity_unusable", ...runner, problem, ...path11 ? { path: path11 } : {} };
+  const path12 = (own ?? forTeam(existing.orgId)[0])?.path;
+  return { status: "identity_unusable", ...runner, problem, ...path12 ? { path: path12 } : {} };
 }
 async function connectWithCode({
   code,
@@ -13187,20 +13187,20 @@ async function saveIdentity(origin, credential, { single, forTeam }, directory)
     name: credential.name
   });
   const replaced = [];
-  for (const { path: path12 } of forTeam(credential.orgId)) {
-    const aside = `${path12}.replaced-${Date.now()}`;
-    await rename(path12, aside);
+  for (const { path: path13 } of forTeam(credential.orgId)) {
+    const aside = `${path13}.replaced-${Date.now()}`;
+    await rename(path13, aside);
     replaced.push(aside);
   }
-  const path11 = single ?? teamIdentityPath(origin, credential.orgId, directory);
+  const path12 = single ?? teamIdentityPath(origin, credential.orgId, directory);
   try {
-    await writeIdentityOnce(path11, JSON.stringify(config, null, 2) + "\n");
+    await writeIdentityOnce(path12, JSON.stringify(config, null, 2) + "\n");
   } catch (error) {
     if (error.code === "EEXIST")
-      throw new Error(`Another Connect wrote a Runner identity for this Team at ${path11} meanwhile; it was left unchanged.`);
+      throw new Error(`Another Connect wrote a Runner identity for this Team at ${path12} meanwhile; it was left unchanged.`);
     throw error;
   }
-  return { status: "connected", config, path: path11, replaced };
+  return { status: "connected", config, path: path12, replaced };
 }
 function pathSegment(value) {
   const segment = encodeURIComponent(value);
@@ -13240,7 +13240,7 @@ async function refuseExisting(target) {
   throw new Error(`This machine already has a Runner${name ? ` (${name})` : ""} configured at ${target}.`);
 }
 async function disconnectRunner({
-  identity: { path: path11, config },
+  identity: { path: path12, config },
   serviceManager,
   othersRemain
 }) {
@@ -13273,7 +13273,7 @@ async function disconnectRunner({
     await restore();
     throw new Error(`The Hub refused to disconnect ${name} (${body.error ?? response.status}); it is still connected.`);
   }
-  await forgetRunner(path11);
+  await forgetRunner(path12);
   if (othersRemain) await restore();
   else await serviceManager?.remove();
   return result;
@@ -13426,18 +13426,18 @@ async function runRunnerCommandV2(input, options = {}) {
             `This machine is already connected to this Team as ${outcome.name}, but ${why}. ` + (code ? `The code was not used: connect a new Runner in its place with ${retry}. ` : `Connect a new Runner in its place with a Connect code from Settings \u2192 Runners: ${retry}. `) + `The old ${outcome.name} stays listed in Settings \u2192 Runners, offline.`
           );
         }
-        const { config, path: path11, replaced } = outcome;
+        const { config, path: path12, replaced } = outcome;
         for (const aside of replaced)
           process.stdout.write(
             `The Hub no longer recognised this machine's earlier identity for this Team; it was moved aside to ${aside}.
 `
           );
         process.stdout.write(
-          `Connected as ${config.name ?? config.runnerId}. Identity saved to ${path11}.
+          `Connected as ${config.name ?? config.runnerId}. Identity saved to ${path12}.
 `
         );
         if (services) {
-          const service = await ensureService(services, config, path11);
+          const service = await ensureService(services, config, path12);
           process.stdout.write(`${serviceStarted(service)}
 `);
           return 0;
@@ -13446,7 +13446,7 @@ async function runRunnerCommandV2(input, options = {}) {
           process.stdout.write(
             "No launchd or systemd here to run the Runner as a background service; running it in the foreground instead.\n"
           );
-        await runConfiguredRunner(path11, options.signal);
+        await runConfiguredRunner(path12, options.signal);
         return 0;
       }
       case "disconnect": {
@@ -13517,9 +13517,9 @@ async function runRunnerCommandV2(input, options = {}) {
               configured: true,
               // One entry per Team this machine serves; credentials are never printed.
               teams: identities.map(
-                ({ path: path11, config: { token: _token, ...config } }) => ({
+                ({ path: path12, config: { token: _token, ...config } }) => ({
                   ...config,
-                  path: path11
+                  path: path12
                 })
               ),
               service: service ? {
@@ -13864,9 +13864,9 @@ var DrispClient = class _DrispClient {
     if (!match) throw new Error("invalid_hub_url");
     return new _DrispClient(url.origin, decodeURIComponent(match[1]), async () => token);
   }
-  async request(path11, body) {
+  async request(path12, body) {
     const response = await fetch(
-      `${this.baseUrl}/v2/orgs/${encodeURIComponent(this.orgId)}${path11}`,
+      `${this.baseUrl}/v2/orgs/${encodeURIComponent(this.orgId)}${path12}`,
       {
         method: body === void 0 ? "GET" : "POST",
         headers: {
@@ -14758,16 +14758,73 @@ function runBuildStep(input) {
   return artifact;
 }
 
+// src/core/build/merged.ts
+import fs9 from "fs";
+import path9 from "path";
+var pullRequestArtifactSchema = external_exports.strictObject({
+  url: external_exports.url(),
+  number: external_exports.number().int().positive(),
+  sha: external_exports.string().regex(/^[0-9a-f]{40}$/),
+  mergedAt: external_exports.iso.datetime()
+});
+function runBuildMerged(input) {
+  const directory = requireEnv(input.env, "DRISP_RUN_ARTIFACTS");
+  if (!fs9.statSync(directory, { throwIfNoEntry: false })?.isDirectory())
+    throw new BuildUsageError(
+      `DRISP_RUN_ARTIFACTS (${directory}) is not a directory.`
+    );
+  let view;
+  try {
+    view = JSON.parse(
+      input.gh(
+        [
+          "pr",
+          "view",
+          ...input.pullRequest ? [input.pullRequest] : [],
+          "--json",
+          "state,url,number,mergeCommit,mergedAt"
+        ],
+        input.cwd
+      )
+    );
+  } catch {
+    throw new BuildUsageError("gh pr view did not report this pull request.");
+  }
+  if (view.state !== "MERGED")
+    throw new BuildUsageError(
+      `This pull request is not merged (state ${String(view.state)}).`
+    );
+  const parsed = pullRequestArtifactSchema.safeParse({
+    url: view.url,
+    number: view.number,
+    sha: view.mergeCommit?.oid,
+    mergedAt: view.mergedAt
+  });
+  if (!parsed.success)
+    throw new BuildUsageError(
+      `The merged pull request has a bad shape: ${parsed.error.issues.map((issue) => issue.path.join(".")).join(", ")}.`
+    );
+  fs9.writeFileSync(
+    path9.join(directory, "pull_request.json"),
+    `${JSON.stringify(parsed.data)}
+`
+  );
+  return parsed.data;
+}
+
 // src/app/entry/buildCommand.ts
 var USAGE3 = `Usage: drisp build plan --input <path>
        drisp build tick --input <path> [--rebase-failed <IDENTIFIER>]...
        drisp build checks
        drisp build step <n> [--qa none|web|macos]
+       drisp build merged [<pr url or number>]
 plan and tick run inside an Orchestrator Run (DRISP_RUN_ID, DRISP_RUNNER_ID and DRISP_RUN_ARTIFACTS set; tick also
 DRISP_RUN_TOKEN and DRISP_HUB_URL). DRISP_BUILD_PLAN_INPUT=<path> stands in for plan's --input, with
 fills/<IDENTIFIER>.json beside it. checks runs in a child's worktree: the merge gate's verdict on HEAD's GitHub runs.
 step runs in any Run with DRISP_RUN_ARTIFACTS set: it writes the step artifact {index, title, total} for gate <n> of the
-build-child template (QA is a gate unless --qa none) and refuses an index outside the list.`;
+build-child template (QA is a gate unless --qa none) and refuses an index outside the list.
+merged runs in a child's worktree after its pull request merged: it writes the pull_request artifact
+{url, number, sha, mergedAt} and refuses a pull request that is not merged.`;
 function githubPullRequests(folder, branch) {
   const output = execFileSync(
     "gh",
@@ -14885,6 +14942,14 @@ async function runBuildCommand(input) {
       case "checks":
         output = runBuildChecks(input.cwd, input.checks ?? defaultChecks);
         break;
+      case "merged":
+        output = runBuildMerged({
+          env: env2,
+          cwd: input.cwd,
+          ...input.positional?.[0] ? { pullRequest: input.positional[0] } : {},
+          gh: (input.checks ?? defaultChecks).gh
+        });
+        break;
       case "step":
         output = runBuildStep({
           env: env2,
@@ -14914,9 +14979,9 @@ import process7 from "process";
 
 // src/harnesses/claude/system/doctorEnvironment.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import * as fs9 from "fs";
+import * as fs10 from "fs";
 import * as os4 from "os";
-import * as path9 from "path";
+import * as path10 from "path";
 var MANAGED_POLICY_KEYS = [
   "forceLoginMethod",
   "forceLoginOrgUUID",
@@ -15020,8 +15085,8 @@ function collectEnvironment(options = {}) {
   const detectVersion = options.detectClaudeVersionFn ?? detectClaudeVersion;
   const runAuthStatus = options.runClaudeAuthStatusFn ?? runClaudeAuthStatus;
   const resolveForwarder = options.resolveHookForwarderCommandFn ?? resolveHookForwarderCommand;
-  const statFn = options.statFn ?? ((p) => fs9.statSync(p));
-  const readFileFn = options.readFileFn ?? ((p) => fs9.readFileSync(p, "utf8"));
+  const statFn = options.statFn ?? ((p) => fs10.statSync(p));
+  const readFileFn = options.readFileFn ?? ((p) => fs10.readFileSync(p, "utf8"));
   const settingsPaths = resolveClaudeSettingsSurfacePaths(
     homeDir,
     cwd,
@@ -15066,7 +15131,7 @@ function collectEnvironment(options = {}) {
   });
   let globalConfigPresent = false;
   try {
-    statFn(path9.join(homeDir, ".claude.json"));
+    statFn(path10.join(homeDir, ".claude.json"));
     globalConfigPresent = true;
   } catch {
     globalConfigPresent = false;
@@ -15546,13 +15611,13 @@ function runRunsCommand(input) {
 // src/app/entry/cli.tsx
 import { jsx as jsx24 } from "react/jsx-runtime";
 function resolvePackageJsonPath(entryUrl) {
-  let currentDir = path10.dirname(fileURLToPath(entryUrl));
+  let currentDir = path11.dirname(fileURLToPath(entryUrl));
   for (; ; ) {
-    const candidatePath = path10.join(currentDir, "package.json");
-    if (fs10.existsSync(candidatePath)) {
+    const candidatePath = path11.join(currentDir, "package.json");
+    if (fs11.existsSync(candidatePath)) {
       return candidatePath;
     }
-    const parentDir = path10.dirname(currentDir);
+    const parentDir = path11.dirname(currentDir);
     if (parentDir === currentDir) {
       throw new Error("Could not locate package.json for CLI metadata.");
     }
@@ -15725,6 +15790,7 @@ var cli = meow(
 			build tick --input <path>  Run one step of a started Build (prints the next action; [--rebase-failed <ID>]...)
 			build checks               The merge gate's verdict on HEAD's GitHub runs (in a child's worktree)
 			build step <n>             Report the Run's current step: writes the step run artifact ([--qa none|web|macos])
+			build merged               Record the merged pull request: writes the pull_request run artifact
 			telemetry [action]    Manage anonymous telemetry (enable/disable/status)
 			doctor                Diagnose Claude headless setup (use with --harness=claude)
 
@@ -15904,7 +15970,7 @@ var cli = meow(
   }
 );
 async function main() {
-  const projectDir = path10.resolve(cli.flags.projectDir);
+  const projectDir = path11.resolve(cli.flags.projectDir);
   const [command, ...commandArgs] = cli.input;
   const isRunCommand = command === "run" || command === "exec";
   if (command && !KNOWN_COMMANDS.has(command)) {
@@ -15958,7 +16024,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-4GRQGM42.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-YANLNMTP.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx24(
           WorkflowInstallWizard,
@@ -16125,8 +16191,8 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
   const showSetup = isRunCommand ? false : shouldShowSetup({
     cliInput: cli.input,
     setupComplete: globalConfig.setupComplete,
-    globalConfigExists: fs10.existsSync(
-      path10.join(os5.homedir(), ".config", "athena", "config.json")
+    globalConfigExists: fs11.existsSync(
+      path11.join(os5.homedir(), ".config", "athena", "config.json")
     )
   });
   let runtimeConfig;

package/dist/dashboard-daemon.js

@@ -1,6 +1,6 @@
-import "./chunk-N4B7HLBN.js";
-import "./chunk-TG5EGPD2.js";
+import "./chunk-Y6XJPUR2.js";
+import "./chunk-2N7IBKJF.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-UQWOGG3L.js";
+import "./chunk-W57EQYCM.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=dashboard-daemon.js.map

package/dist/runner.js

@@ -1,6 +1,6 @@
-import "./chunk-N4B7HLBN.js";
-import "./chunk-TG5EGPD2.js";
+import "./chunk-Y6XJPUR2.js";
+import "./chunk-2N7IBKJF.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-UQWOGG3L.js";
+import "./chunk-W57EQYCM.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=runner.js.map

package/package.json

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