svamp-cli 0.2.342 → 0.2.356

package/dist/codexProvider-BtxYc5Rj.mjs

@@ -0,0 +1,68 @@
+function codexPermissionSettings(mode) {
+  switch (mode) {
+    case "yolo":
+    case "bypassPermissions":
+    case "danger-full-access":
+      return { approvalPolicy: "never", sandbox: "danger-full-access" };
+    case "safe-yolo":
+    case "acceptEdits":
+      return { approvalPolicy: "on-failure", sandbox: "workspace-write" };
+    case "read-only":
+    case "plan":
+      return { approvalPolicy: "on-request", sandbox: "read-only" };
+    case "default":
+    default:
+      return { approvalPolicy: "on-request", sandbox: "workspace-write" };
+  }
+}
+const CODEX_PROVIDER_KEY_ENV = "SVAMP_CODEX_API_KEY";
+const PROVIDER_NAME = "svamp";
+function resolveCodexProvider(env = process.env) {
+  return {
+    apiBase: env.SVAMP_CODEX_API_BASE || env.LLM_API_BASE || void 0,
+    apiKey: env.SVAMP_CODEX_API_KEY || env.LLM_API_KEY || void 0,
+    model: env.SVAMP_CODEX_MODEL || env.LLM_MODEL || void 0
+  };
+}
+function hasCustomProvider(cfg) {
+  return !!(cfg.apiBase && cfg.apiKey);
+}
+function buildCodexProviderArgs(cfg) {
+  if (!hasCustomProvider(cfg)) {
+    return { configArgs: cfg.model ? ["-c", `model=${JSON.stringify(cfg.model)}`] : [], env: {}, model: cfg.model };
+  }
+  const configArgs = [
+    "-c",
+    `model_provider=${JSON.stringify(PROVIDER_NAME)}`,
+    "-c",
+    `model_providers.${PROVIDER_NAME}.name=${JSON.stringify(PROVIDER_NAME)}`,
+    "-c",
+    `model_providers.${PROVIDER_NAME}.base_url=${JSON.stringify(cfg.apiBase)}`,
+    "-c",
+    `model_providers.${PROVIDER_NAME}.env_key=${JSON.stringify(CODEX_PROVIDER_KEY_ENV)}`,
+    "-c",
+    `model_providers.${PROVIDER_NAME}.wire_api=${JSON.stringify("responses")}`
+  ];
+  if (cfg.model) configArgs.push("-c", `model=${JSON.stringify(cfg.model)}`);
+  return { configArgs, env: { [CODEX_PROVIDER_KEY_ENV]: cfg.apiKey }, model: cfg.model };
+}
+function codexForcedModel(env = process.env) {
+  const f = (env.SVAMP_CODEX_FORCE_MODEL || "").toLowerCase();
+  if (!f || f === "0" || f === "false" || f === "no" || f === "off") return void 0;
+  return env.SVAMP_CODEX_MODEL || env.LLM_MODEL || void 0;
+}
+function codexModelMenu(env = process.env) {
+  return (env.SVAMP_CODEX_MODELS || "").split(",").map((s) => s.trim()).filter(Boolean).filter((m, i, a) => a.indexOf(m) === i);
+}
+function codexDefaultModel(env = process.env) {
+  const menu = codexModelMenu(env);
+  return env.SVAMP_CODEX_MODEL || env.LLM_MODEL || menu[0] || void 0;
+}
+function codexClampModel(requested, env = process.env) {
+  const menu = codexModelMenu(env);
+  if (!menu.length) return requested;
+  if (requested && menu.includes(requested)) return requested;
+  return codexDefaultModel(env);
+}
+
+export { CODEX_PROVIDER_KEY_ENV, buildCodexProviderArgs, codexClampModel, codexDefaultModel, codexForcedModel, codexModelMenu, codexPermissionSettings, hasCustomProvider, resolveCodexProvider };

package/dist/{commands-DDuGBSsz.mjs → commands-B-yczgz_.mjs}

@@ -2,24 +2,19 @@ import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { execSync, execFileSync } from 'node:child_process';
 import { basename, resolve, join, isAbsolute } from 'node:path';
 import os from 'node:os';
