overlord-cli 0.2606010745.0 → 0.2606011152.0

package/README.md

@@ -158,6 +158,8 @@ Devices are keyed by **(organization, user, fingerprint)** so the same physical
 
 `ovld runner start` keeps a foreground runner alive for CLI-only or remote hosts. It claims compatible execution requests for the current device and launches the assigned agent/model with `ovld launch`; `ovld runner once` claims at most one request and exits. `ovld runner status` now prints the local device record plus the active queue visible to that runner. `ovld runner clear <objective_id>` clears one queued objective, and `ovld runner clear-all` clears every active queue row visible to the caller. By default a single runner drains queued requests from **every organization you belong to**, so you do not need one runner per org. Pin it to a single org with `--organization-id <id>` or `OVERLORD_ORGANIZATION_ID`.
 
+If you are troubleshooting "why is `ovld runner` randomly executing", the runner is usually claiming a request that was already queued by manual Run or auto-advance. Inspect the queue with `ovld runner status`, then clear the specific objective with `ovld runner clear 8974e557-bec4-4984-b12c-be46bd63207c` or `ovld protocol clear-execution-requests --objective-id 8974e557-bec4-4984-b12c-be46bd63207c`.
+
 Use `create` for future work you want to track, `prompt` for work that should start immediately, and `record-work` for work that was already completed in chat and now needs a review ticket plus feed post. Use multiple tickets when prompts represent different features or goals; use `add-objectives` or `--objectives-json '[{"objective":"Step one"},{"objective":"Step two"}]'` when prompts are sequential steps toward the same feature or goal.
 
 `ovld protocol deliver` accepts either discrete flags like `--summary` / `--artifacts-json`, an inline full payload with `--payload-json '{"summary":"...","artifacts":[...],"changeRationales":[...]}'`, or a file/stdin payload with `--payload-file <path|->`.

package/bin/_cli/protocol.mjs

@@ -85,6 +85,18 @@ async function resolveProtocolMetadata(flags = {}, base = {}) {
     metadata.model = modelIdentifier;
   }
 
+  // Thread the originating execution request id (set by the runner via
+  // OVERLORD_EXECUTION_REQUEST_ID, or an explicit flag) into attach metadata so
+  // the server marks that exact request `launched` instead of falling back to
+  // matching by objective.
+  const executionRequestId =
+    (typeof flags['execution-request-id'] === 'string'
+      ? flags['execution-request-id'].trim()
+      : '') || process.env.OVERLORD_EXECUTION_REQUEST_ID?.trim();
+  if (executionRequestId) {
+    metadata.executionRequestId = executionRequestId;
+  }
+
   const snapshot = await resolveSnapshotContext(flags);
   if (snapshot) {
     metadata.snapshot = snapshot;

package/bin/_cli/runner.mjs

@@ -171,13 +171,17 @@ function resolvePinnedOrganizationId(flags) {
 const ORGANIZATION_REFRESH_MS = 60_000;
 
 /**
- * Resolves which organizations a poll pass should claim from.
+ * Resolves which organizations a fan-out pass (list / clear-all) should act on.
  *
  * - When the user pins an org (`--organization-id` flag or
- *   `OVERLORD_ORGANIZATION_ID`), only that org is polled.
- * - Otherwise the runner discovers every org the authenticated user belongs to
- *   and polls each one. If discovery fails or returns nothing, it falls back to
- *   the credential default (an empty scope id) so behavior never regresses.
+ *   `OVERLORD_ORGANIZATION_ID`), only that org is used.
+ * - Otherwise the runner discovers every org the authenticated user belongs to.
+ *   If discovery fails or returns nothing, it falls back to the credential
+ *   default (an empty scope id) so behavior never regresses.
+ *
+ * NOTE: this is for the per-org fan-out commands. The claim poll uses
+ * {@link createClaimOrganizationScope}, which is org-agnostic — the server's
+ * `claim-execution` is authoritative and spans the user's target-sharing orgs.
  */
 export function createOrganizationScope(flags, deviceFingerprint) {
   const pinned = resolvePinnedOrganizationId(flags);
@@ -211,6 +215,17 @@ export function createOrganizationScope(flags, deviceFingerprint) {
   };
 }
 
+/**
+ * Resolves the org scope for the claim poll (G3). A pinned org still scopes the
+ * poll; otherwise the runner does a single org-agnostic poll (empty scope) and
+ * lets the server claim across every org the user belongs to that shares the
+ * claiming target — no org discovery or per-org looping needed.
+ */
+export function createClaimOrganizationScope(flags) {
+  const pinned = resolvePinnedOrganizationId(flags);
+  return { pinned: Boolean(pinned), resolve: () => [pinned || ''] };
+}
+
 function completeLaunch(requestId, deviceFingerprint) {
   protocolJson(
     'complete-execution-launch',
@@ -276,11 +291,19 @@ function normalizeRunnerTerminalProfile(value) {
   };
 }
 
-function buildRunnerLaunchShellCommand(args, deviceFingerprint) {
-  return [
-    `export OVERLORD_DEVICE_FINGERPRINT=${shellQuote(deviceFingerprint)}`,
+function buildRunnerLaunchShellCommand(args, deviceFingerprint, executionRequestId) {
+  const lines = [`export OVERLORD_DEVICE_FINGERPRINT=${shellQuote(deviceFingerprint)}`];
+  // Terminal-profile launches run this generated script in a fresh shell, so the
+  // request id must be exported here too (the direct-spawn path inherits it via
+  // the child env). Without it, attach in the new terminal falls back to
+  // objective matching.
+  if (executionRequestId) {
+    lines.push(`export OVERLORD_EXECUTION_REQUEST_ID=${shellQuote(executionRequestId)}`);
+  }
+  lines.push(
     `exec ${shellQuote(process.execPath)} ${[OVLD_ENTRY, ...args].map(shellQuote).join(' ')}`
-  ].join('\n');
+  );
+  return lines.join('\n');
 }
 
 function writeRunnerLaunchScript(launchCommand) {
@@ -375,7 +398,7 @@ export function buildRunnerTerminalOpenCommand(
 
 function spawnLaunchProcess(args, claim, deviceFingerprint) {
   const spawnImpl = runnerTestHooks.spawn ?? spawn;
-  const launchCommand = buildRunnerLaunchShellCommand(args, deviceFingerprint);
+  const launchCommand = buildRunnerLaunchShellCommand(args, deviceFingerprint, claim.request?.id);
   const terminalCommand = buildRunnerTerminalOpenCommand(
     claim.launch?.runnerTerminalProfile,
     launchCommand,
@@ -466,7 +489,7 @@ export async function launchClaimedRequest(claim, deviceFingerprint) {
 }
 
 export async function runOnce(flags, deviceFingerprint, organizationScope) {
-  const scope = organizationScope ?? createOrganizationScope(flags, deviceFingerprint);
+  const scope = organizationScope ?? createClaimOrganizationScope(flags);
   const organizationIds = scope.resolve();
 
   let launchedAny = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord-cli",
-  "version": "0.2606010745.0",
+  "version": "0.2606011152.0",
   "description": "Overlord CLI — launch AI agents on tickets from anywhere",
   "homepage": "https://www.ovld.ai/docs/",
   "type": "module",