@awak-app/simy-cli 0.6.31 → 0.6.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awak-app/simy-cli",
-  "version": "0.6.31",
+  "version": "0.6.32",
   "description": "Local SIMY executor for non-coding Local Tasks and Agentic Loop runs.",
   "type": "module",
   "bin": {
@@ -50,7 +50,8 @@
     "test:macos-installer": "node --test packaging/test-macos-packaging.mjs",
     "build:macos-installer:production": "bash packaging/build-macos-arm64.sh --production",
     "test:e2e:claude-parity": "node ./scripts/claude-parity-runtime-e2e.js",
-    "test:e2e:claude-plugin": "node ./scripts/claude-plugin-runtime-e2e.js"
+    "test:e2e:claude-plugin": "node ./scripts/claude-plugin-runtime-e2e.js",
+    "test:e2e:sqm-faults": "node ./scripts/sqm-complete-loop-e2e.js"
   },
   "engines": {
     "node": ">=20"

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.31";
+export const CLI_VERSION = "0.6.32";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function narrativeImageCapabilityMetadata() {

package/src/delivery-hooks/legacy-hook-routing.js

@@ -6,7 +6,7 @@ import { pinnedWorkflowSource } from './local-runtime.js';
 const digest = bytes => createHash('sha256').update(bytes).digest('hex');
 // Exact shipped 0.6.23 and 0.6.24 entrypoints only. Customized hooks are retained.
 const shipped = new Set(['8a454293d119eac7cdb46c2df70c6b54a431fcf575bbf4f48f3373ca14414f3b', '339dc64d7ac980f9bfdafd1b2feea47ef8e86b2895b9d6e040086b005a806a79']);
-export const legacyRoutingShim = `// SIMY managed immutable-runtime route v1. Original exports retained for compatibility.
+const originalLegacyRoutingShim = `// SIMY managed immutable-runtime route v1. Original exports retained for compatibility.
 export * from './delivery-loop.pre-runtime-route.mjs';
 import { readFile, readdir, lstat } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
@@ -34,6 +34,10 @@ export async function main(provider) {
   } catch { process.stdout.write('{}\\n'); process.stderr.write('SIMY runtime route unavailable; original task state was preserved.\\n'); }
 }
 `;
+export const legacyRoutingShim = originalLegacyRoutingShim.replace(
+  "for (const input of ['package.json', 'package-lock.json', 'README.md', 'src']) await visit(input);",
+  "for (const input of ['package.json', 'package-lock.json', 'README.md', 'src']) { try { await visit(input); } catch (error) { if (input === 'package-lock.json' && error.code === 'ENOENT') hash.update('packaged-without-lock\\0'); else throw error; } } if (pin.fingerprintVersion === 2) await visit('node_modules');",
+);
 export async function routeLegacyHooks({ root, codexHome = process.env.CODEX_HOME || join(homedir(), '.codex') } = {}) {
   await pinnedWorkflowSource({ root });
   const folder = join(codexHome, 'plugins/cache/personal/simy');
@@ -47,9 +51,10 @@ export async function routeLegacyHooks({ root, codexHome = process.env.CODEX_HOM
     if (manifest.name !== 'simy' || manifest.version !== version || (await lstat(file)).isSymbolicLink()) continue;
     const bytes = await readFile(file), before = digest(bytes), next = digest(legacyRoutingShim);
     if (before === next) { receipts.push({ version, outcome: 'current', routeDigest: next }); continue; }
-    if (!shipped.has(before)) { receipts.push({ version, outcome: 'customized_retained', originalDigest: before }); continue; }
+    const managedV1 = before === digest(originalLegacyRoutingShim);
+    if (!shipped.has(before) && !managedV1) { receipts.push({ version, outcome: 'customized_retained', originalDigest: before }); continue; }
     const backup = join(cache, 'hooks/delivery-loop.pre-runtime-route.mjs');
-    try { await writeFile(backup, bytes, { mode: 0o600, flag: 'wx' }); }
+    try { if (!managedV1) await writeFile(backup, bytes, { mode: 0o600, flag: 'wx' }); }
     catch (error) { if (error.code !== 'EEXIST' || digest(await readFile(backup)) !== before) throw error; }
     const temporary = `${file}.${randomUUID()}.tmp`;
     await writeFile(temporary, legacyRoutingShim, { mode: 0o600 }); await rename(temporary, file);

package/src/delivery-hooks/local-runtime.js

@@ -1,16 +1,18 @@
 import { createHash, randomUUID } from 'node:crypto';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
-import { cp, lstat, mkdir, readFile, readdir, rename, rm, writeFile } from 'node:fs/promises';
+import { cp, lstat, mkdir, readFile, readdir, realpath, rename, rm, writeFile } from 'node:fs/promises';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { acquireDesktopProcessLock } from '../desktop-process-lock.js';
+import { compareVersions } from '../backend-executable.js';
 import { stableHookRuntime } from '../hook-runtime.js';
 
 const exec = promisify(execFile);
 const packageRoot = fileURLToPath(new URL('../../', import.meta.url));
 const inputs = ['package.json', 'package-lock.json', 'README.md', 'src'];
 
-async function fingerprint(source, { allowMissingLock = false } = {}) {
+async function fingerprint(source, { allowMissingLock = false, includeDependencies = false } = {}) {
   const hash = createHash('sha256');
   async function visit(relative) {
     const target = join(source, relative);
@@ -29,6 +31,7 @@ async function fingerprint(source, { allowMissingLock = false } = {}) {
       else throw error;
     }
   }
+  if (includeDependencies) await visit('node_modules');
   return hash.digest('hex');
 }
 
@@ -40,12 +43,17 @@ async function atomicJson(file, value) {
 
 function quote(value) { return `'${value.replaceAll("'", "'\\''")}'`; }
 
-export async function localRuntimeStatus({ root, source = packageRoot, allowMissingLock = false } = {}) {
+export async function localRuntimeStatus({ root, source = packageRoot, allowMissingLock = false, includeDependencies } = {}) {
   const pkg = JSON.parse(await readFile(join(source, 'package.json'), 'utf8'));
+  if (includeDependencies === undefined) {
+    try { includeDependencies = JSON.parse(await readFile(join(source, 'runtime-build.json'), 'utf8')).fingerprintVersion === 2; }
+    catch (error) { if (error.code !== 'ENOENT') throw error; includeDependencies = false; }
+  }
+  if (includeDependencies) allowMissingLock = true;
   let installation = null;
   try { installation = JSON.parse(await readFile(join(root, 'delivery-runtime', 'current.json'), 'utf8')); }
   catch (error) { if (error.code !== 'ENOENT') throw error; }
-  return { version: pkg.version, source: resolve(source), sourceDigest: await fingerprint(source, { allowMissingLock }),
+  return { version: pkg.version, source: resolve(source), sourceDigest: await fingerprint(source, { allowMissingLock, includeDependencies }),
     purposeVersion: 2, decisionPolicy: 'llm-first-hc102', stateContractVersion: 2, consistencyMonitorVersion: 1, installation };
 }
 
@@ -58,14 +66,51 @@ export async function pinnedWorkflowSource({ root, source = packageRoot } = {})
   if (resolve(current.release || '') !== expected) throw new Error('Local workflow pin points outside its immutable releases.');
   const info = await lstat(expected);
   if (!info.isDirectory() || info.isSymbolicLink()) throw new Error('Pinned workflow source must be a regular directory.');
-  const status = await localRuntimeStatus({ root, source: expected });
+  const status = await localRuntimeStatus({ root, source: expected, allowMissingLock: true, includeDependencies: current.fingerprintVersion === 2 });
   if (status.sourceDigest !== current.digest || status.version !== current.version) throw new Error('Pinned workflow runtime failed integrity verification.');
   return resolve(source) === expected ? null : expected;
 }
 
+// Only the installer-selected bundle can advance an older local pin. Never
+// adopt a checkout, downgrade a candidate, or touch task/provider state.
+export async function adoptInstalledRuntime({ root, source = packageRoot, codexHome } = {}) {
+  let selected;
+  try { selected = await realpath(join(root, 'installer/current/Contents/Resources/cli')); }
+  catch (error) { if (error.code === 'ENOENT') return { adopted: false }; throw error; }
+  if (await realpath(source) !== selected) return { adopted: false };
+  const status = await localRuntimeStatus({ root, source, allowMissingLock: true, includeDependencies: false });
+  if (!status.installation || compareVersions(status.version, status.installation.version) <= 0) return { adopted: false };
+  // Validate the existing pin before replacing it; corruption is not an upgrade.
+  await pinnedWorkflowSource({ root, source });
+  const owner = await acquireDesktopProcessLock(root);
+  try {
+  const { routeLegacyHooks } = await import('./legacy-hook-routing.js');
+  await routeLegacyHooks({ root, ...(codexHome ? { codexHome } : {}) });
+  const installation = await installLocalRuntime({ root, source, allowMissingLock: true, includeDependencies: true,
+    expectedInstallationDigest: status.installation.digest,
+    verifyBeforeActivate: async () => {
+      if (await realpath(join(root, 'installer/current/Contents/Resources/cli')) !== selected) throw new Error('Installer selection changed during runtime adoption.');
+    },
+    installDependencies: async target => {
+      // Use the packaged dependencies without network or lifecycle scripts.
+      await cp(join(source, 'node_modules'), join(target, 'node_modules'), { recursive: true, dereference: true });
+    },
+  });
+  // A locally activated candidate is a separate explicit activation contract.
+  // Retain its receipt, but prevent watchdog replay of the superseded source.
+  const activeFile = join(root, 'desktop-runtime/active.json');
+  try {
+    const active = JSON.parse(await readFile(activeFile, 'utf8'));
+    if (active.digest !== installation.digest && !active.suspendedBy) await atomicJson(activeFile, { ...active, suspendedBy: 'runtime_upgrade_requires_activation', supersededBy: installation.digest });
+  } catch (error) { if (error.code !== 'ENOENT') throw error; }
+  return { adopted: true, installation };
+  } finally { await owner.release(); }
+}
+
 // Install a frozen candidate alongside the released app, without replacing a
 // signed application, changing provider trust, or starting any registered task.
-export async function installLocalRuntime({ root, source = packageRoot,
+export async function installLocalRuntime({ root, source = packageRoot, allowMissingLock = false, includeDependencies = false,
+  expectedInstallationDigest, verifyBeforeActivate = async () => {},
   installDependencies = async target => exec(process.platform === 'win32' ? 'npm.cmd' : 'npm',
     ['ci', '--omit=dev', '--ignore-scripts', '--no-audit', '--no-fund'], { cwd: target, timeout: 120_000, maxBuffer: 1024 * 1024 }),
 } = {}) {
@@ -76,7 +121,8 @@ export async function installLocalRuntime({ root, source = packageRoot,
   await mkdir(lock); // An existing install is not silently stolen.
   const staged = join(storage, `.staged-${randomUUID()}`);
   try {
-    const before = await localRuntimeStatus({ root, source });
+    const before = await localRuntimeStatus({ root, source, allowMissingLock, includeDependencies });
+    if (expectedInstallationDigest && before.installation?.digest !== expectedInstallationDigest) throw new Error('Runtime selection changed before adoption.');
     const digest = before.sourceDigest;
     const release = join(storage, 'releases', digest);
     await mkdir(dirname(release), { recursive: true, mode: 0o700 });
@@ -88,16 +134,21 @@ export async function installLocalRuntime({ root, source = packageRoot,
     } catch (error) { if (error.code !== 'ENOENT') throw error; }
     if (!exists) {
       await mkdir(staged, { mode: 0o700 });
-      for (const input of inputs) await cp(join(source, input), join(staged, input), { recursive: true, errorOnExist: true });
-      if (await fingerprint(staged) !== digest || await fingerprint(source) !== digest) throw new Error('Runtime source changed while copying; no candidate activated.');
-      await installDependencies(staged);
-      if (await fingerprint(staged) !== digest) throw new Error('Dependency installation changed the runtime source.');
-      await atomicJson(join(staged, 'runtime-build.json'), { schema: 1, version: before.version, digest });
+      for (const input of inputs) {
+        try { await cp(join(source, input), join(staged, input), { recursive: true, errorOnExist: true }); }
+        catch (error) { if (!(allowMissingLock && input === 'package-lock.json' && error.code === 'ENOENT')) throw error; }
+      }
+      if (includeDependencies) await installDependencies(staged);
+      if (await fingerprint(staged, { allowMissingLock, includeDependencies }) !== digest || await fingerprint(source, { allowMissingLock, includeDependencies }) !== digest) throw new Error('Runtime source changed while copying; no candidate activated.');
+      if (!includeDependencies) await installDependencies(staged);
+      if (await fingerprint(staged, { allowMissingLock, includeDependencies }) !== digest) throw new Error('Dependency installation changed the runtime source.');
+      await atomicJson(join(staged, 'runtime-build.json'), { schema: 1, version: before.version, digest, fingerprintVersion: includeDependencies ? 2 : 1 });
       await rename(staged, release);
     } else {
       const saved = JSON.parse(await readFile(join(release, 'runtime-build.json'), 'utf8'));
-      if (saved.schema !== 1 || saved.digest !== digest || await fingerprint(release) !== digest) throw new Error('Existing candidate failed integrity verification.');
+      if (saved.schema !== 1 || saved.digest !== digest || await fingerprint(release, { allowMissingLock, includeDependencies }) !== digest) throw new Error('Existing candidate failed integrity verification.');
     }
+    await verifyBeforeActivate();
     const bin = join(root, 'bin');
     await mkdir(bin, { recursive: true, mode: 0o700 });
     const launcher = join(bin, 'simy-delivery');
@@ -114,7 +165,7 @@ export async function installLocalRuntime({ root, source = packageRoot,
       await writeFile(cliTemporary, `#!/bin/sh\nexec ${quote(stableHookRuntime())} ${quote(join(release, 'src/index.js'))} --no-auto-update "$@"\n`, { mode: 0o700 });
       await rename(cliTemporary, cli);
     } finally { await rm(cliTemporary, { force: true }); }