-import { a5 as formatHandle, a6 as normalizeAllowedUser, a7 as loadSecurityContextConfig, a8 as resolveSecurityContext, a9 as buildSecurityContextFromFlags, aa as mergeSecurityContexts, c as connectToHypha, ab as buildSessionShareUrl, ac as computeOutboundHop, e as shortId, ad as registerAwaitingReply, ae as buildMachineShareUrl, af as parseHandle, ag as handleMatchesMetadata } from './run-CF4kAVPW.mjs';
-import 'os';
-import 'fs/promises';
+import { c as connectToHypha } from './hyphaClient-ybivOjZo.mjs';
+import { f as formatHandle, c as computeOutboundHop, s as shortId, r as registerAwaitingReply, p as parseHandle, h as handleMatchesMetadata } from './friendlyName-1UZcyDhu.mjs';
+import { n as normalizeAllowedUser } from './types-57J3Re0n.mjs';
+import { loadSecurityContextConfig, resolveSecurityContext, buildSecurityContextFromFlags, mergeSecurityContexts } from './securityContext-Cm5UTCuD.mjs';
+import { b as buildSessionShareUrl, U as UNBOUNDED_LOOP_ITERATIONS, a as buildMachineShareUrl } from './loopVerify-DALtTk2V.mjs';
+import { f as flushStdout } from './flushExit-C-i6SGjj.mjs';
+import 'node:crypto';
+import './instance-CeHz5C8v.mjs';
 import 'fs';
 import 'path';
