software-defence-factory 0.3.2 → 0.3.4

package/bin/software-defence-factory.mjs

@@ -46,13 +46,25 @@ function init(repo, agent='codex', check='', port=7331) {
   console.log(`Configured ${state}\nApp files were not changed. Only committed code is cloned into jobs.`);
 }
 
+function retainImage(reference) {
+  let image;
+  try { image=run('docker',['image','inspect','--format','{{.Id}}',reference]); }
+  catch(error) { if(/No such image|No such object/.test(error.message))return null;throw error; }
+  if(!/^sha256:[a-f0-9]{64}$/.test(image))throw new Error('Docker returned an unexpected image identity');
+  // Containerd can drop an untagged manifest when the shared build tag moves.
+  // Keep the exact object reachable; existing installations retain their pins.
+  run('docker',['tag',image,`software-defence-factory-retained:${image.slice(7)}`]);
+  return image;
+}
 async function install() {
   const config=configAt(state);
   if(existsSync(join(state,'supervisor.json'))&&alive(json(join(state,'supervisor.json')).pid))throw new Error('Stop the factory before installing or updating its runtime');
   if (!['darwin','linux'].includes(process.platform)||!['arm64','x64'].includes(process.arch)) throw new Error('Use macOS/Linux arm64/amd64, or WSL2');
   run('docker',['info','--format','{{.ServerVersion}}']);
+  retainImage(config.image);retainImage(PINS.jobImage);
   await stream('docker',['build','-t',PINS.jobImage,join(ROOT,'factory/image')]);
-  config.image=run('docker',['image','inspect','--format','{{.Id}}',PINS.jobImage]);
+  config.image=retainImage(PINS.jobImage);
+  if(!config.image)throw new Error('Built job image is unavailable');
   save(join(state,'factory.json'),config);save(join(state,'engine.json'),{runtime:'native-node',version:VERSION,image:config.image});
   console.log('Installed. Job image is pinned to its local image ID. No model call made.');
 }

package/docs/npm.md

@@ -60,7 +60,11 @@ Source checkouts remain managed by Git and do not update themselves.
 
 CLI updates do not rebuild or update Docker images automatically. Stop the
 installation and run `install --state PATH` when intentionally adopting a new
-runtime image; repeat the relevant qualification before resuming jobs.
+runtime image; repeat the relevant qualification before resuming jobs. Install retains the old and new
+image IDs under `software-defence-factory-retained` tags, so another installation
+rebuilding the shared tag cannot remove an existing installation's pinned image.
+These retained images are recovery data; remove them only after confirming no
+installation or retained attempt needs them.
 
 ## Release flow
 

package/docs/quickstart.md

