@amistio/cli 0.1.37 → 0.1.38

package/README.md

@@ -9,9 +9,9 @@ npm install -g @amistio/cli
 amistio --help
 ```
 
-The package install provides the `amistio` command and the optional `amistio-host-helper` executable. Repository cloning, project pairing, credential storage, sync watching, helper activation, and runner execution happen only when the user explicitly runs commands such as `amistio bootstrap`, `amistio import`, `amistio pair`, `amistio sync watch`, `amistio host-helper status`, or `amistio run --watch`. When the app copies a personal project into an organization, the CLI command syntax stays the same; create the org-scoped code and run `amistio import <code>` from the intended local checkout. Import scans repo-local project-brain docs plus recognized repo-local IDE, harness, and local AI tool memory or instruction files such as `AGENTS.md`, `.github/copilot-instructions.md`, `.cursor/rules/*.mdc`, `.windsurfrules`, and `memories/*.md`; durable Amistio memory belongs in `docs/memory/`, and global plugin or harness memory outside the repository is not scanned by default.
+The package install provides the `amistio` command and the optional `amistio-host-helper` executable. Repository cloning, project pairing, credential storage, sync watching, helper activation, and runner execution happen only when the user explicitly runs commands such as `amistio bootstrap`, `amistio import`, `amistio pair`, `amistio sync watch`, `amistio host-helper status`, or `amistio run --watch`. When the app copies a personal project into an organization, the CLI command syntax stays the same; create the org-scoped code and run `amistio import <code>` from the intended local checkout. Import scans repo-local project-brain docs plus recognized repo-local IDE and local AI tool memory or instruction files such as `AGENTS.md`, `.github/copilot-instructions.md`, `.cursor/rules/*.mdc`, `.windsurfrules`, and `memories/*.md`; durable Amistio memory belongs in `docs/memory/`, and global plugin memory outside the repository is not scanned by default.
 
-For enterprise setup, use the web Runner panel as the primary guide. It shows repository, pairing code, AI provider, local runner, and approved-work readiness with plain next actions; advanced CLI logs remain secondary diagnostics. The panel also shows trust/privacy boundaries, cost forecast and budget posture, runner health, blockers, verification health, and runner-version distribution from safe runner metadata.
+For enterprise setup, use the web Runner panel as the primary guide. It shows repository, pairing code, GitHub access, AI provider, local runner, and verification readiness with plain next actions; advanced CLI logs remain secondary diagnostics. The panel also shows trust/privacy boundaries, cost forecast and budget posture, runner health, blockers, verification health, and runner-version distribution from safe runner metadata.
 
 Optional host helpers are configured outside the SaaS with `AMISTIO_HOST_HELPER_PATH`. The official npm package ships `amistio-host-helper` for Level 1 supervised process execution diagnostics; enable it with `AMISTIO_HOST_HELPER_PATH=$(command -v amistio-host-helper)` on reviewed runner machines and confirm `amistio host-helper status` plus `amistio host-helper conformance`. PTY and sandbox requests use a helper only when its versioned handshake advertises support; otherwise the CLI returns deterministic unsupported results instead of silently downgrading. The npm helper does not advertise PTY or sandbox support. Helper request envelopes include allowlisted environment values, explicit sandbox policy metadata, and bounded normalized output, and must never include provider tokens, OAuth material, runner API tokens, local auth files, or arbitrary SaaS-originated shell text.
 
@@ -83,6 +83,8 @@ Watch mode prints a completed-work success once per work item, keeps fresh compl
 
 Known validation failures such as `unsafe_context_path` are printed with attention-needed next steps. For project-context refresh path-safety failures, deploy the latest web/API fix, update and restart the runner when applicable, retry the refresh, and capture only bounded non-secret output if it repeats.
 
+If watch mode reports that the runner was forgotten by the server, stop the foreground process and start or pair a new runner from the Runner panel. Forgotten runner IDs are intentionally blocked from heartbeats and work claims, so the CLI exits instead of retrying with the tombstoned identity.
+
 App-evaluation result finalization rejections print safe validation paths and preserve the local finalization evidence without exposing raw source or secrets. If a structured app-evaluation result is rejected, update and restart the runner, confirm the web/API deployment is current, and retry the evaluation before acting on cleanup or implementation recommendations.
 
 When brain generation or plan revision output is parsed but the Amistio API is temporarily unavailable during finalization, the runner keeps a safe pending result envelope in user-level Amistio config and replays it before claiming more work. The envelope uses a stable idempotency key and does not store raw tool stdout, provider sessions, credentials, or arbitrary local paths.

package/dist/index.js

@@ -2730,6 +2730,9 @@ var AmistioApiError = class extends Error {
   statusText;
   detail;
 };
+function isForgottenRunnerApiError(error) {
+  return error instanceof AmistioApiError && error.status === 403 && error.detail.includes("This runner was forgotten");
+}
 function isRetryableApiError(error) {
   if (error instanceof AmistioApiError) {
     return error.status === 408 || error.status === 429 || error.status >= 500;
@@ -5491,6 +5494,41 @@ async function readRunnerDaemonMetadataFile(filePath) {
   }
 }
 
+// src/runner-watch-errors.ts
+var forgottenRunnerWatchMessage = "This runner was forgotten by the server. Start or pair a new runner from the Runner panel; this runner ID cannot heartbeat or claim work anymore.";
+async function handleRunnerWatchError(options) {
+  const consoleError = options.consoleError ?? console.error;
+  if (isForgottenRunnerApiError(options.error)) {
+    if (options.verbose && options.detail) {
+      consoleError(`${forgottenRunnerWatchMessage}
+${options.detail}`);
+    } else {
+      consoleError(forgottenRunnerWatchMessage);
+    }
+    return { status: "failed", exitCode: 1, message: forgottenRunnerWatchMessage, stopRunner: true };
+  }
+  const message = "Runner hit an error while watching and will keep listening.";
+  if (options.verbose) {
+    consoleError(`${message}
+${options.detail}`);
+  } else {
+    consoleError(`${message} Run with --verbose for details.`);
+  }
+  const settlements = await Promise.allSettled([
+    options.client.sendRunnerHeartbeat(options.projectId, options.runnerId, options.repositoryLinkId, "blocked", { ...options.heartbeatMetadata, preferenceMessage: message }),
+    options.client.recordRunnerLog(options.projectId, {
+      runnerId: options.runnerId,
+      repositoryLinkId: options.repositoryLinkId,
+      status: "failed",
+      message,
+      error: options.detail,
+      machineId: options.machineId
+    })
+  ]);
+  options.logRejectedSettlements("record watch error", settlements);
+  return { status: "failed", exitCode: 1, message };
+}
+
 // src/runner-service.ts
 import { spawn as spawn3 } from "node:child_process";
 import { createHash as createHash4 } from "node:crypto";
@@ -10225,6 +10263,9 @@ program.command("run").description("Claim and run approved Amistio work locally"
         }
       }
       if (result.stopRunner) {
+        if (result.exitCode !== 0) {
+          process.exitCode = result.exitCode;
+        }
         return;
       }
       if (options.maxIterations !== void 0 && iterations >= options.maxIterations) {
@@ -10491,26 +10532,18 @@ async function runWatchIteration({ command, context, options, runnerId }) {
       throw error;
     }
     const detail = truncateLogExcerpt(errorDetail(error));
-    const message = "Runner hit an error while watching and will keep listening.";
-    if (options.verbose) {
-      console.error(`${message}
-${detail}`);
-    } else {
-      console.error(`${message} Run with --verbose for details.`);
-    }
-    const settlements = await Promise.allSettled([
-      context.client.sendRunnerHeartbeat(context.metadata.amistioProjectId, runnerId, context.metadata.repositoryLinkId, "blocked", { ...runnerHeartbeatMetadata(), preferenceMessage: message }),
-      context.client.recordRunnerLog(context.metadata.amistioProjectId, {
-        runnerId,
-        repositoryLinkId: context.metadata.repositoryLinkId,
-        status: "failed",
-        message,
-        error: detail,
-        machineId: runnerMachineId()
-      })
-    ]);
-    logRejectedSettlements("record watch error", settlements);
-    return { status: "failed", exitCode: 1, message };
+    return await handleRunnerWatchError({
+      client: context.client,
+      detail,
+      error,
+      heartbeatMetadata: runnerHeartbeatMetadata(),
+      logRejectedSettlements,
+      machineId: runnerMachineId(),
+      projectId: context.metadata.amistioProjectId,
+      repositoryLinkId: context.metadata.repositoryLinkId,
+      runnerId,
+      ...options.verbose !== void 0 ? { verbose: options.verbose } : {}
+    });
   }
 }
 function claimLaneIds(maxConcurrentWork) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amistio/cli",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "type": "module",
   "repository": {
     "type": "git",