-import 'url';
-import 'child_process';
-import 'crypto';
-import 'node:crypto';
-import 'util';
-import 'http';
-import 'net';
-import 'node:events';
-import '@agentclientprotocol/sdk';
-import 'node:util';
-import 'node:readline';
-import 'node:fs/promises';
-import 'yaml';
+import 'os';
+import './store-B4E6NzG6.mjs';
+import './fileLock-BMPwCrB6.mjs';
 
 function formatTime(ts) {
   if (!ts) return "-";
@@ -88,6 +83,30 @@ function formatJson(data) {
   return JSON.stringify(data, null, 2);
 }
 
+function machineLabelOf(machine, index) {
+  return String(
+    machine?.metadata?.displayName || machine?.metadata?.host || machine?.machineId || machine?.id || `machine #${index}`
+  );
+}
+function describeRejection(reason) {
+  if (reason instanceof Error) return reason.message || String(reason);
+  if (typeof reason === "string") return reason;
+  try {
+    const json = JSON.stringify(reason);
+    return typeof json === "string" ? json : String(reason);
+  } catch {
+    return String(reason);
+  }
+}
+function warnUnreachableMachines(unreachable, total) {
+  if (unreachable.length === 0) return false;
+  const detail = unreachable.map((u) => `${u.machine}: ${u.error}`).join("; ");
+  console.error(
+    `warning: ${unreachable.length} of ${total} machine(s) did not respond \u2014 this list is INCOMPLETE (${detail})`
+  );
+  return true;
+}
+
 const SESSION_RPC_PARAMS = {
   getMessages: ["afterSeq", "limit"],
   getMessageCount: [],
@@ -395,13 +414,19 @@ async function connectAndGetAllMachines() {
     process.exit(1);
   }
   const machines = [];
+  const unreachableMachines = [];
   try {
     const services = await server.listServices({ query: { type: "svamp-machine" }, include_unlisted: true, _rkwargs: true });
     const results = await Promise.allSettled(
       services.map((svc) => server.getService(svc.id || svc.name))
     );
-    for (const r of results) {
+    for (let i = 0; i < results.length; i++) {
+      const r = results[i];
       if (r.status === "fulfilled") machines.push(r.value);
+      else unreachableMachines.push({
+        machine: String(services[i]?.id || services[i]?.name || `#${i}`),
+        error: describeRejection(r.reason)
+      });
     }
   } catch (err) {
     restoreConsole();
@@ -415,7 +440,7 @@ async function connectAndGetAllMachines() {
     await server.disconnect();
     process.exit(1);
   }
-  return { server, machines };
+  return { server, machines, unreachable: unreachableMachines };
 }
 async function sessionMachines() {
   loadDotEnv();
@@ -817,9 +842,9 @@ async function sessionList(machineId, opts) {
       await server.disconnect();
     }
   } else {
-    const { server, machines } = await connectAndGetAllMachines();
+    const { server, machines, unreachable: discoveryUnreachable } = await connectAndGetAllMachines();
     try {
-      await listSessionsFromMachines(server, machines, opts);
+      await listSessionsFromMachines(server, machines, opts, discoveryUnreachable);
     } finally {
       await server.disconnect();
     }
@@ -837,7 +862,7 @@ function formatPeerLine(s) {
 }
 async function sessionWhoami(opts) {
   const currentSessionId = process.env.SVAMP_SESSION_ID;
-  const { server, machines } = await connectAndGetAllMachines();
+  const { server, machines, unreachable } = await connectAndGetAllMachines();
   try {
     const perMachine = await Promise.allSettled(
       machines.map(async (machine) => {
@@ -849,6 +874,17 @@ async function sessionWhoami(opts) {
       })
     );
     const gathered = perMachine.filter((r) => r.status === "fulfilled").map((r) => r.value);
+    const whoamiUnreachable = [...unreachable];
+    for (let i = 0; i < perMachine.length; i++) {
+      const r = perMachine[i];
+      if (r.status === "rejected") {
+        whoamiUnreachable.push({
+          machine: machineLabelOf(machines[i], i),
+          error: describeRejection(r.reason)
+        });
+      }
+    }
+    warnUnreachableMachines(whoamiUnreachable, machines.length + unreachable.length);
     const machineLabel = (info) => info?.metadata?.displayName || info?.metadata?.host || info?.metadata?.hostname || info?.machineId || "unknown";
     let current = null;
     let currentSession = null;
@@ -951,7 +987,7 @@ async function sessionWhoami(opts) {
     await server.disconnect();
   }
 }
-async function listSessionsFromMachines(_server, machines, opts) {
+async function listSessionsFromMachines(_server, machines, opts, discoveryUnreachable = []) {
   const allSessions = [];
   const machineResults = await Promise.allSettled(
     machines.map(async (machine) => {
@@ -966,11 +1002,18 @@ async function listSessionsFromMachines(_server, machines, opts) {
       return sessions;
     })
   );
-  for (const r of machineResults) {
+  const unreachable = [...discoveryUnreachable];
+  for (let i = 0; i < machineResults.length; i++) {
+    const r = machineResults[i];
     if (r.status === "fulfilled") allSessions.push(...r.value);
+    else unreachable.push({
+      machine: machineLabelOf(machines[i], i),
+      error: describeRejection(r.reason)
+    });
   }
   const filtered = opts?.active ? allSessions.filter((s) => s.active) : allSessions;
   if (filtered.length === 0) {
+    warnUnreachableMachines(unreachable, machines.length + discoveryUnreachable.length);
     if (opts?.json) {
       console.log(formatJson([]));
     } else {
@@ -989,6 +1032,7 @@ async function listSessionsFromMachines(_server, machines, opts) {
       host: m.host || s.machineHost || ""
     };
   });
+  warnUnreachableMachines(unreachable, machines.length + discoveryUnreachable.length);
   if (opts?.json) {
     console.log(formatJson(enriched.map((s) => ({
       sessionId: s.sessionId,
@@ -1724,11 +1768,13 @@ async function sendCore(machine, fullId, message, opts) {
   }
   if (opts?.asIssue) {
     const issue = await machine.sessionRPC(fullId, "issue", {
-      op: "add",
-      body: message,
-      session: fullId,
-      rekick: true,
-      ...opts.issueTitle ? { title: opts.issueTitle } : {}
+      params: {
+        op: "add",
+        body: message,
+        session: fullId,
+        rekick: true,
+        ...opts.issueTitle ? { title: opts.issueTitle } : {}
+      }
     });
     return {
       sessionId: fullId,
@@ -1744,9 +1790,11 @@ async function sendCore(machine, fullId, message, opts) {
   const shouldWait = !!opts?.wait || wantResponse;
   if (opts?.plain) {
     const { randomUUID: ruuid } = await import('node:crypto');
+    let plainBypassEnsured = false;
     if (shouldWait && !opts?.requireApproval) {
       try {
         await machine.sessionRPC(fullId, "switchMode", { mode: "bypassPermissions" });
+        plainBypassEnsured = true;
       } catch {
       }
     }
@@ -1757,7 +1805,7 @@ async function sendCore(machine, fullId, message, opts) {
     let pWait;
     if (shouldWait) pWait = await waitForBusyThenIdle(machine, fullId, (opts?.timeout || 300) * 1e3);
     if (pWait?.pendingPermissions?.length) {
-      return { sessionId: fullId, mode: "send", sent: true, messageId: sendRes?.id, waited: true, status: "permission-pending", pendingPermissions: pWait.pendingPermissions };
+      return { sessionId: fullId, mode: "send", sent: true, messageId: sendRes?.id, waited: true, status: "permission-pending", pendingPermissions: pWait.pendingPermissions, ...plainBypassEnsured ? { bypassEnsured: true } : {} };
     }
     let pResp;
     if (wantResponse) pResp = await collectAssistantResponse(machine, fullId, preSeq2);
@@ -1768,14 +1816,17 @@ async function sendCore(machine, fullId, message, opts) {
       messageId: sendRes?.id,
       waited: !!shouldWait,
       status: shouldWait ? "idle" : "sent",
-      ...wantResponse && pResp ? { response: pResp.text, responseSeqs: pResp.messageSeqs } : {}
+      ...wantResponse && pResp ? { response: pResp.text, responseSeqs: pResp.messageSeqs } : {},
+      ...plainBypassEnsured ? { bypassEnsured: true } : {}
     };
   }
   if (opts?.model) {
     const { randomUUID: ruuid } = await import('node:crypto');
+    let modelBypassEnsured = false;
     if (shouldWait && !opts?.requireApproval) {
       try {
         await machine.sessionRPC(fullId, "switchMode", { mode: "bypassPermissions" });
+        modelBypassEnsured = true;
       } catch {
       }
     }
@@ -1784,6 +1835,7 @@ async function sendCore(machine, fullId, message, opts) {
     } catch {
     }
     await new Promise((r) => setTimeout(r, 2e3));
+    const modelPreSeq = wantResponse ? await snapshotLatestSeq(machine, fullId) : 0;
     const meta = { model: opts.model, sentFrom: "svamp-cli" };
     const contentStr = JSON.stringify({ role: "user", content: { type: "text", text: message }, meta });
     const sendRes = await machine.sessionRPC(fullId, "sendMessage", {
@@ -1803,12 +1855,13 @@ async function sendCore(machine, fullId, message, opts) {
         messageId: sendRes?.id,
         waited: true,
         status: "permission-pending",
-        pendingPermissions: mWait.pendingPermissions
+        pendingPermissions: mWait.pendingPermissions,
+        ...modelBypassEnsured ? { bypassEnsured: true } : {}
       };
     }
     let mResponse;
     if (wantResponse) {
-      mResponse = await collectAssistantResponse(machine, fullId, 0);
+      mResponse = await collectAssistantResponse(machine, fullId, modelPreSeq);
     }
     return {
       sessionId: fullId,
@@ -1817,7 +1870,8 @@ async function sendCore(machine, fullId, message, opts) {
       messageId: sendRes?.id,
       waited: shouldWait,
       status: shouldWait ? "idle" : "sent",
-      ...wantResponse && mResponse ? { response: mResponse.text, responseSeqs: mResponse.messageSeqs } : {}
+      ...wantResponse && mResponse ? { response: mResponse.text, responseSeqs: mResponse.messageSeqs } : {},
+      ...modelBypassEnsured ? { bypassEnsured: true } : {}
     };
   }
   let bypassEnsured = false;
@@ -2392,6 +2446,7 @@ async function wiseAskCli(machineId, message, sessionId, opts) {
     const res = await machine.wiseAsk({ message, sessionId });
     if (opts?.json) {
       console.log(JSON.stringify(res, null, 2));
+      await flushStdout();
       process.exit(res?.success ? 0 : 1);
     }
     if (res?.error) {
@@ -2419,6 +2474,7 @@ async function wiseJoinMeetingCli(machineId, url, sessionId, opts) {
     const res = await machine.wiseJoinMeeting({ meetingUrl: url, sessionId, mode, mission: opts?.mission });
     if (opts?.json) {
       console.log(JSON.stringify(res, null, 2));
+      await flushStdout();
       process.exit(res?.success ? 0 : 1);
     }
     if (res?.error) {
@@ -2437,6 +2493,7 @@ async function wiseLeaveMeetingCli(machineId, sessionId, opts) {
     const res = await machine.wiseLeaveMeeting({ sessionId });
     if (opts?.json) {
       console.log(JSON.stringify(res, null, 2));
+      await flushStdout();
       process.exit(res?.success ? 0 : 1);
     }
     if (res?.error) {
@@ -2459,6 +2516,7 @@ async function wiseAnnounceCli(machineId, text, sessionId, opts) {
     const res = await machine.wiseAnnounce({ text, sessionId });
     if (opts?.json) {
       console.log(JSON.stringify(res, null, 2));
+      await flushStdout();
       process.exit(res?.success ? 0 : 1);
     }
     if (res?.error) {
@@ -2477,6 +2535,7 @@ async function wiseMeetingsCli(machineId, opts) {
     const res = await machine.wiseMeetingStatus({});
     if (opts?.json) {
       console.log(JSON.stringify(res, null, 2));
+      await flushStdout();
       process.exit(0);
     }
     const ms = res?.meetings || [];
@@ -2536,8 +2595,7 @@ async function sessionLoopStart(sessionIdPartial, task, machineId, opts) {
     const svc = getSessionProxy(machine, fullId);
     const until = opts?.until || opts?.criteria;
     const isStart = !!(task || until);
-    const maxIterations = opts?.maxIterations ?? (isStart ? 1e4 : void 0);
-    const evaluator = opts?.agent ? true : opts?.evaluator !== false;
+    const maxIterations = opts?.maxIterations ?? (isStart ? UNBOUNDED_LOOP_ITERATIONS : void 0);
     const budget = opts?.maxTokensPerHour || opts?.maxRuntimeSec ? {
       ...opts?.maxTokensPerHour ? { max_tokens_per_hour: opts.maxTokensPerHour } : {},
       ...opts?.maxRuntimeSec ? { max_runtime_sec: opts.maxRuntimeSec } : {}
@@ -2547,11 +2605,15 @@ async function sessionLoopStart(sessionIdPartial, task, machineId, opts) {
         ...task ? { task } : {},
         ...until ? { until } : {},
         ...opts?.oracle ? { oracle: opts.oracle } : {},
-        ...opts?.parent ? { parent: opts.parent } : {},
         ...maxIterations != null ? { max_iterations: maxIterations } : {},
-        ...budget ? { budget } : {},
-        ...opts?.engine ? { engine: opts.engine } : {},
-        evaluator
+        ...budget ? { budget } : {}
+        // #1499: `parent`, `engine` and `evaluator` are no longer sent. The /goal kickoff in
+        // daemon/run.ts reads only task/until/oracle/max_iterations/budget/durable, so these
+        // three travelled the whole RPC and were dropped — while the CLI echoed them back as
+        // if applied. Sending a field nobody reads is how a flag becomes documented as a
+        // control (#1415 was the same shape one command over). The legacy `supervisor` key's
+        // normalizer still accepts `parent`/`evaluator` for back-compat; that path is
+        // untouched.
       }
     });
     if (!isStart) {
@@ -2561,9 +2623,10 @@ async function sessionLoopStart(sessionIdPartial, task, machineId, opts) {
       if (task) console.log(`  Task: ${task.slice(0, 100)}${task.length > 100 ? "..." : ""}`);
       if (until) console.log(`  Until: ${until.slice(0, 100)}${until.length > 100 ? "..." : ""}`);
       console.log(`  Oracle: ${opts?.oracle || "(none)"}`);
-      console.log(`  Evaluator: ${evaluator ? "on" : "off"}`);
-      if (opts?.parent) console.log(`  Parent review: ${opts.parent.slice(0, 8)}`);
-      if (maxIterations != null) console.log(`  Max iterations: ${maxIterations}`);
+      console.log(`  Evaluator: on`);
+      if (maxIterations != null) {
+        console.log(maxIterations >= UNBOUNDED_LOOP_ITERATIONS ? `  Max iterations: unbounded (no iteration cap \u2014 cost/runtime ceilings only)` : `  Max iterations: ${maxIterations}`);
+      }
       if (!task) console.log(`  (hot-plug \u2014 gating the session's current work)`);
     }
   } finally {
@@ -2618,16 +2681,19 @@ async function sessionLoopStatus(sessionIdPartial, machineId) {
       return;
     }
     const config = await readJsonFile(`${base}/loop.config.json`);
-    const verdict = await readJsonFile(`${base}/evaluator-verdict.json`);
     console.log(`Loop on session ${fullId.slice(0, 8)}:`);
-    const maxN = config?.max_iterations;
+    const maxRaw = state.max_iterations ?? config?.max_iterations;
+    const maxN = typeof maxRaw === "number" && maxRaw > 0 && maxRaw < 1e6 ? maxRaw : null;
+    const turns = state.ledger?.turns ?? state.iteration ?? 0;
     console.log(`  Phase: ${state.phase || (state.active === false ? "inactive" : "running")}`);
-    console.log(`  Iteration: ${state.iteration ?? 0}${maxN ? ` / ${maxN}` : ""}`);
-    if (config?.oracle?.command) console.log(`  Oracle: ${config.oracle.command}`);
+    console.log(`  Iteration: ${turns}${maxN ? ` / ${maxN}` : " (no iteration cap)"}`);
+    const oracleCmd = state.oracle?.command ?? state.oracle ?? config?.oracle?.command;
+    if (typeof oracleCmd === "string" && oracleCmd) console.log(`  Oracle: ${oracleCmd}`);
     if (state.last_oracle) console.log(`  Last oracle: ${String(state.last_oracle).split("\n")[0]}`);
-    if (config && config.evaluator?.enabled !== false) {
-      console.log(`  Evaluator: ${verdict ? `${verdict.verdict}${verdict.reason ? ` \u2014 ${verdict.reason}` : ""}` : "on (no verdict yet)"}`);
-    }
+    const verdict = state.last_verdict ?? state.verdict;
+    console.log(`  Evaluator: ${verdict ? `${verdict.verdict ?? verdict}${verdict.reason ? ` \u2014 ${verdict.reason}` : ""}` : "on (no verdict yet)"}`);
+    if (Number.isFinite(state.auto_resumes) && state.auto_resumes > 0) console.log(`  Auto-resumes: ${state.auto_resumes}`);
+    if (Number.isFinite(state.holds) && state.holds > 0) console.log(`  Holds: ${state.holds}`);
     if (state.gave_up_reason) console.log(`  Gave up: ${state.gave_up_reason}`);
     if (Array.isArray(state.extensions) && state.extensions.length) {
       const totalTurns = state.extensions.reduce((s, e) => s + (Number.isFinite(e?.grantedTurns) && e.grantedTurns > 0 ? Math.floor(e.grantedTurns) : 0), 0);

package/dist/{commands-DU4B-4Gh.mjs → commands-BMeDrpSv.mjs}

@@ -1,29 +1,59 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-DDuGBSsz.mjs';
-import { w as wantsHelp } from './cli-B24CmIli.mjs';
+import { connectAndGetMachine } from './commands-B-yczgz_.mjs';
+import { w as wantsHelp } from './wantsHelp-6bMOeNUz.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-CF4kAVPW.mjs';
-import 'os';
-import 'fs/promises';
-import 'url';
-import 'child_process';
-import 'crypto';
+import './hyphaClient-ybivOjZo.mjs';
+import './friendlyName-1UZcyDhu.mjs';
 import 'node:crypto';
-import 'util';
-import 'http';
-import 'net';
-import 'node:events';
-import '@agentclientprotocol/sdk';
-import 'node:util';
-import 'node:readline';
-import 'node:fs/promises';
-import 'yaml';
-import './serviceManager-hlOVxkhW.mjs';
+import './types-57J3Re0n.mjs';
+import './securityContext-Cm5UTCuD.mjs';
+import './loopVerify-DALtTk2V.mjs';
+import './instance-CeHz5C8v.mjs';
+import 'os';
+import './store-B4E6NzG6.mjs';
+import './fileLock-BMPwCrB6.mjs';
+import './flushExit-C-i6SGjj.mjs';
+
+function positionalArgs(args, valueFlags) {
+  const out = [];
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--") break;
+    if (a.startsWith("-") && a !== "-") {
+      if (!a.includes("=") && valueFlags.has(a)) i++;
+      continue;
+    }
+    out.push(a);
+  }
+  return out;
+}
+function firstPositional(args, valueFlags) {
+  return positionalArgs(args, valueFlags)[0];
+}
 
+const PROCESS_VALUE_FLAGS = /* @__PURE__ */ new Set([
+  "-o",
+  "--output",
+  "--save",
+  "--last",
+  "--env",
+  "--ttl",
+  "--workdir",
+  "--max-restarts",
+  "--restart-delay",
+  "--probe-port",
+  "--probe-path",
+  "--probe-interval",
+  "--probe-timeout",
+  "--probe-failures",
+  // pre-stripped by cli.ts today, listed so this set stays correct if that ever changes
+  "-m",
+  "--machine"
+]);
 function getFlag(args, flag) {
   const idx = args.indexOf(flag);
   return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : void 0;
@@ -308,7 +338,7 @@ async function processCommand(args, machineId) {
   }
 }
 async function applyCommand(args, machineId) {
-  const filePath = args.find((a) => !a.startsWith("-"));
+  const filePath = firstPositional(args, PROCESS_VALUE_FLAGS);
   if (!filePath) {
     console.error("Error: spec file required");
     console.error("Usage: svamp process apply <file.yaml>");
@@ -353,7 +383,7 @@ async function listCommand(args, machineId) {
   }
 }
 async function getCommand(args, machineId) {
-  const idOrName = args.find((a) => !a.startsWith("-"));
+  const idOrName = firstPositional(args, PROCESS_VALUE_FLAGS);
   if (!idOrName) {
     console.error("Error: process name or id required");
     process.exit(1);
@@ -394,7 +424,7 @@ ${content}`, "utf-8");
 }
 async function startCommand(args, machineId) {
   const { flagArgs, cmdArgs } = splitOnDoubleDash(args);
-  const idOrName = flagArgs.find((a) => !a.startsWith("-"));
+  const idOrName = firstPositional(flagArgs, PROCESS_VALUE_FLAGS);
   if (!idOrName) {
     console.error("Error: process name or id required");
     process.exit(1);
@@ -477,7 +507,7 @@ async function startCommand(args, machineId) {
   }
 }
 async function stopCommand(args, machineId) {
-  const idOrName = args.find((a) => !a.startsWith("-"));
+  const idOrName = firstPositional(args, PROCESS_VALUE_FLAGS);
   if (!idOrName) {
     console.error("Error: process name or id required");
     process.exit(1);
@@ -491,7 +521,7 @@ async function stopCommand(args, machineId) {
   }
 }
 async function restartCommand(args, machineId) {
-  const idOrName = args.find((a) => !a.startsWith("-"));
+  const idOrName = firstPositional(args, PROCESS_VALUE_FLAGS);
   if (!idOrName) {
     console.error("Error: process name or id required");
     process.exit(1);
@@ -505,7 +535,7 @@ async function restartCommand(args, machineId) {
   }
 }
 async function deleteCommand(args, machineId) {
-  const idOrName = args.find((a) => !a.startsWith("-"));
+  const idOrName = firstPositional(args, PROCESS_VALUE_FLAGS);
   if (!idOrName) {
     console.error("Error: process name or id required");
     process.exit(1);
@@ -519,7 +549,7 @@ async function deleteCommand(args, machineId) {
   }
 }
 async function logsCommand(args, machineId) {
-  const idOrName = args.find((a) => !a.startsWith("-"));
+  const idOrName = firstPositional(args, PROCESS_VALUE_FLAGS);
   if (!idOrName) {
     console.error("Error: process name or id required");
     process.exit(1);