@awak-app/simy-cli 0.6.22 → 0.6.23

package/README.md

@@ -236,6 +236,15 @@ SQM checks apply when you explicitly select `@simy`, invoke the SQM skill, or as
 After installation, restart Codex and find and install **SIMY** in **Plugins**
 before using `@simy` in a new task.
 
+If **Connect SIMY** fails while the CLI is already signed in, check the recovery
+message in connection settings. Finish or retry a pending SIMY update, or complete
+or cancel an organization selection. If SIMY remains paused, use **SIMY → Quit
+SIMY**, reopen it, and reconnect; closing the window alone does not restart the
+background host. Refresh connections and confirm the conversation list returns.
+Diagnostic `provider connection failed` entries distinguish `reason=update`,
+`organization_change`, and `shutdown` without including credentials or transcripts.
+Reconnection does not sign in to Codex CLI or restore revoked automatic continuation.
+
 The plugin also includes a non-blocking connection reminder. At task startup,
 resume, and prompt submission it reads the origin-scoped local discovery record
 and checks the loopback CLI health endpoint. It warns once per disconnected
@@ -593,6 +602,15 @@ preflight and returns the installed version, required version, and a recovery
 command to SIMY Web. Update Codex with
 `npm install -g @openai/codex@latest`; update Claude Code with `claude update`.
 
+Codex discovery compares installed CLI versions across PATH (including shadowed
+installs) and the known Codex/ChatGPT app bundles on macOS, selecting the newest
+compatible version. Equal versions retain discovery order. A compatible
+`SIMY_CODEX_BIN` override retains priority; a broken or unsupported override falls
+back to automatic discovery. Refresh the connection status after updating Codex;
+each new inspection checks installed versions again. SIMY does not download or
+replace Codex. The desktop connection status and Codex conversation reader both
+require `0.158.0` or later for the verified app-server writer-lock protocol.
+
 ## Your Desktop executor
 
 SIMY CLI is the `desktop` execution target, shown to users as **Your Desktop**.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awak-app/simy-cli",
