@drisp/cli 0.6.9 → 0.6.10

package/README.md

@@ -215,6 +215,7 @@ Connect a machine from **Settings → Runners** in the web console. It shows a o
 drisp runner connect K7QF-M2PX --hub https://hub.example.com   # join the Team and start the Runner as a background service
 drisp runner connect --hub https://hub.example.com             # or print a code to approve in the web console
 drisp runner status                                            # the saved identity, without its credential, and the service's state
+drisp runner restart                                           # refresh the service definition and restart it, e.g. after npm install -g @drisp/cli@latest
 drisp runner disconnect [<team>]                               # leave a Team: stop its Runs there and delete that Team's credential
 drisp runner recover <run-id> confirmed-stopped                # record a failed outcome after an uncertain crash
 ```
@@ -225,7 +226,7 @@ A machine is one Runner per Team. Connect writes that Team's Runner identity and
 
 Any member of the Team can connect their own machine. It joins as a **Personal** Runner named after its hostname, which runs only its owner's Runs; a Team admin approving a printed code may make it a **Team** Runner instead.
 
-Connect then installs and starts a user-level service, so the Runner keeps running when the terminal closes and starts again at login: a LaunchAgent `com.drisp.runner.<installationId>` on macOS (log in `~/Library/Logs/drisp/runner-<installationId>.log`), a systemd user unit `drisp-runner-<installationId>.service` on Linux (log in `journalctl --user -u drisp-runner-<installationId>`). `drisp runner status` prints the service's name. The service runs this drisp installation with the saved identity and the `PATH` you connected from, so it finds the same harnesses; there is no unit file to write. Each installation (a `DRISP_RUNNER_CONFIG` identity file is a separate one) gets its own service, so connecting one never stops another. On a Linux server, `loginctl enable-linger` keeps it running while you are logged out. Running Connect again where the identity file already exists is refused before the code is spent, and leaves the service as it is. So if the service cannot be installed or started, Connect exits with an error but keeps the identity: run `drisp runner` to run the Runner in the foreground. On macOS, a LaunchAgent that was installed but would not start still starts at your next login.
+Connect then installs and starts a user-level service, so the Runner keeps running when the terminal closes and starts again at login: a LaunchAgent `com.drisp.runner.<installationId>` on macOS (log in `~/Library/Logs/drisp/runner-<installationId>.log`), a systemd user unit `drisp-runner-<installationId>.service` on Linux (log in `journalctl --user -u drisp-runner-<installationId>`). `drisp runner status` prints the service's name. `drisp runner restart` rewrites the service definition for the CLI installed now (a new Node version or global prefix) and restarts it (on Linux it also turns start-at-login back on, with `systemctl --user enable`); it never installs a service, and like any Runner restart it fails a Run in progress ([ADR-0021](docs/adr/0021-runner-boot-closes-orphaned-runs.md)), so run it when no Run is executing. The service runs this drisp installation with the saved identity and the `PATH` you connected from, so it finds the same harnesses; there is no unit file to write. Each installation (a `DRISP_RUNNER_CONFIG` identity file is a separate one) gets its own service, so connecting one never stops another. On a Linux server, `loginctl enable-linger` keeps it running while you are logged out. Running Connect again where the identity file already exists is refused before the code is spent, and leaves the service as it is. So if the service cannot be installed or started, Connect exits with an error but keeps the identity: run `drisp runner` to run the Runner in the foreground. On macOS, a LaunchAgent that was installed but would not start still starts at your next login.
 
 In a container or CI, or on a platform without launchd or systemd (where Connect says so and does this anyway), keep the Runner in the foreground instead:
 

package/dist/{chunk-2JL4QT55.js → chunk-BTHLAJV7.js}

@@ -12692,6 +12692,12 @@ import { existsSync as existsSync3, realpathSync } from "fs";
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
 import { homedir as homedir3 } from "os";
 import { dirname as dirname3, join as join5 } from "path";
+var ServiceNotEnabledError = class extends Error {
+  constructor(cause) {
+    super(`The service is running now but is not enabled at login: ${cause}`);
+    this.name = "ServiceNotEnabledError";
+  }
+};
 var runCommand = (command, args) => new Promise((resolve7, reject) => {
   execFile(command, args, { encoding: "utf8" }, (error, stdout, stderr) => {
     if (error && typeof error.code !== "number") reject(error);
@@ -12764,6 +12770,10 @@ function launchdServiceManager({ home, uid, run, installationId }) {
       else await check(run, "launchctl", ["bootstrap", `gui/${uid}`, plist]);
     },
     stop: unload,
+    async restart() {
+      if (await loaded()) await check(run, "launchctl", ["kickstart", "-k", target]);
+      else await check(run, "launchctl", ["bootstrap", `gui/${uid}`, plist]);
+    },
     async remove() {
       await removeFile(plist);
       await unload();
@@ -12826,6 +12836,12 @@ function systemdServiceManager({ home, run, installationId }) {
     async stop() {
       if (await active()) await systemctl("stop", unitName);
     },
+    async restart() {
+      await systemctl("restart", unitName);
+      await systemctl("enable", unitName).catch((error) => {
+        throw new ServiceNotEnabledError(error instanceof Error ? error.message : String(error));
+      });
+    },
     async remove() {
       if (!existsSync3(path23)) return;
       await systemctl("disable", "--now", unitName);
@@ -14852,7 +14868,7 @@ async function restoreCheckpoint(store, input) {
 
 // ../../modules/runtime/src/software-version.ts
 import "fs";
-var runnerSoftwareVersion = true ? "0.6.9" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
+var runnerSoftwareVersion = true ? "0.6.10" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
 
 // ../../modules/runtime/src/connection.ts
 var RunnerDisconnectedError = class extends Error {
@@ -21851,6 +21867,7 @@ export {
   expandHome,
   forgetRunner,
   runConfiguredRunner,
+  ServiceNotEnabledError,
   runnerServiceUnit,
   platformRunnerServices,
   runnerConfigDirectory,
@@ -21863,4 +21880,4 @@ export {
   runMachineRunners,
   writeIdentityOnce
 };
-//# sourceMappingURL=chunk-2JL4QT55.js.map
+//# sourceMappingURL=chunk-BTHLAJV7.js.map

package/dist/{chunk-2DLFGWJV.js → chunk-LRMKGH2R.js}

@@ -1,6 +1,6 @@
 import {
   runMachineRunners
-} from "./chunk-2JL4QT55.js";
+} from "./chunk-BTHLAJV7.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-2DLFGWJV.js.map
+//# sourceMappingURL=chunk-LRMKGH2R.js.map

package/dist/cli.js

@@ -7,6 +7,7 @@ import {
   IndexedTimeline,
   PORTABLE_PROVIDER_ENV_VARS,
   RUN_EXIT_CODE,
+  ServiceNotEnabledError,
   attachRuntimeEventLoop,
   behindMain,
   bootstrapRuntimeConfig,
@@ -136,7 +137,7 @@ import {
   visualPositionToOffset,
   wrapText,
   writeIdentityOnce
-} from "./chunk-2JL4QT55.js";
+} from "./chunk-BTHLAJV7.js";
 import {
   generateId as generateId2
 } from "./chunk-PQIB66SG.js";
@@ -5961,6 +5962,14 @@ function eventLabel(event) {
       return event.data.task_subject || "Task Completed";
     case "config.change":
       return "Config Change";
+    case "instructions.loaded":
+      return "Instructions Loaded";
+    case "worktree.create":
+      return "Worktree Created";
+    case "worktree.remove":
+      return "Worktree Removed";
+    case "artifacts.manifest":
+      return "Artifacts Manifest";
     default:
       return "Event";
   }
@@ -8456,8 +8465,8 @@ function renderHeaderLines(model, width, hasColor, theme) {
   const harnessText = `${style("Harness: ", palette.label)}${style(model.harness, palette.value)}`;
   const effortSuffix = model.effort_level ? style(` with ${model.effort_level} effort`, palette.label) : "";
   const modelText = `${style("Model: ", palette.label)}${style(formatModelName(model.model_name), palette.value)}${effortSuffix}`;
-  const tokenLabel = model.token_label ?? "Tokens";
-  const runLabel = model.run_label ?? "Runs";
+  const tokenLabel = model.token_label;
+  const runLabel = model.run_label;
   const leftTokens = [
     { text: athena, priority: 100 },
     { text: divider, priority: 5 },
@@ -12606,11 +12615,10 @@ function parseArgs(args, context) {
     } else if (arg === "--global") {
       global = true;
     } else if (arg === "--env") {
-      const value = args[i + 1];
-      if (value === void 0) {
+      if (i + 1 >= args.length) {
         return { error: `mcp ${context}: --env requires a KEY=VALUE argument` };
       }
-      env2.push(value);
+      env2.push(args[i + 1]);
       i++;
     } else if (arg.startsWith("--")) {
       return { error: `Unknown flag for mcp ${context}: ${arg}` };
@@ -13268,7 +13276,7 @@ async function disconnectRunner({
 }
 
 // src/app/entry/runnerCommandV2.ts
-var usage = `Usage: drisp runner [connect [<code>] --hub <url> [--foreground] [--replace] | disconnect [<team>] | status | recover | help]
+var usage = `Usage: drisp runner [connect [<code>] --hub <url> [--foreground] [--replace] | disconnect [<team>] | status | restart | recover | help]
 
 Connect this machine from Settings \u2192 Runners in the web console, which shows the
 command to paste here:
@@ -13284,8 +13292,11 @@ that runs this machine's Runner for every Team it serves, at login. Connecting a
 the same Team reports the Runner the machine already is and changes nothing. When this
 machine can no longer serve that Runner (its credential is gone or has lapsed), Connect
 says so without using the code, and --replace connects a new Runner in its place.
-drisp runner status lists the Teams and the service's state. --foreground skips the
-service and runs the Runner in this terminal, for containers and CI; drisp runner runs
+drisp runner status lists the Teams and the service's state. drisp runner restart
+rewrites the service definition for the CLI installed now and restarts the service
+(on Linux it also turns start-at-login back on), so run it after
+npm install -g @drisp/cli@latest; it never installs one, and it fails any Run in
+progress, so restart when no Run is executing. --foreground skips the service and runs the Runner in this terminal, for containers and CI; drisp runner runs
 every Team's Runner there again later. DRISP_HUB_URL may stand in for --hub, and
 DRISP_RUNNER_CONFIG selects one identity file of a separate installation instead, which
 gets its own service.
@@ -13312,6 +13323,7 @@ The code works once and expires in ${minutes} minutes. Waiting for approval\u202
   );
 }
 var serviceStarted = (service) => `The Runner runs as a background service (${service.kind} ${service.name}) and starts again at login.`;
+var notConnected = "This machine is not connected to a Team. Settings \u2192 Runners shows the command to connect it.";
 var servicesFor = (options) => options.services === void 0 ? platformRunnerServices() : options.services;
 async function serviceInstallation(config) {
   const single = overriddenIdentityPath();
@@ -13320,25 +13332,35 @@ async function serviceInstallation(config) {
     ...single ? { configPath: single } : {}
   };
 }
+async function installAndRestart(service, configPath, onInstalled = () => {
+}) {
+  await service.install(runnerServiceUnit(configPath));
+  onInstalled();
+  await service.restart();
+}
 async function ensureService(services, config, identityPath) {
   let service;
-  let installed = false;
+  const progress = { installed: false };
   try {
     const { installationId, configPath } = await serviceInstallation(config);
     service = services(installationId);
-    await service.install(runnerServiceUnit(configPath));
-    installed = true;
-    if ((await service.status()).running) await service.stop();
-    await service.start();
+    await installAndRestart(service, configPath, () => {
+      progress.installed = true;
+    });
     return service;
   } catch (error) {
+    if (error instanceof ServiceNotEnabledError && service)
+      throw new Error(
+        `Connected, and the Runner runs as a background service (${service.kind} ${service.name}). ${error.message}
+Run drisp runner restart to enable it again.`
+      );
     throw new Error(
       [
         `Connected, but the background service did not start: ${error instanceof Error ? error.message : String(error)}`,
         `The identity is saved to ${identityPath}: run drisp runner to run the Runner in the foreground.`,
         // launchd loads an installed LaunchAgent at the next login and RunAtLoad starts it. A systemd unit
-        // is enabled only by the start that just failed, so it has no such fallback.
-        ...installed && service?.kind === "launchd" ? [
+        // is enabled only by the restart that just failed, so it has no such fallback.
+        ...progress.installed && service?.kind === "launchd" ? [
           `The LaunchAgent ${service.name} is installed, so launchd starts the Runner at your next login.`
         ] : []
       ].join("\n")
@@ -13346,6 +13368,10 @@ async function ensureService(services, config, identityPath) {
   }
 }
 async function runRunnerCommandV2(input, options = {}) {
+  if (input.flags.help || input.subcommand === "help") {
+    process.stdout.write(usage);
+    return 0;
+  }
   try {
     if (input.flags.detach)
       throw new Error(
@@ -13353,7 +13379,8 @@ async function runRunnerCommandV2(input, options = {}) {
       );
     switch (input.subcommand) {
       case "connect": {
-        const [code, extra] = input.subcommandArgs;
+        const code = input.subcommandArgs.at(0);
+        const extra = input.subcommandArgs.at(1);
         if (extra) throw new Error(`Unexpected argument ${extra}.`);
         const hub = input.flags.hub ?? process.env["DRISP_HUB_URL"];
         if (!hub)
@@ -13475,10 +13502,7 @@ async function runRunnerCommandV2(input, options = {}) {
       }
       case "status": {
         const identities = await runnerIdentities();
-        if (!identities.length)
-          throw new Error(
-            "This machine is not connected to a Team. Settings \u2192 Runners shows the command to connect it."
-          );
+        if (!identities.length) throw new Error(notConnected);
         const services = servicesFor(options);
         const service = services ? services(
           (await serviceInstallation(identities[0].config)).installationId
@@ -13507,15 +13531,24 @@ async function runRunnerCommandV2(input, options = {}) {
         );
         return 0;
       }
+      case "restart": {
+        const [extra] = input.subcommandArgs;
+        if (extra) throw new Error(`Unexpected argument ${extra}.`);
+        const { service, configPath } = await installedService(
+          servicesFor(options)
+        );
+        await installAndRestart(service, configPath);
+        process.stdout.write(
+          `Restarted the background service ${service.kind} ${service.name}.
+`
+        );
+        return 0;
+      }
       case "":
         await runMachineRunners(options.signal, {
           services: servicesFor(options)
         });
         return 0;
-      case "help":
-      case "--help":
-        process.stdout.write(usage);
-        return 0;
       default:
         throw new Error(
           `Unsupported v2 runner command: ${input.subcommand}.
