@ours.network/install 1.2.1-nightly.3 → 1.2.1-nightly.31

package/assets/sources.json

@@ -2,82 +2,108 @@
   "release": {
     "schema": 1,
     "channel": "nightly",
-    "installerVersion": "1.2.1-nightly.3",
+    "installerVersion": "1.2.1-nightly.31",
     "packages": {
       "@ours.network/sdk": {
-        "version": "3.8.1-nightly.3",
-        "integrity": "sha512-iUVCs+jryoeR2Ip/uHzpkJwbpoJeLDASUaE3lC+eYDj8dbI1MBwTpeOXFemUK052O6lA4ZWrhyRgE9pJU3a+Kw=="
+        "version": "3.8.1-nightly.15",
+        "integrity": "sha512-ynKaKmKtINBqYk3kNovsgEO/3TiFY1CC9FgZzrOH+H6onnM3J//Q8cBb9sun8dl9mhB4mKZYgvneSiOejYwZUw=="
       },
       "@ours.network/cli": {
-        "version": "2.8.1-nightly.1",
-        "integrity": "sha512-1Rmbqlr790FhqQW/wQ//YEL7b0Q2KVSCA2TlpjaLRkj9Xh55rOoazBJjFuW/fUpTz3Z1B3MUPK9LWiYd+A0kNA=="
+        "version": "2.8.1-nightly.13",
+        "integrity": "sha512-1BeAG12vh4ruBOeJ54l60qWUhLzPLRNKnGtRiJpQmSXkamNQglrPQeXa9xW3taAM4Vg5uYgEhsz6+ieM+1TUSA=="
       },
       "@ours.network/tg-connector": {
-        "version": "1.0.1-nightly.1",
-        "integrity": "sha512-/Do7EfINknDks3yYndOi9aLc1alxB50qk+WKv8DRuZpDB89DDMQ+DoSGQerdvsMp32nQ3LICL8TPjcdFMZfx8Q=="
+        "version": "1.0.1-nightly.9",
+        "integrity": "sha512-wm0V8c97aIg7p26L9My36I3BE9Cy2Xc5W7WgHg6Vo+hmPvE+jXmen86yA4+DxIu9VYxoVSMtpBbu76485eCeNw=="
       },
       "@ours.network/cowork": {
-        "version": "1.3.2-nightly.20260918.4d9242e",
-        "integrity": "sha512-04D2lJ97SrTrkVRRbdTZ0y+KvQdG/bpnmFFjsyUqQTij+5zEkNizTG/xhcCL8m7Mb0XvVFL8WzJ62Xgh5ahlRw=="
+        "version": "1.3.3-nightly.20261001.6d49d3a",
+        "integrity": "sha512-tqoLOWc4O8CGwLdO1j6ukm6Vn57EE0zbuxKo4BWd0QVwu9ObKgHCEMOKPgW2mXHeESXSv9m7edcIrnK8I5gD+w=="
       },
       "@ours.network/messenger-server": {
-        "version": "1.0.31-nightly.1",
-        "integrity": "sha512-XB6N+Ppd4txmI0+2ZVFMWJxXi4DtMIDlFSHOzszNM5hopFebpw1Df+KKCK4Cgd/LZUkoOOYWGEYpib9m3RbHWw=="
+        "version": "1.0.31-nightly.14",
+        "integrity": "sha512-0lMoIadihMQqN0sdW20DF4a94Nc6bx0lnaCckSnn5VqOmvqELNdG3kRZ1Heh9VwkPEu6qNM27AR7tWpTbzvJCg=="
+      },
+      "@ours.network/notifications": {
+        "version": "0.3.1-nightly.1",
+        "integrity": "sha512-rIkrtixoHqBfgCKDDCEYFl4W2Zzh0hOw3axX2+GppQ9gYkujKrk9M2KLGoYhu8RwwTMRl497jgMcTBe7UAHCgA=="
       },
       "@ours.network/fleet": {
-        "version": "1.2.0-nightly.1",
-        "integrity": "sha512-vioCobVbosmp9BgYo2XccjpPoVQd1wwV+Mt64Bm41/Vxtro2j85PUdy4AWcsY9jEFnJmj/UQfc5E5AxvlpPnrw=="
+        "version": "1.2.0-nightly.39",
+        "integrity": "sha512-ixcky/b22x2slW+NmPz2BVQVLFV+jkTFzRGFKpDLug2mugk6xIJiVyY50o8G5c+JXAjB+EN9pzIIrTH21Y48BA=="
       },
       "@ours.network/mcp": {
-        "version": "1.2.0-nightly.3",
-        "integrity": "sha512-z0N5jn1jj9iwGRqU1d3AM2RX9mCr4T/WhASEKr+Vh52yNDMzhVjFlx0U0v8aS+GTfOQaPZTfL3TGMc17ETjh3g=="
+        "version": "1.2.0-nightly.10",
+        "integrity": "sha512-59sxJOcQagNRR+43Z5ScFlqFDBIlZSMQi8iz9mpxp5Jjl38B0dmCFsv5e+srbEYrV3xaOg9ZBsT17OUABFAseQ=="
       },
       "@ours.network/codex": {
-        "version": "1.2.0-nightly.3",
-        "integrity": "sha512-dIWDqbo6hJzujegHRO6x1SsBnh5p1c6gRGj/WkPha/hcN7s/27P4jqBnJ7czQyVGiNVFZ1aAxj4c9+CDLzHENw=="
+        "version": "1.2.0-nightly.10",
+        "integrity": "sha512-7hV4R0w8tiQ/JKFU5MxtM7fihd33tzWDgT+Bn8cidasxI5zmTLqDEIv6om5LM/xk7UqcPw5gDN2kcJYiybnP9Q=="
       },
       "@ours.network/claude-code": {
-        "version": "1.2.0-nightly.3",
-        "integrity": "sha512-7ta6KnvoHB2i/yoaykhXvzKFQTIOPtDHeTzG1PRwHjdTJ4vcGEh4jWYMd2c1jjj73lC3q9qW3LYSRutIJovtQg=="
+        "version": "1.2.0-nightly.10",
+        "integrity": "sha512-C3+H/vXespanVj9E1uQAWno9RFrI5KlK2SHSc7dnmRRuFVyRsoVcbvlpVI3nZ8snFaKVzbetebZr7vxd73AWSg=="
+      },
+      "@ours.network/daemon": {
+        "version": "3.8.1-nightly.7",
+        "integrity": "sha512-dDFDm+xERplzu4yXKvLjKGNaIdr9u4ku5/4jiI4g8do3qOX9VS0tF1+O67uSu4jqkypg860UdZRdn9Zce72H/A=="
+      }
+    },
+    "hostCli": {
+      "@ours.network/sdk": {
+        "version": "3.8.1-nightly.15",
+        "integrity": "sha512-ynKaKmKtINBqYk3kNovsgEO/3TiFY1CC9FgZzrOH+H6onnM3J//Q8cBb9sun8dl9mhB4mKZYgvneSiOejYwZUw=="
+      },
+      "@ours.network/cli": {
+        "version": "2.8.1-nightly.13",
+        "integrity": "sha512-1BeAG12vh4ruBOeJ54l60qWUhLzPLRNKnGtRiJpQmSXkamNQglrPQeXa9xW3taAM4Vg5uYgEhsz6+ieM+1TUSA=="
       }
     }
   },
   "packages": {
     "@ours.network/sdk": {
       "type": "npm",
-      "version": "3.8.1-nightly.3"
+      "version": "3.8.1-nightly.15"
     },
     "@ours.network/cli": {
       "type": "npm",
-      "version": "2.8.1-nightly.1"
+      "version": "2.8.1-nightly.13"
     },
     "@ours.network/tg-connector": {
       "type": "npm",
-      "version": "1.0.1-nightly.1"
+      "version": "1.0.1-nightly.9"
     },
     "@ours.network/cowork": {
       "type": "npm",
-      "version": "1.3.2-nightly.20260918.4d9242e"
+      "version": "1.3.3-nightly.20261001.6d49d3a"
     },
     "@ours.network/messenger-server": {
       "type": "npm",
-      "version": "1.0.31-nightly.1"
+      "version": "1.0.31-nightly.14"
+    },
+    "@ours.network/notifications": {
+      "type": "npm",
+      "version": "0.3.1-nightly.1"
     },
     "@ours.network/fleet": {
       "type": "npm",
-      "version": "1.2.0-nightly.1"
+      "version": "1.2.0-nightly.39"
     },
     "@ours.network/mcp": {
       "type": "npm",
-      "version": "1.2.0-nightly.3"
+      "version": "1.2.0-nightly.10"
     },
     "@ours.network/codex": {
       "type": "npm",
-      "version": "1.2.0-nightly.3"
+      "version": "1.2.0-nightly.10"
     },
     "@ours.network/claude-code": {
       "type": "npm",
-      "version": "1.2.0-nightly.3"
+      "version": "1.2.0-nightly.10"
+    },
+    "@ours.network/daemon": {
+      "type": "npm",
+      "version": "3.8.1-nightly.7"
     }
   }
 }