@@ -26,6 +26,8 @@ software-defence-factory install --state /private/state/my-app
 software-defence-factory doctor --state /private/state/my-app
 ```
 
+Verification commands receive `FACTORY_BASE_REVISION`, the resolved commit recorded as the candidate base. Diff-based checks should compare against this revision; the isolated checkout has no origin remote. The value comes from protected controller metadata, not the task text.
+
 Replace the check with the application's actual verification command. `init` does not edit the app, copy global skills or start work. It creates factory.json, worker.token and model.env with private permissions. Each installation has one repository and a distinct state path/port. `--agent pi` selects Pi; `--agent custom --command-json '["executable","argument"]'` selects an available command in the job image. The bundled image provides Node, Git, Codex and Pi. Other toolchains require an intentionally built compatible image; do not claim Rust/mobile/browser capabilities from this image alone.
 
 Configure inference credentials in the private model.env file. Do not copy the operator's entire account environment or authentication folders. Codex uses its supported API credential environment; Pi uses the selected provider's configuration. Use `--model` with init for a specific model. Task-level model overrides are supported only for Codex/Pi and do not prove that the provider serves that model.

package/factory/executor.mjs

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync, lstatSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync, lstatSync, chmodSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { spawn } from 'node:child_process';
 import { ROOT, configAt, run, save, json, digest, instanceLabel, stopContainers } from './lib.mjs';
@@ -44,6 +44,15 @@ function safeRead(path) {
   if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 1024 * 1024) throw new Error('Expected a regular report under 1 MiB');
   return readFileSync(path, 'utf8');
 }
+// Called only after the container has stopped. Builds may leave read-only cache
+// directories; make owned directories traversable without following symlinks.
+function removeScratch(path) {
+  if (lstatSync(path).isDirectory()) {
+    chmodSync(path, 0o700);
+    for (const name of readdirSync(path)) removeScratch(join(path, name));
+  }
+  rmSync(path, { recursive: true, force: true });
+}
 async function container(mode, input, command, writable = false, credentials = false) {
   const name = `sdf-${instanceLabel(state)}-${attempt}-${mode}`;
   const reportDir = join(folder, attempt, mode);
@@ -64,6 +73,7 @@ async function container(mode, input, command, writable = false, credentials = f
     '--mount',`type=bind,source=${join(ROOT,'kit')},target=/factory-policy,readonly`,
     '--mount',`type=bind,source=${join(ROOT,'.agents/skills')},target=/factory-skills,readonly`];
   if (scratch) args.push('--mount',`type=bind,source=${scratch},target=/scratch`);
+  if (mode === 'verify') args.push('--env',`FACTORY_BASE_REVISION=${git('rev-parse',`${metadata().base}^{commit}`)}`);
   if (credentials) args.push('--env-file', join(state,'model.env'));
   args.push('-i',config.image,'timeout','--signal=KILL',`${config.timeoutSeconds}s`,'sh','-c','mkdir -p "$HOME" && exec "$@"','factory',...command);
   console.log(JSON.stringify({ phase: mode, event: 'started', synthetic: config.agent === 'mock' }));
@@ -84,8 +94,10 @@ async function container(mode, input, command, writable = false, credentials = f
     const probe = run('docker',['ps','-aq','--filter',`name=^/${name}$`]);
     if (probe) throw error;
   }
-  if (scratch) rmSync(scratch, { recursive: true, force: true });
-  if (code !== 0) throw new Error(`${mode} exited ${code}; private log: ${logPath}`);
+  let cleanupError;
+  try { if (scratch) removeScratch(scratch); } catch (error) { cleanupError = error; }
+  if (code !== 0) throw new Error(`${mode} exited ${code}; private log: ${logPath}${cleanupError ? `; scratch cleanup requires recovery: ${cleanupError.message}` : ''}`);
+  if (cleanupError) throw cleanupError;
   return reportDir;
 }
 function brief(instruction) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "software-defence-factory",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Scoped software delivery and defence investigations with isolated jobs, evidence and review",
   "type": "module",
   "license": "MIT",

package/scripts/probe-platform.mjs

@@ -2,7 +2,7 @@
 import assert from 'node:assert/strict';
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
 import { resolve, join } from 'node:path';
-import { api, configAt, save, json, containers, sleep, stream, ROOT } from '../factory/lib.mjs';
+import { api, configAt, save, json, containers, sleep, stream, run, ROOT } from '../factory/lib.mjs';
 import { admitIncident } from '../factory/incident.mjs';
 
 const state=resolve(process.argv[2] || '.factory/demo-platform'),original=configAt(state);
@@ -36,6 +36,9 @@ try {
   const native=await work('Synthetic disk-backed build verification');
   const checking=await until(()=>containers(state).find(c=>c.Config.Labels['sdf.job']===native.id&&c.State.Running&&c.Config.Env.includes('FACTORY_PHASE=verify')));
   assert.equal(checking.HostConfig.NanoCpus,4000000000);assert.equal(checking.HostConfig.PidsLimit,1024);
+  const nativeCandidate=json(join(state,'jobs',native.id,'candidate.json'));
+  assert.notEqual(nativeCandidate.base,nativeCandidate.head);
+  assert(checking.Config.Env.includes(`FACTORY_BASE_REVISION=${nativeCandidate.base}`));
   assert(checking.Mounts.some(m=>m.Destination==='/scratch'&&m.RW));
   assert(checking.Mounts.some(m=>m.Destination==='/workspace'&&!m.RW));
   await waitState(native.id,'awaiting_approval');
@@ -43,7 +46,21 @@ try {
   assert(!existsSync(join(state,'jobs',native.id,verification.id,'check-workspace')));
   assert(!existsSync(join(state,'jobs',native.id,'checkout/large-build-fixture')));
   await cli('approve',native.id);await waitState(native.id,'succeeded');setConfig({});
-  record('native build scratch exceeds 1 GiB without changing the candidate; limits and cleanup verified');
+  record('native build scratch exceeds 1 GiB; immutable base, read-only candidate, limits and cleanup verified');
+
+  for (const exitCode of [0, 17]) {
+    setConfig({check:`mkdir -p cache/nested && echo cache > cache/nested/value && ln -s /workspace cache/candidate && chmod 000 cache/nested cache && exit ${exitCode}`});
+    const readonly=await work(`Synthetic read-only cache cleanup, exit ${exitCode}`);
+    await waitState(readonly.id,exitCode===0?'awaiting_approval':'failed');
+    const run=(await snapshot(readonly.id)).runs.find(r=>r.command==='verify');
+    assert(!existsSync(join(state,'jobs',readonly.id,run.id,'check-workspace')));
+    assert.equal(readFileSync(join(state,'jobs',readonly.id,'checkout/value.txt'),'utf8'),'fixed\n');
+    assert.equal(readFileSync(join(original.repo,'value.txt'),'utf8'),'broken\n');
+    if(exitCode===0){await cli('approve',readonly.id);await waitState(readonly.id,'succeeded');}
+    else assert.match(run.error,/verify exited 17/);
+    record(`read-only cache cleanup after exit ${exitCode}; candidate symlink not followed and exit preserved`);
+  }
+  setConfig({});
 
   const changed=await work('Synthetic changed revision guard');await waitState(changed.id,'awaiting_approval');
   writeFileSync(join(state,'jobs',changed.id,'checkout/value.txt'),'changed after review\n');
@@ -84,6 +101,13 @@ try {
   await cli('stop');assert.equal(containers(state).length,0);await cli('up');await waitState(interrupted.id,'interrupted');
   setConfig({timeoutSeconds:2});await cli('retry',interrupted.id);await waitState(interrupted.id,'failed');
   assert.equal((await snapshot(interrupted.id)).runs.length,2);assert.equal(containers(state).length,0);record('stop/restart retains interrupted state; retry proves previous writer stopped');
+  const other=join(state,'second-installation');
+  await stream(process.execPath,[join(ROOT,'bin/software-defence-factory.mjs'),'init','--state',other,'--repo',original.repo,'--agent','mock','--check',original.check,'--port','7350']);
+  await stream(process.execPath,[join(ROOT,'bin/software-defence-factory.mjs'),'install','--state',other]);
+  assert.equal(run('docker',['image','inspect','--format','{{.Id}}',original.image]),original.image);
+  run('docker',['run','--rm','--init','--network','none',original.image,'node','-e','process.exit(0)']);
+  await cli('stop');setConfig({});await cli('up');
+  record('a second installation rebuild preserves the first pinned image and controller restart');
   save(join(state,'qualification.json'),{synthetic:true,platform:process.platform,arch:process.arch,engine:json(join(state,'engine.json')).version,results});
   console.log(`Qualified ${results.length} paths. Model quality, cost and production connectors were not measured.`);
 } finally {save(join(state,'factory.json'),original);}