-    const current = { schema: 1, version: before.version, digest, release, launcher, cli,
+    const current = { schema: 1, version: before.version, digest, release, launcher, cli, fingerprintVersion: includeDependencies ? 2 : 1,
       previous: before.installation?.digest === digest ? before.installation.previous
         : before.installation ? { version: before.installation.version, digest: before.installation.digest, release: before.installation.release } : null };
     await atomicJson(join(storage, 'current.json'), current);

package/src/desktop-host.js

@@ -33,7 +33,7 @@ import { startAgent } from "./agent.js";
 import { createRuntimeDiagnostics, captureRuntimeOutput } from "./runtime-diagnostics.js";
 import { suspendDesktopWatchdog } from './delivery-hooks/runtime-watchdog.js';
 import { attestDesktopRuntime } from './delivery-hooks/desktop-runtime.js';
-import { pinnedWorkflowSource } from './delivery-hooks/local-runtime.js';
+import { adoptInstalledRuntime, pinnedWorkflowSource } from './delivery-hooks/local-runtime.js';
 import { applyLoginShellPath } from "./login-shell-path.js";
 import { createCliAutoUpdater, readCliPackageInfo } from "./auto-update.js";
 import { createAgentShutdown } from "./shutdown.js";
@@ -1465,6 +1465,15 @@ export function isDesktopHostEntry(entry = process.argv[1]) {
   catch { return false; }
 }
 
+function desktopStartupError(error, fallbackMessage = "SIMY could not start. Check whether another SIMY window is already running, then reconnect.") {
+  const conflict = error?.code === PROCESS_CONFLICT_CODE;
+  return {
+    type: "error",
+    ...(conflict ? { code: PROCESS_CONFLICT_CODE, conflicts: error.conflicts || [] } : {}),
+    message: conflict ? PROCESS_CONFLICT_MESSAGE : fallbackMessage,
+  };
+}
+
 export function startDesktopEntry() {
   let host;
   const stop = () => { void host?.close().finally(() => process.exit(0)); };
@@ -1475,14 +1484,7 @@ export function startDesktopEntry() {
   captureRuntimeOutput(diagnostics, { stderr: process.stderr });
   applyLoginShellPath({ diagnostics }).catch(() => {}).then(() => startDesktopHost()).then((value) => { host = value; }).catch((error) => {
     diagnostics.write(`startup failed: ${error?.stack || error}`);
-    const conflict = error?.code === PROCESS_CONFLICT_CODE;
-    process.stdout.write(`${JSON.stringify({
-      type: "error",
-      ...(conflict ? { code: PROCESS_CONFLICT_CODE, conflicts: error.conflicts || [] } : {}),
-      message: conflict
-        ? PROCESS_CONFLICT_MESSAGE
-        : "SIMY could not start. Check whether another SIMY window is already running, then reconnect.",
-    })}\n`);
+    process.stdout.write(`${JSON.stringify(desktopStartupError(error))}\n`);
     process.exitCode = 1;
   });
 }
@@ -1490,14 +1492,20 @@ export function startDesktopEntry() {
 if (isDesktopHostEntry()) {
   try {
     const root = process.env.SIMY_HOME?.trim() || join(homedir(), '.simy');
+    try { await adoptInstalledRuntime({ root }); }
+    catch (error) {
+      if (error.code === PROCESS_CONFLICT_CODE) throw error;
+      await pinnedWorkflowSource({ root }); // Only a verified previous runtime may recover.
+      process.stderr.write('SIMY runtime upgrade deferred: ' + error.message + '\n');
+    }
     const selected = await pinnedWorkflowSource({ root });
     if (selected) {
       process.env.SIMY_AUTO_UPDATE = '0';
       const selectedHost = await import(pathToFileURL(join(selected, 'src/desktop-host.js')).href);
       selectedHost.startDesktopEntry();
     } else startDesktopEntry();
-  } catch {
-    process.stdout.write(JSON.stringify({ type: 'error', message: 'Local desktop runtime integrity could not be verified. Inspect delivery runtime status; the previous task state was retained.' }) + '\n');
+  } catch (error) {
+    process.stdout.write(JSON.stringify(desktopStartupError(error, 'Local desktop runtime integrity could not be verified. Inspect delivery runtime status; the previous task state was retained.')) + '\n');
     process.exitCode = 1;
   }
 }