package/install.mjs

@@ -3,6 +3,8 @@
 import { readFileSync } from 'node:fs';
 
 import { realEffects } from './lib/effects.mjs';
+import { installerFailure } from './lib/diagnostics.mjs';
+import { runWorkspaceSetup } from './lib/workspace-setup.mjs';
 import { runSetup } from './lib/setup.mjs';
 import { closeSync, makeWriter, openTty } from './lib/ui.mjs';
 
@@ -10,7 +12,10 @@ const version = JSON.parse(readFileSync(new URL('./package.json', import.meta.ur
 const ttyFd = openTty();
 
 try {
-  const code = await runSetup(process.argv.slice(2), realEffects({
+  const args=process.argv.slice(2);
+  const workspace=args.some(v=>v==='--setup-workspace' || v.startsWith('--setup-workspace=') || v==='--setup-workspace-file' || v.startsWith('--setup-workspace-file='));
+  const execute=workspace ? (args,effects)=>runWorkspaceSetup(args,effects,runSetup) : runSetup;
+  const code = await execute(args, realEffects({
     write: makeWriter(ttyFd),
     ttyFd,
     env: process.env,
@@ -18,7 +23,7 @@ try {
   }));
   process.exitCode = code;
 } catch (error) {
-  process.stderr.write(`ours-install: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.stderr.write(`ours-install: ${installerFailure(error)}\n`);
   process.exitCode = 1;
 } finally {
   if (ttyFd != null) {

package/lib/build-transition.mjs

@@ -52,7 +52,10 @@ export async function serverBuildTransition(record, args, effects) {
     save(transition);
   }
   await stage('Verify retained state and identities', () => effects.validateServerBuildState(record));
+  // Repeatable: an updated runtime may need volume state it introduced, such as notification credentials.
+  if (record.gateway) await stage('Prepare stored state for the updated runtime', () => effects.prepareServerVolumes(record));
   await stage('Restore previously running services and check readiness', () => effects.serverLifecycle(record, 'start', runningServices));
+  if (record.gateway && ['daemon', 'cowork', 'gateway'].every(name => runningServices.includes(name))) await stage('Verify authenticated gateway management', () => effects.verifyGateway(record));
   const completed = { ...record, sourcePolicyHash: candidate.sourcePolicyHash };
   delete completed.buildTransition;
   effects.writeJson(path, JSON.stringify(completed, null, 2) + '\n');

package/lib/client-cli.mjs

@@ -0,0 +1,127 @@
+import { lstatSync, readFileSync, writeFileSync, realpathSync, unlinkSync, chmodSync, symlinkSync, renameSync, mkdirSync } from 'node:fs';
+import { join, resolve, isAbsolute, dirname } from 'node:path';
+import { createHash, randomUUID } from 'node:crypto';
+import { buildManagedCli } from './managed-cli.mjs';
+
+import { createRequire } from 'node:module';
+import { releaseBinding, verifyReleaseGraph } from '../assets/scripts/maintenance/release-graph.mjs';
+
+const marker = '// ours-managed-cli-v1 ';
+const hash = bytes => createHash('sha256').update(bytes).digest('hex');
+function stat(path) {
+  try { return lstatSync(path); } catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+}
+function privateAcquisition(home, root) {
+  for (const path of [join(home, '.ours-client-install'), root]) {
+    const value = lstatSync(path);
+    if (!value.isDirectory() || value.uid !== process.getuid() || (value.mode & 0o077) || realpathSync(path) !== path) throw new Error('Unsafe private CLI directory');
+  }
+}
+/** Publish the native client, retaining a verified migration launcher for rollback. */
+export async function publishClientCli(effects, packagePath, { policy = {}, isolated = false } = {}) {
+  const prefix = (await effects.run('npm', ['prefix', '--global'])).stdout.trim();
+  if (!isAbsolute(prefix) || resolve(prefix) !== prefix) throw new Error('npm global prefix must be an absolute normalized path');
+  const entry = join(prefix, 'bin', 'ours');
+  const before = stat(entry);
+  let previous;
+  if (before) {
+    if (before.uid !== process.getuid()) throw new Error('Refusing to replace a CLI owned by another user');
+    if (before.isSymbolicLink()) {
+      const resolved = realpathSync(entry);
+      const privateBase = join(effects.home, '.ours-client-install') + '/';
+      if (resolved.startsWith(privateBase)) {
+        const packageRoot = dirname(dirname(resolved));
+        const acquisitionRoot = dirname(dirname(dirname(packageRoot)));
+        privateAcquisition(effects.home, acquisitionRoot);
+        const retained = JSON.parse(readFileSync(join(acquisitionRoot, 'sources.json')));
+        const binding = releaseBinding(retained);
+        if (binding && binding.scope !== 'host-cli') throw new Error('Unrecognized private CLI entry');
+        verifyReleaseGraph(acquisitionRoot, retained);
+        if (!binding) {
+          // Development selections publish through npm's global package entry.
+          // Require that exact retained selection and global target on retry;
+          // integrity-bound private host CLI releases keep their stricter path.
+          const npmRoot = (await effects.run('npm', ['root', '--global'])).stdout.trim();
+          const selected = retained.packages?.['@ours.network/cli'];
+          const pkg = JSON.parse(readFileSync(join(packageRoot, 'package.json')));
+          if (!isAbsolute(npmRoot) || realpathSync(join(npmRoot, '@ours.network/cli')) !== packageRoot || selected?.type !== 'npm' || selected.version !== pkg.version) throw new Error('Unrecognized private CLI entry');
+        }
+        const pkg = JSON.parse(readFileSync(join(packageRoot, 'package.json')));
+        if (pkg.name !== '@ours.network/cli' || resolve(packageRoot, pkg.bin?.ours ?? '') !== resolved) throw new Error('Unrecognized private CLI target');
+      } else {
+        const npmRoot = (await effects.run('npm', ['root', '--global'])).stdout.trim();
+        if (!isAbsolute(npmRoot)) throw new Error('Invalid npm global package root');
+        const root = realpathSync(join(npmRoot, '@ours.network/cli'));
+        const manifest = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
+        if (manifest.name !== '@ours.network/cli' || typeof manifest.bin?.ours !== 'string' || resolved !== realpathSync(resolve(root, manifest.bin.ours))) throw new Error('Refusing to replace an unrelated ours symlink');
+      }
+    } else {
+      if (!before.isFile() || before.nlink !== 1 || (before.mode & 0o022)) throw new Error('Refusing to replace an unsafe CLI entry');
+      previous = readFileSync(entry);
+      const line = previous.toString().split('\n')[1];
+      if (!line?.startsWith(marker)) throw new Error('Refusing to replace an unknown ours executable');
+      const binding = JSON.parse(line.slice(marker.length));
+      if (binding.schema !== 1 || previous.toString() !== buildManagedCli(binding.recordPath, binding.installerPath)) throw new Error('Managed CLI launcher was modified; no replacement performed');
+      const backup = join(effects.home, '.ours-client', `previous-cli-${hash(previous)}.cjs`);
+      const backupDir = lstatSync(join(effects.home, '.ours-client'));
+      if (!backupDir.isDirectory() || backupDir.uid !== process.getuid() || (backupDir.mode & 0o7777) !== 0o700) throw new Error('Managed CLI backup requires a private owned directory');
+      const saved = stat(backup);
+      if (!saved) writeFileSync(backup, previous, { mode: 0o600, flag: 'wx' });
+      else if (!saved.isFile() || saved.nlink !== 1 || saved.uid !== process.getuid() || (saved.mode & 0o7777) !== 0o600 || saved.size !== previous.length || !readFileSync(backup).equals(previous)) throw new Error('Managed CLI backup is unsafe or differs');
+      const current = lstatSync(entry);
+      if (current.dev !== before.dev || current.ino !== before.ino || !readFileSync(entry).equals(previous)) throw new Error('CLI changed during publication');
+      if (!isolated) unlinkSync(entry);
+      effects.out(`Previous managed CLI saved at ${backup}; server maintenance remains available through ours-install server.`);
+    }
+  }
+  if (isolated) {
+    const root = dirname(dirname(dirname(packagePath)));
+    if (!realpathSync(root).startsWith(join(effects.home, '.ours-client-install') + '/') || releaseBinding(policy)?.scope !== 'host-cli') throw new Error('Invalid private CLI acquisition');
+    privateAcquisition(effects.home, root);
+    verifyReleaseGraph(root, policy);
+    const selected = JSON.parse(readFileSync(join(packagePath, 'package.json')));
+    const target = realpathSync(resolve(packagePath, selected.bin.ours));
+    if (!target.startsWith(realpathSync(packagePath) + '/')) throw new Error('CLI entry escapes selected package');
+    const sdkEntry = realpathSync(createRequire(target).resolve('@ours.network/sdk'));
+    if (!sdkEntry.startsWith(root + '/')) throw new Error('Private CLI SDK escaped verified acquisition');
+    const sdk = JSON.parse(readFileSync(join(dirname(dirname(sdkEntry)), 'package.json')));
+    if (sdk.name !== '@ours.network/sdk' || sdk.version !== policy.release.packages['@ours.network/sdk'].version) throw new Error('Private CLI SDK differs from selection');
+    mkdirSync(dirname(entry), { recursive: true });
+    const binDir = lstatSync(dirname(entry));
+    if (!binDir.isDirectory() || binDir.uid !== process.getuid() || (binDir.mode & 0o022)) throw new Error(`CLI bin directory ${dirname(entry)} must be owned by you and not writable by group or others; run chmod go-w on it, or point npm's global prefix at a directory you own`);
+    const current = stat(entry);
+    if (before ? !current || current.dev !== before.dev || current.ino !== before.ino : current) throw new Error('CLI entry changed during publication');
+    const staged = entry + '.' + randomUUID();
+    try {
+      symlinkSync(target, staged);
+      renameSync(staged, entry);
+    } catch (error) {
+      if (stat(staged)) unlinkSync(staged);
+      if (previous && !stat(entry)) writeFileSync(entry, previous, { mode: before.mode & 0o777, flag: 'wx' });
+      throw error;
+    }
+    if (realpathSync(entry) !== target) throw new Error('Private CLI entry changed during publication');
+    verifyReleaseGraph(root, policy);
+    return entry;
+  }
+  try {
+    await effects.run('npm', ['install', '--global', '--install-links=false', '--offline', '--ignore-scripts', '--no-audit', '--no-fund', packagePath]);
+  } catch (error) {
+    if (previous && !stat(entry)) {
+      writeFileSync(entry, previous, { mode: before.mode & 0o777, flag: 'wx' });
+      chmodSync(entry, before.mode & 0o777);
+    }
+    throw error;
+  }
+  const published = stat(entry);
+  if (!published?.isSymbolicLink() || published.uid !== process.getuid()) throw new Error('CLI publication did not create the expected owned npm entry');
+  const npmRoot = (await effects.run('npm', ['root', '--global'])).stdout.trim();
+  if (!isAbsolute(npmRoot) || resolve(npmRoot) !== npmRoot) throw new Error('Invalid npm global package root');
+  const root = realpathSync(join(npmRoot, '@ours.network/cli'));
+  const manifest = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
+  const selected = JSON.parse(readFileSync(join(packagePath, 'package.json'), 'utf8'));
+  const target = typeof manifest.bin?.ours === 'string' ? resolve(root, manifest.bin.ours) : '';
+  if (manifest.name !== '@ours.network/cli' || manifest.version !== selected.version || !target.startsWith(root + '/') || realpathSync(entry) !== realpathSync(target) || !stat(target)?.isFile()) throw new Error('Published CLI does not match the selected package');
+  if (!readFileSync(target).equals(readFileSync(resolve(packagePath, selected.bin.ours)))) throw new Error('Published CLI entry differs from the selected artifact');
+  return entry;
+}

package/lib/container-engine.mjs

@@ -0,0 +1,127 @@
+import { createHash } from 'node:crypto';
+import { isAbsolute, resolve } from 'node:path';
+
+export const engineName = record => record.containerEngine === undefined ? 'docker' : record.containerEngine;
+const path = value => typeof value === 'string' && isAbsolute(value) && resolve(value) === value && !/[\x00-\x1f]/.test(value);
+export function validateContainerEngine(record) {
+  const engine = engineName(record);
+  if (!['docker', 'podman'].includes(engine) || (record.mode !== 'docker' && (record.containerEngine !== undefined || record.containerBinding !== undefined))) throw new Error('Invalid container engine selection');
+  const b = record.containerBinding;
+  if (engine === 'docker') {
+    if (b !== undefined) throw new Error('Unexpected Docker backend binding');
+    return;
+  }
+  if (!b || b.version !== 1 || !Number.isInteger(b.uid) || b.uid <= 0 || !path(b.graphRoot) || !path(b.runRoot)
+    || !/^[a-f0-9]{64}$/.test(b.namespaceDigest ?? '') || !path(b.socket) || !path(b.provider) || typeof b.driver !== 'string' || !/^[a-z0-9]+$/.test(b.driver)
+    || Object.keys(b).some(k => !['version', 'uid', 'graphRoot', 'runRoot', 'socket', 'provider', 'driver', 'namespaceDigest'].includes(k))) throw new Error('Invalid rootless Podman backend binding');
+}
+function podmanEnvironment(record, env, uid) {
+  validateContainerEngine(record);
+  const b = record.containerBinding;
+  if (uid !== b.uid) throw new Error('Podman installation belongs to another rootless owner');
+  for (const key of ['CONTAINER_HOST', 'CONTAINER_CONNECTION', 'CONTAINERS_STORAGE_CONF', 'CONTAINERS_CONF', 'PODMAN_USERNS', 'STORAGE_DRIVER', 'STORAGE_OPTS']) {
+    if (env[key]) throw new Error(`${key} conflicts with the retained local Podman backend`);
+  }
+  if ((env.OURS_PODMAN_SOCKET && env.OURS_PODMAN_SOCKET !== b.socket) || env.DOCKER_CONTEXT || (env.DOCKER_HOST && env.DOCKER_HOST !== `unix://${b.socket}`)
+    || (env.PODMAN_COMPOSE_PROVIDER && env.PODMAN_COMPOSE_PROVIDER !== b.provider)) throw new Error('Environment conflicts with the retained Podman backend/provider');
+  return { DOCKER_CONTEXT: undefined, DOCKER_HOST: `unix://${b.socket}`, PODMAN_COMPOSE_PROVIDER: b.provider, PODMAN_COMPOSE_WARNING_LOGS: 'false' };
+}
+/** The only container command boundary. Legacy records keep their Docker path. */
+export async function runContainer(effects, record, args, options = {}) {
+  if (engineName(record) === 'docker') return effects.run('docker', args, options);
+  const env = { ...(effects.env ?? {}), ...(options.env ?? {}) };
+  const selected = podmanEnvironment(record, env, process.getuid?.());
+  const b = record.containerBinding;
+  if (args[0] === 'build' && !args.some(arg => arg === '--format' || arg.startsWith('--format='))) args = ['build', '--format', 'docker', ...args.slice(1)];
+  // Docker reports a missing object as 1; Podman inspect uses 125. Probe exact
+  // existence separately so transport/permission failures are never absence.
+  if (['image', 'volume'].includes(args[0]) && args[1] === 'inspect' && options.allowCodes?.includes(1)) {
+    const found = await runContainer(effects, record, [args[0], 'exists', args.at(-1)], { ...options, allowCodes: [1] });
+    if (found.code === 1) return { code: 1, stdout: '', ok: false };
+  }
+  // Native commands and the Compose provider must address the SAME local store.
+  const prefix = args[0] === 'compose' ? ['--remote', '--url', `unix://${b.socket}`] : ['--remote=false', '--root', b.graphRoot, '--runroot', b.runRoot, '--storage-driver', b.driver];
+  const result = await effects.run('podman', [...prefix, ...args],
+    { ...options, env: { ...options.env, ...selected } });
+  if (args[0] === 'image' && args[1] === 'inspect' && !args.includes('--format') && result.code === 0) {
+    const images = JSON.parse(result.stdout);
+    for (const value of images) if (/^[a-f0-9]{64}$/.test(value.Id)) value.Id = `sha256:${value.Id}`;
+    return { ...result, stdout: JSON.stringify(images) };
+  }
+  return result;
+}
+export function namespaceDigest(info) {
+  const maps = info.host?.idMappings;
+  const normalized = ['uidmap', 'gidmap'].map(key => {
+    const rows = maps?.[key];
+    if (!Array.isArray(rows) || !rows.length) throw new Error('Podman user namespace mappings are unavailable');
+    return rows.map(row => {
+      const values = [row.container_id, row.host_id, row.size];
+      if (values.some(value => !Number.isInteger(value) || value < 0) || row.size < 1) throw new Error('Invalid Podman namespace mapping');
+      return values;
+    }).sort((a, b) => a[0] - b[0]);
+  });
+  return createHash('sha256').update(JSON.stringify(normalized)).digest('hex');
+}
+export async function bindPodman(effects, record) {
+  if (effects.platform.platform !== 'linux' || process.getuid?.() === 0) throw new Error('Podman server installation requires a non-root Linux user');
+  const env = effects.env ?? {};
+  const provider = record.containerBinding?.provider ?? env.PODMAN_COMPOSE_PROVIDER;
+  if (!path(provider)) throw new Error('Set PODMAN_COMPOSE_PROVIDER to an absolute standalone Docker Compose executable path');
+  // Reject ambient redirection before even probing an unbound store.
+  for (const key of ['CONTAINER_HOST', 'CONTAINER_CONNECTION', 'CONTAINERS_STORAGE_CONF', 'CONTAINERS_CONF', 'PODMAN_USERNS', 'STORAGE_DRIVER', 'STORAGE_OPTS', 'DOCKER_CONTEXT']) {
+    if (env[key]) throw new Error(`${key} conflicts with local rootless Podman`);
+  }
+  const info = JSON.parse((await effects.run('podman', ['--remote=false', 'info', '--format', 'json'])).stdout);
+  if (info.host?.security?.rootless !== true) throw new Error('Podman must report rootless=true');
+  const socket = record.containerBinding?.socket ?? env.OURS_PODMAN_SOCKET ?? info.host.remoteSocket?.path;
+  const observed = { version: 1, uid: process.getuid(), graphRoot: info.store?.graphRoot, runRoot: info.store?.runRoot, driver: info.store?.graphDriverName, socket, provider, namespaceDigest: namespaceDigest(info) };
+  validateContainerEngine({ ...record, containerBinding: observed });
+  if (record.containerBinding && Object.keys(observed).some(k => observed[k] !== record.containerBinding[k])) throw new Error('Podman backend differs from retained installation');
+  podmanEnvironment({ ...record, containerBinding: observed }, env, process.getuid());
+  const api = JSON.parse((await effects.run('podman', ['--remote', '--url', `unix://${socket}`, 'info', '--format', 'json'])).stdout);
+  if (api.host?.security?.rootless !== true || api.store?.graphRoot !== observed.graphRoot || api.store?.runRoot !== observed.runRoot || api.store?.graphDriverName !== observed.driver || namespaceDigest(api) !== observed.namespaceDigest) throw new Error('Podman socket does not address the selected rootless storage; enable the user podman.socket');
+  const version = (await effects.run(provider, ['version', '--short'])).stdout.trim();
+  const match = /^v?(\d+)\.(\d+)\./.exec(version);
+  if (!match || +match[1] < 2 || (+match[1] === 2 && +match[2] < 35)) throw new Error('Standalone Docker Compose 2.35+ is required');
+  record.containerBinding = observed;
+}
+
+/** Resolve Compose rather than maintaining a second, drifting build definition. */
+export function nativeBuildCommands(config, services, env = {}) {
+  const commands = [], seen = new Set();
+  for (const name of services) {
+    const service = config.services?.[name], build = service?.build;
+    if (!build || typeof build !== 'object' || !path(build.context) || !service.image) throw new Error(`Missing resolved build definition for ${name}`);
+    const supported = ['context', 'dockerfile', 'target', 'args', 'secrets', 'cache_from', 'cache_to', 'platforms', 'labels', 'no_cache', 'pull'];
+    if (Object.keys(build).some(k => !supported.includes(k))) throw new Error(`Unsupported Podman build option for ${name}`);
+    const args = ['build', '--format', 'docker', '--layers', '--file', resolve(build.context, build.dockerfile ?? 'Dockerfile'), '--tag', service.image];
+    if (build.target) args.push('--target', build.target);
+    const platforms = build.platforms ?? (service.platform ? [service.platform] : []);
+    if (platforms.length > 1) throw new Error('Multi-platform Podman builds are not supported');
+    if (platforms.length) args.push('--platform', platforms[0]);
+    for (const [key, value] of Object.entries(build.args ?? {})) {
+      if (value === null) throw new Error(`Unresolved build argument: ${key}`);
+      args.push('--build-arg', `${key}=${value}`);
+    }
+    for (const [key, value] of Object.entries(build.labels ?? {})) args.push('--label', `${key}=${value}`);
+    for (const key of ['cache_from', 'cache_to']) for (const value of build[key] ?? []) args.push('--' + key.replace('_', '-'), value);
+    if (build.no_cache) args.push('--no-cache');
+    if (build.pull) args.push('--pull=always');
+    for (const secret of build.secrets ?? []) {
+      const source = typeof secret === 'string' ? secret : secret.source;
+      const id = typeof secret === 'string' ? source : secret.target ?? source;
+      const definition = config.secrets?.[source];
+      if (!/^[A-Za-z0-9_-]+$/.test(id)) throw new Error('Invalid build secret ID');
+      if (definition?.environment) {
+        // Native local Podman supports type=env; values never enter argv/files.
+        if (env[definition.environment]) args.push('--secret', `id=${id},type=env,env=${definition.environment}`);
+      } else if (definition?.file && path(definition.file)) args.push('--secret', `id=${id},src=${definition.file}`);
+      else throw new Error(`Unsupported build secret: ${source}`);
+    }
+    args.push(build.context);
+    const key = JSON.stringify(args);
+    if (!seen.has(key)) { seen.add(key); commands.push(args); }
+  }
+  return commands;
+}

package/lib/diagnostics.mjs

@@ -0,0 +1 @@
+export { redactDiagnostic, commandFailure, installerFailure } from '../assets/scripts/runtime/diagnostics.mjs';

package/lib/docker-conversion-runtime.mjs

@@ -1,3 +1,4 @@
+import { runContainer } from './container-engine.mjs';
 import * as fs from 'node:fs';
 import { join } from 'node:path';
 import { randomUUID } from 'node:crypto';
@@ -33,7 +34,7 @@ ENTRYPOINT ["node", "/opt/ours/docker/state-operation.mjs"]
 `);
     // Build maintenance first: both targets inherit the same retained runtime.
     for (const target of ['maintenance', 'runtime']) {
-      await effects.run('docker', ['build', '--platform', 'linux/amd64', '--target', target,
+      await runContainer(effects, record, ['build', '--platform', 'linux/amd64', '--target', target,
         '--tag', `${record.project}:${target}`, context]);
     }
     atomicWriteConfig(compose, fs.readFileSync(join(assets, 'docker-compose.yaml')));
@@ -82,7 +83,7 @@ export async function runDockerConversion(record, selected, operation, label, ef
   const path = join(record.root, `.conversion-compose-${randomUUID()}.json`);
   try {
     fs.writeFileSync(path, JSON.stringify(definition), { mode: 0o600, flag: 'wx' });
-    const result = await effects.run('docker', ['compose', '--file', path, '--project-name', record.project,
+    const result = await runContainer(effects, record, ['compose', '--file', path, '--project-name', record.project,
       'run', '--rm', '--no-deps', '-T', 'state-operation', operation, ...(label ? [label] : [])]);
     if (operation === 'cleanup') {
       const summary = JSON.parse(result.stdout);

package/lib/docker-layout-installation.mjs

@@ -1,3 +1,4 @@
+import { runContainer } from './container-engine.mjs';
 import * as fs from 'node:fs';
 import { join, basename } from 'node:path';
 import { randomUUID } from 'node:crypto';
@@ -46,7 +47,7 @@ export async function convertDockerInstallation(record, operation, effects) {
   await effects.serverLifecycle(record, 'start', running);
   const cleanup = await effects.runDockerConversion(record, volumes, 'cleanup');
   if (cleanup.emptyVolumes.length) {
-    await effects.run('docker', ['volume', 'rm', ...cleanup.emptyVolumes.map(alias => volumes.sources[alias])]);
+    await runContainer(effects, record, ['volume', 'rm', ...cleanup.emptyVolumes.map(alias => volumes.sources[alias])]);
   }
   try {
     const stat = fs.lstatSync(source.configPath);