@@ -13530,6 +13563,25 @@ ${usage}`
     return 1;
   }
 }
+async function installedService(services) {
+  const identities = await runnerIdentities();
+  if (!identities.length) throw new Error(notConnected);
+  const whose = overriddenIdentityPath() ? "the Runner installation DRISP_RUNNER_CONFIG selects" : "this machine's Runner";
+  const foreground = "drisp runner runs it in the foreground meanwhile.";
+  if (!services)
+    throw new Error(
+      `No background service is installed for ${whose}: there is no launchd or systemd --user here. ${foreground}`
+    );
+  const { installationId, configPath } = await serviceInstallation(
+    identities[0].config
+  );
+  const service = services(installationId);
+  if (!(await service.status()).installed)
+    throw new Error(
+      `No background service is installed for ${whose} (${service.kind} ${service.name}). drisp runner connect installs one when it connects to a Team (Settings \u2192 Runners shows the command); restart never installs one. ${foreground}`
+    );
+  return { service, ...configPath ? { configPath } : {} };
+}
 async function recoveryIdentity(runId) {
   const identities = await runnerIdentities();
   if (!identities.length)
@@ -15603,7 +15655,7 @@ var cli = meow(
 			skill <sub>           Manage personal skills (install, remove, list)
 			marketplace <sub>     Manage marketplace sources (add, refresh, remove, list)
 			runner [sub]          Run the runner that connects this machine to a Team and executes its Runs
-			                      (no subcommand: foreground; connect [code] --hub <url> [--replace], disconnect [team], status, recover, help)
+			                      (no subcommand: foreground; connect [code] --hub <url> [--replace], disconnect [team], status, restart, recover, help)
 			build plan --input <path>  Plan a Build inside an Orchestrator Run (prints one JSON object)
 			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)
@@ -15637,7 +15689,7 @@ var cli = meow(
 			--dry-run       Print resolved bootstrap (workflow, isolation, plugins, harness) and exit (run mode)
 			--project       Scope workflow command to project config (workflow use)
 			--global        Scope workflow command to global config (workflow use, default)
-			--help          Show command help
+			--help, -h      Show command help (runner shows its own)
 			--version       Show CLI version
 
 		Note: All isolation modes use --setting-sources "" to completely isolate
@@ -15672,6 +15724,12 @@ var cli = meow(
     importMeta: import.meta,
     allowUnknownFlags: false,
     flags: {
+      // Declared so -h works too; meow alone handles only a bare --help (DRI-193).
+      help: {
+        type: "boolean",
+        shortFlag: "h",
+        default: false
+      },
       projectDir: {
         type: "string",
         default: process.cwd()
@@ -15788,6 +15846,10 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
     await exitWith(1);
     return;
   }
+  if (cli.flags.help && command !== "runner" && command !== "dashboard") {
+    cli.showHelp(0);
+    return;
+  }
   if (command === "exec") {
     console.error(
       "drisp exec is deprecated and is removed in 0.7.0; use drisp run instead."
@@ -15898,7 +15960,8 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
           ...cli.flags.detach ? { detach: true } : {},
           ...typeof cli.flags.hub === "string" ? { hub: cli.flags.hub } : {},
           ...cli.flags.foreground ? { foreground: true } : {},
-          ...cli.flags.replace ? { replace: true } : {}
+          ...cli.flags.replace ? { replace: true } : {},
+          ...cli.flags.help ? { help: true } : {}
         }
       })
     );

package/dist/dashboard-daemon.js

@@ -1,5 +1,5 @@
-import "./chunk-2DLFGWJV.js";
-import "./chunk-2JL4QT55.js";
+import "./chunk-LRMKGH2R.js";
+import "./chunk-BTHLAJV7.js";
 import "./chunk-PQIB66SG.js";
 import "./chunk-YUVMVYUF.js";
 import "./chunk-G3PMV62Z.js";

package/dist/runner.js

@@ -1,5 +1,5 @@
-import "./chunk-2DLFGWJV.js";
-import "./chunk-2JL4QT55.js";
+import "./chunk-LRMKGH2R.js";
+import "./chunk-BTHLAJV7.js";
 import "./chunk-PQIB66SG.js";
 import "./chunk-YUVMVYUF.js";
 import "./chunk-G3PMV62Z.js";

package/package.json

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