-  "version": "0.6.22",
+  "version": "0.6.23",
   "description": "Local SIMY executor for non-coding Local Tasks and Agentic Loop runs.",
   "type": "module",
   "bin": {

package/src/backend-executable.js

@@ -32,11 +32,30 @@ export async function inspectBackendExecutable(
   assertActive();
   const policy = versionPolicy(backend);
   const requiredVersion = minimumVersion || policy.minimumVersion;
+  const explicitCodex = backend === "codex"
+    ? (discoveryOptions.environment ?? process.env).SIMY_CODEX_BIN : null;
   candidates ??= [...backendCandidates(backend, discoveryOptions), ...await bundledClaudeCandidates(backend, discoveryOptions)];
+  candidates = [...new Set(candidates.filter(Boolean))];
   let fallback = null;
-  for (const candidate of [...new Set(candidates.filter(Boolean))]) {
+  // An intentional override retains priority. Broken or unsupported overrides
+  // still fall back to automatic discovery, as before.
+  if (explicitCodex && candidates.includes(explicitCodex)) {
+    const pinned = await inspectBackendExecutable(backend, {
+      candidates: [explicitCodex], spawnImpl, timeoutMs, signal, minimumVersion,
+      discoveryOptions: { ...discoveryOptions, environment: {} },
+    });
+    if (pinned.compatible) return pinned;
+    if (pinned.available) fallback = pinned;
+    candidates = candidates.filter(candidate => candidate !== explicitCodex);
+  }
+  // Comparing all Codex installs must not turn several slow wrappers into a
+  // serial startup delay. Keep concurrency bounded and results in source order.
+  const probes = backend === "codex"
+    ? await probeCandidates(candidates, { spawnImpl, timeoutMs, signal }, assertActive) : null;
+  let selected = null;
+  for (const [index, candidate] of candidates.entries()) {
     assertActive();
-    const probe = await probeExecutable(candidate, { spawnImpl, timeoutMs, signal });
+    const probe = probes ? probes[index] : await probeExecutable(candidate, { spawnImpl, timeoutMs, signal });
     assertActive();
     if (!probe.available) continue;
     const installedVersion = parseBackendVersion(probe.output);
@@ -52,12 +71,15 @@ export async function inspectBackendExecutable(
       update_command: policy.updateCommand,
     };
     // An executable that starts may still be too old for the requested feature.
-    // Preserve candidate priority among compatible installs, and retain the
-    // first runnable failure for actionable diagnostics if none qualifies.
-    if (compatible) return inspection;
+    // Claude retains its existing priority. Codex chooses the newest version;
+    // equal versions retain discovery order regardless of probe completion order.
+    if (compatible) {
+      if (backend !== "codex") return inspection;
+      if (!selected || compareCodexVersions(installedVersion, selected.installed_version) > 0) selected = inspection;
+    }
     fallback ??= inspection;
   }
-  return fallback || {
+  return selected || fallback || {
     backend,
     executable: null,
     available: false,
@@ -88,6 +110,8 @@ export function backendCandidates(backend, {
   return [
     environment.SIMY_CODEX_BIN,
     "codex",
+    ...codexPathCandidates(platform, environment),
+    ...(platform === "darwin" ? ["/opt/homebrew/bin/codex", "/usr/local/bin/codex"] : []),
     ...(platform === "darwin" ? ["/Applications", path.posix.join(home, "Applications")].flatMap(directory =>
       ["ChatGPT.app", "Codex.app"].flatMap(app => {
         const resources = path.posix.join(directory, app, "Contents", "Resources");
@@ -98,6 +122,48 @@ export function backendCandidates(backend, {
   ];
 }
 
+function codexPathCandidates(platform, environment) {
+  const paths = platform === "win32" ? path.win32 : path.posix;
+  const names = platform === "win32" ? ["codex.exe", "codex.cmd", "codex.bat", "codex"] : ["codex"];
+  return (environment.PATH ?? environment.Path ?? "").split(paths.delimiter)
+    .map(directory => directory.replace(/^"(.*)"$/, "$1"))
+    .filter(directory => paths.isAbsolute(directory))
+    .flatMap(directory => names.map(name => paths.join(directory, name)))
+    .filter(candidate => { try { return statSync(candidate).isFile(); } catch { return false; } });
+}
+
+async function probeCandidates(candidates, options, assertActive) {
+  let next = 0;
+  const probes = new Array(candidates.length);
+  await Promise.all(Array.from({ length: Math.min(4, candidates.length) }, async () => {
+    while (next < candidates.length) {
+      // Drain every owned probe before reporting cancellation to callers.
+      if (options.signal?.aborted) break;
+      const index = next++;
+      probes[index] = await probeExecutable(candidates[index], options);
+    }
+  }));
+  assertActive();
+  return probes;
+}
+
+function compareCodexVersions(left, right) {
+  const core = compareVersions(left, right);
+  if (core) return core;
+  const prerelease = version => version.includes("-") ? version.slice(version.indexOf("-") + 1).split(".") : null;
+  const a = prerelease(left), b = prerelease(right);
+  if (!a || !b) return Number(!a) - Number(!b);
+  for (let index = 0; index < Math.max(a.length, b.length); index++) {
+    if (a[index] === b[index]) continue;
+    if (a[index] === undefined || b[index] === undefined) return a[index] === undefined ? -1 : 1;
+    const numericA = /^\d+$/.test(a[index]), numericB = /^\d+$/.test(b[index]);
+    if (numericA && numericB) return Number(a[index]) - Number(b[index]);
+    if (numericA !== numericB) return numericA ? -1 : 1;
+    return a[index] < b[index] ? -1 : 1;
+  }
+  return 0;
+}
+
 // Claude Desktop can install below <version>/<content hash>/claude.app while
 // an older PATH wrapper still points at <version>/claude.app. Discover only the
 // known app layout; never recursively execute arbitrary files from user folders.
@@ -167,7 +233,9 @@ function probeExecutable(command, { spawnImpl, timeoutMs, signal }) {
     let settled = false, terminating = false;
     let timeout, force, limit;
     let output = Buffer.alloc(0);
-    const child = spawnImpl(command, ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
+    let child;
+    try { child = spawnImpl(command, ["--version"], { stdio: ["ignore", "pipe", "pipe"] }); }
+    catch { resolve({ available: false, output: "" }); return; }
     const capture = chunk => {
       // Version probes need a tiny prefix. Drain noisy executables without
       // retaining unbounded stdout/stderr in the desktop background process.

package/src/cli-contract.js

@@ -13,7 +13,7 @@ import {
 } from "./durable-local-task-steps-contract.js";
 import { buildExecutionCapabilityContract } from "./execution-capability-contract.js";
 
-export const CLI_VERSION = "0.6.22";
+export const CLI_VERSION = "0.6.23";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function withCliContract(

package/src/codex-plugins/simy/hooks/dev-work.mjs

@@ -101,9 +101,23 @@ export async function collectDevWorkEvent({
     session_id: sha256(`${provider}:${sessionId.trim()}`),
     source,
     project_id: projectId.toLowerCase(),
+    ...workflowRun(env),
   };
 }
 
+/**
+ * W-02: the independent WorkFlow run that started this session. The SIMY
+ * agent sets both variables only on the Provider process it launched for a
+ * WorkFlow run (and clears inherited values otherwise); SIMY keeps the link
+ * only when the run belongs to the signed-in device owner.
+ */
+export function workflowRun(env = process.env) {
+  const workflowId = String(env.SIMY_WORKFLOW_ID || "").trim();
+  const runId = String(env.SIMY_WORKFLOW_RUN_ID || "").trim();
+  if (!UUID.test(workflowId) || !UUID.test(runId)) return {};
+  return { workflow_id: workflowId.toLowerCase(), workflow_run_id: runId.toLowerCase() };
+}
+
 /** Best effort: the open PR for the current branch via `gh`, if installed. */
 export async function pullRequestUrl({ cwd, repo, env = process.env, runImpl = run }) {
   const url = await runImpl("gh", ["pr", "view", "--json", "url", "--jq", ".url"], {
@@ -190,7 +204,15 @@ export async function runDevWorkHook({
     env.PLUGIN_DATA?.trim() || env.CLAUDE_PLUGIN_DATA?.trim() || join(sessionRoot, "plugin-data", "simy");
   // The upstream observation is keyed by (Project, repo, HEAD, session): a
   // resend of the same state changes nothing, so skip it (and `gh`) locally.
-  const fingerprint = sha256(JSON.stringify([event.session_id, event.repo, event.head_sha, event.project_id ?? null]));
+  const fingerprint = sha256(
+    JSON.stringify([
+      event.session_id,
+      event.repo,
+      event.head_sha,
+      event.project_id ?? null,
+      event.workflow_run_id ?? null,
+    ]),
+  );
   const statePath = join(pluginData, "dev-work", `${event.session_id}.json`);
   if ((await readState(statePath))?.fingerprint === fingerprint) {
     return { sent: false, reason: "unchanged" };

package/src/desktop-host.js

@@ -67,6 +67,11 @@ function desktopActionError(action, error) {
   if (error?.code === "provider_link_changed") return "SIMY connection changed. Refresh and select the conversation again.";
   if (error?.code === "provider_link_disconnected") return "Reconnect this provider to SIMY before using it.";
   if (["provider_connect", "provider_disconnect"].includes(action)) {
+    if (error?.code === 'desktop_stopping') {
+      if (error.stoppingReason === 'update') return "SIMY is preparing an update. Finish or retry the update; if it failed, quit SIMY completely, reopen it, then reconnect.";
+      if (error.stoppingReason === 'organization_change') return "SIMY is switching organizations. Complete or cancel the organization selection, then reconnect.";
+      return "SIMY is pausing new work. Quit SIMY completely, reopen it, then reconnect.";
+    }
     if (error?.code === 'desktop_access_required') return "Sign in to your SIMY workspace, then try connecting again.";
     if (['EACCES', 'EPERM', 'EROFS'].includes(error?.code)) return "SIMY could not save the connection settings. Check access to its local settings folder, then retry.";
     if (error?.code === 'ENOSPC') return "SIMY could not save the connection settings. Free disk space, then retry.";
@@ -301,11 +306,17 @@ export async function startDesktopHost({ input = process.stdin, output = process
   let organizationAnalysesSuspended = false;
   let organizationAnalysisDrain = Promise.resolve();
   let organizationAnalysisEpoch = 0;
+  const requireWorkAdmission = () => {
+    const stoppingReason = closed ? 'shutdown'
+      : stoppingForUpdate || updater?.acceptsNewWork?.() === false ? 'update'
+      : organizationAnalysesSuspended ? 'organization_change' : null;
+    if (stoppingReason) throw Object.assign(new Error("SIMY is stopping. Reopen SIMY before starting new work."), { code: "desktop_stopping", stoppingReason });
+  };
   const authorizeWork = async expectedScope => {
-    if (closed || stoppingForUpdate || updater?.acceptsNewWork?.() === false || organizationAnalysesSuspended) throw Object.assign(new Error("SIMY is stopping. Reopen SIMY before starting new work."), { code: "desktop_stopping" });
+    requireWorkAdmission();
     if (agent?.requireDesktopAccess) await agent.requireDesktopAccess();
     const access = await accessSnapshot();
-    if (closed || stoppingForUpdate || updater?.acceptsNewWork?.() === false || organizationAnalysesSuspended) throw Object.assign(new Error("SIMY is stopping. Reopen SIMY before starting new work."), { code: "desktop_stopping" });
+    requireWorkAdmission();
     requireDesktopAccess(access);
     const scope = accessScope(access);
     if (expectedScope !== undefined && expectedScope !== scope) throw Object.assign(new Error("Desktop account or organization changed."), { code: "desktop_access_required" });
@@ -1327,7 +1338,14 @@ export async function startDesktopHost({ input = process.stdin, output = process
           const provider = PROVIDER_LINKS.includes(command.provider) ? command.provider : 'unsupported';
           const kind = ['Error', 'TypeError', 'RangeError', 'SyntaxError'].includes(error?.name) ? error.name : 'Error';
           const locations = [...String(error?.stack || '').matchAll(/(?:desktop-host|agent|provider-links|delivery-loop|analysis-manager)\.m?js:\d{1,6}:\d{1,6}/g)].slice(0, 3).map(match => match[0]).join(',') || 'unknown';
-          diagnostics.write(`provider connection failed provider=${provider} operation=${command.action} code=${code} kind=${kind} locations=${locations}`);
+          const reason = code === 'desktop_stopping' && ['shutdown', 'update', 'organization_change'].includes(error?.stoppingReason) ? error.stoppingReason : 'unknown';
+          diagnostics.write(`provider connection failed provider=${provider} operation=${command.action} code=${code} reason=${reason} kind=${kind} locations=${locations}`);
+          // Admission can reject before changeProviderLink runs. Retain that
+          // recovery guidance across the next heartbeat, without overwriting
+          // an in-flight link change on the same provider.
+          if (provider !== 'unsupported' && code === 'desktop_stopping' && !providerLinkBusy.has(provider)) {
+            providerLinkFeedback[provider] = { state: 'error', message: desktopActionError(command.action, error) };
+          }
         }
         emit({ type: "result", id: command.id, ok: false, ...(error?.code === 'cancelled' || statisticsRequest?.controller.signal.aborted ? { code: 'cancelled' } : {}), message: ["update", "prepare_update_restart"].includes(command.action) && updateProgress ? updateProgress.message : desktopActionError(command.action, error) });
       } finally {

package/src/desktop-status.js

@@ -1,6 +1,6 @@
 import spawn from "cross-spawn";
 
-import { BACKEND_VERSION_POLICIES, inspectBackendExecutable } from "./backend-executable.js";
+import { BACKEND_VERSION_POLICIES, CODEX_WRITER_LOCK_MINIMUM_VERSION, inspectBackendExecutable } from "./backend-executable.js";
 import { isSessionValid } from "./session-store.js";
 
 const PROVIDER_STATUS_CACHE_MS = 30_000;
@@ -170,7 +170,9 @@ export async function inspectProviderStatus(provider, {
   const checkedAt = isoNow(now);
   let executable;
   try {
-    executable = await inspectExecutable(provider, { spawnImpl, timeoutMs });
+    executable = await inspectExecutable(provider, { spawnImpl, timeoutMs,
+      ...(provider === "codex" ? { minimumVersion: CODEX_WRITER_LOCK_MINIMUM_VERSION } : {}),
+    });
   } catch {
     return providerStatus("unknown", null, checkedAt, `${label} availability could not be checked.`);
   }

package/src/dev-work-events.js

@@ -13,7 +13,10 @@ export const DEV_WORK_EVENT_MAX_BYTES = 4096;
 const REQUEST_TIMEOUT_MS = 5_000;
 
 const REQUIRED_KEYS = ["repo", "branch", "head_sha", "session_id", "source"];
-const OPTIONAL_KEYS = ["pr_url", "project_id"];
+// W-02: the independent WorkFlow run that started this coding session. Both
+// or neither; Web/Crew keep it only when it is the device owner's own run.
+const OPTIONAL_KEYS = ["pr_url", "project_id", "workflow_id", "workflow_run_id"];
+const UUID_KEYS = ["project_id", "workflow_id", "workflow_run_id"];
 const ALLOWED_KEYS = new Set([...REQUIRED_KEYS, ...OPTIONAL_KEYS]);
 const SOURCES = new Set(["claude_code", "codex", "other"]);
 const REPO = /^[A-Za-z0-9_.-]{1,100}\/[A-Za-z0-9_.-]{1,100}$/;
@@ -52,14 +55,40 @@ export function normalizeDevWorkEvent(value) {
     !SESSION_ID.test(event.session_id) ||
     !SOURCES.has(event.source) ||
     (event.pr_url !== undefined && !PR_URL.test(event.pr_url)) ||
-    (event.project_id !== undefined && !UUID.test(event.project_id))
+    UUID_KEYS.some((key) => event[key] !== undefined && !UUID.test(event[key])) ||
+    (event.workflow_id === undefined) !== (event.workflow_run_id === undefined)
   ) {
     throw invalid();
   }
-  if (event.project_id !== undefined) event.project_id = event.project_id.toLowerCase();
+  for (const key of UUID_KEYS) {
+    if (event[key] !== undefined) event[key] = event[key].toLowerCase();
+  }
   return event;
 }
 
+/** Environment names the SIMY plugin dev-work hook reads (hooks/dev-work.mjs). */
+export const WORKFLOW_ID_ENV = "SIMY_WORKFLOW_ID";
+export const WORKFLOW_RUN_ID_ENV = "SIMY_WORKFLOW_RUN_ID";
+
+/**
+ * Provider child environment naming the independent WorkFlow run that started
+ * it, so the plugin hook can report which run the coding session belongs to.
+ * Without a complete run reference the keys are set to undefined, which
+ * child_process omits, so a value inherited from this agent's own environment
+ * can never attribute an unrelated session to a run.
+ */
+export function workflowRunEnv(reference) {
+  const workflowId = String(reference?.workflow_id || "");
+  const runId = String(reference?.workflow_run_id || "");
+  if (!UUID.test(workflowId) || !UUID.test(runId)) {
+    return { [WORKFLOW_ID_ENV]: undefined, [WORKFLOW_RUN_ID_ENV]: undefined };
+  }
+  return {
+    [WORKFLOW_ID_ENV]: workflowId.toLowerCase(),
+    [WORKFLOW_RUN_ID_ENV]: runId.toLowerCase(),
+  };
+}
+
 /**
  * Posts one normalized report to Web. Resolves with the minimal receipt; a
  * disabled gateway (404) or any refusal rejects with a status the local

package/src/local-task.js

@@ -47,6 +47,7 @@ import {
   normalizeWorkflowStartIntent,
 } from "./workflow-observation-sender.js";
 import { uploadWorkflowDeliverables } from "./workflow-deliverable-upload.js";
+import { workflowRunEnv } from "./dev-work-events.js";
 
 // Weighted tokens (cache reads count at 1/10). A real Claude Code WorkFlow step with the
 // Purpose Charter context measured ~200k weighted tokens on dev, so 100k failed every run.
@@ -580,6 +581,8 @@ export async function startLocalTask(
           TMP: runtimeTempRoot,
           TEMP: runtimeTempRoot,
           ...command.env,
+          // W-02: lets the dev-work hook link this session to its WorkFlow run.
+          ...workflowRunEnv(task.workflow_observation_binding),
         },
         stdio: ["ignore", "pipe", "pipe"],
         detached: process.platform !== "win32",

package/src/runner.js

@@ -55,6 +55,7 @@ import { acquireDesktopProcessLock, PROCESS_CONFLICT_CODE } from "./desktop-proc
 import {
   assertRecoveryActor, completedWorkerResult, recoveryActorBinding, refreshRecoveryAudit, refreshRecoveryBudgetAudit,
 } from "./coding-run-recovery.js";
+import { workflowRunEnv } from "./dev-work-events.js";
 
 const execFileAsync = promisify(execFile);
 const MAX_LOCAL_LOG_LINES = 1_000;
@@ -1035,6 +1036,17 @@ function sqmEvidenceEndpoint(session) {
   return new URL("sqm/run-evidence", session.api_base_url).href;
 }
 
+/**
+ * The independent WorkFlow run this coding run belongs to: the bound run, or
+ * the run a start intent already had admitted by an earlier attempt.
+ */
+export function workflowRunReference(run) {
+  const binding = run?.request?.workflow_observation_binding;
+  if (binding) return binding;
+  const observation = run?.snapshot?.metadata?.workflow_observation;
+  return ["accepted", "already_recorded"].includes(observation?.status) ? observation : null;
+}
+
 export async function executeProcessAttempt({
   backend,
   instruction,
@@ -1080,7 +1092,12 @@ export async function executeProcessAttempt({
     const checkpointWrites = [];
     const child = command.spawn(command.bin, command.args, {
       cwd: repositoryPath,
-      env: { ...process.env, ...command.env },
+      env: {
+        ...process.env,
+        ...command.env,
+        // W-02: lets the dev-work hook link this session to its WorkFlow run.
+        ...workflowRunEnv(workflowRunReference(run)),
+      },
       stdio: ["ignore", "pipe", "pipe"],
       detached: process.platform !== "win32",
     });