@timurproko/a1 0.1.1-dev.5 → 0.1.1-dev.7

package/dist/src/foundation/storage/control-store.js

@@ -3,6 +3,7 @@ import { mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import { PRODUCT_IDENTITY } from "../../product-identity.js";
 import { assertManagedAgentDescriptor, assertRecoveryAuthority, assertTerminalSessionLaunch, assertTerminalTopologySnapshot, } from "../workspace-contracts/index.js";
+import { assertLaunchInstance, assertLaunchInstanceOutcome, assertNativeProcessIdentity, assertProcessContainmentIdentity, } from "../lifecycle/index.js";
 export const DEFAULT_WORKSPACE_ID = "workspace-default";
 const INITIAL_WORKSPACE_ID = DEFAULT_WORKSPACE_ID;
 export class ControlStore {
@@ -18,7 +19,7 @@ export class ControlStore {
             this.migrate();
             if (bootNonce !== null) {
                 this.reconcilePriorBootGenerations(bootNonce);
-                this.reconcilePriorBootForegroundTerminalLeases(bootNonce);
+                this.reconcilePriorBootLaunchInstances(bootNonce);
             }
         }
         catch (error) {
@@ -29,8 +30,8 @@ export class ControlStore {
     migrate() {
         const versionRow = this.database.prepare("PRAGMA user_version").get();
         const version = versionRow.user_version;
-        if (version > 4)
-            throw new Error(`control database version ${version} is newer than supported version 4`);
+        if (version > 5)
+            throw new Error(`control database version ${version} is newer than supported version 5`);
         if (version !== 0)
             this.#assertCurrentControlSchema();
         if (version === 0) {
@@ -172,6 +173,41 @@ export class ControlStore {
         ALTER TABLE workspaces ADD COLUMN revision INTEGER NOT NULL DEFAULT 0 CHECK (revision >= 0);
         PRAGMA user_version = 4;
         COMMIT;
+      `);
+        }
+        if (version <= 4) {
+            this.database.exec(`
+        BEGIN IMMEDIATE;
+        UPDATE foreground_terminal_leases
+          SET state = 'interrupted',
+              released_at = COALESCE(released_at, strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),
+              outcome_json = '{"kind":"interrupted","reason":"legacy-migration","message":"legacy foreground ownership cannot prove current launch-instance liveness"}'
+          WHERE state IN ('requested', 'active');
+        DROP INDEX IF EXISTS idx_one_live_foreground_lease;
+        CREATE TABLE launch_instances (
+          id TEXT PRIMARY KEY,
+          owner_client_id TEXT NOT NULL,
+          profile_id TEXT NOT NULL CHECK (profile_id IN ('a1', 'pi', 'sandbox')),
+          state TEXT NOT NULL CHECK (state IN ('requested', 'active', 'stopping', 'completed', 'interrupted')),
+          shutdown_policy TEXT NOT NULL CHECK (shutdown_policy = 'terminate-tree-on-close'),
+          guardian_identity_json TEXT NOT NULL CHECK (json_valid(guardian_identity_json)),
+          root_identity_json TEXT CHECK (root_identity_json IS NULL OR json_valid(root_identity_json)),
+          containment_identity_json TEXT CHECK (containment_identity_json IS NULL OR json_valid(containment_identity_json)),
+          created_at TEXT NOT NULL,
+          activated_at TEXT,
+          stopping_at TEXT,
+          completed_at TEXT,
+          outcome_json TEXT CHECK (outcome_json IS NULL OR json_valid(outcome_json)),
+          owner_boot_nonce TEXT NOT NULL,
+          CHECK ((state = 'requested' AND root_identity_json IS NULL AND containment_identity_json IS NULL AND activated_at IS NULL AND stopping_at IS NULL AND completed_at IS NULL AND outcome_json IS NULL)
+            OR (state = 'active' AND root_identity_json IS NOT NULL AND containment_identity_json IS NOT NULL AND activated_at IS NOT NULL AND stopping_at IS NULL AND completed_at IS NULL AND outcome_json IS NULL)
+            OR (state = 'stopping' AND root_identity_json IS NOT NULL AND containment_identity_json IS NOT NULL AND activated_at IS NOT NULL AND stopping_at IS NOT NULL AND completed_at IS NULL AND outcome_json IS NULL)
+            OR (state IN ('completed', 'interrupted') AND completed_at IS NOT NULL AND outcome_json IS NOT NULL))
+        );
+        CREATE INDEX idx_launch_instances_owner ON launch_instances(owner_client_id, state);
+        CREATE INDEX idx_launch_instances_boot ON launch_instances(owner_boot_nonce, state);
+        PRAGMA user_version = 5;
+        COMMIT;
       `);
         }
         if (version === 0) {
@@ -199,61 +235,70 @@ export class ControlStore {
             return Number(result.changes);
         });
     }
-    acquireForegroundTerminalLease(lease) {
+    createLaunchInstance(instance) {
         if (this.bootNonce === null)
-            throw new Error("foreground lease storage requires a supervisor boot identity");
-        if (lease.state !== "requested" || lease.generationId !== null || lease.processIdentity !== null || lease.releasedAt !== null || lease.outcome !== null) {
-            throw new Error("new foreground lease must be requested and unactivated");
-        }
-        try {
-            this.database.prepare(`INSERT INTO foreground_terminal_leases
-        (id, owner_id, profile_json, state, generation_id, process_identity_json, acquired_at, heartbeat_at, released_at, outcome_json, owner_boot_nonce)
-        VALUES (?, ?, ?, 'requested', NULL, NULL, ?, NULL, NULL, NULL, ?)`)
-                .run(lease.id, lease.ownerId, JSON.stringify(lease.profile), lease.acquiredAt, this.bootNonce);
-        }
-        catch (error) {
-            if (error instanceof Error && /UNIQUE constraint failed/i.test(error.message))
-                throw new Error("an exclusive foreground terminal lease is already live");
-            throw error;
-        }
+            throw new Error("launch instance storage requires a supervisor boot identity");
+        assertLaunchInstance(instance);
+        if (instance.state !== "requested")
+            throw new Error("new launch instance must be requested");
+        this.database.prepare(`INSERT INTO launch_instances
+      (id, owner_client_id, profile_id, state, shutdown_policy, guardian_identity_json, root_identity_json, containment_identity_json,
+       created_at, activated_at, stopping_at, completed_at, outcome_json, owner_boot_nonce)
+      VALUES (?, ?, ?, 'requested', ?, ?, NULL, NULL, ?, NULL, NULL, NULL, NULL, ?)`)
+            .run(instance.id, instance.ownerClientId, instance.profileId, instance.shutdownPolicy, JSON.stringify(instance.guardianIdentity), instance.createdAt, this.bootNonce);
     }
-    activateForegroundTerminalLease(leaseId, generationId, processIdentity, heartbeatAt) {
+    activateLaunchInstance(instanceId, ownerClientId, rootIdentity, containmentIdentity, activatedAt) {
         if (this.bootNonce === null)
-            throw new Error("foreground lease storage requires a supervisor boot identity");
-        const result = this.database.prepare(`UPDATE foreground_terminal_leases
-      SET state = 'active', generation_id = ?, process_identity_json = ?, heartbeat_at = ?
-      WHERE id = ? AND state = 'requested' AND owner_boot_nonce = ?`)
-            .run(generationId, JSON.stringify(processIdentity), heartbeatAt, leaseId, this.bootNonce);
+            throw new Error("launch instance storage requires a supervisor boot identity");
+        assertNativeProcessIdentity(rootIdentity);
+        assertProcessContainmentIdentity(containmentIdentity);
+        const result = this.database.prepare(`UPDATE launch_instances
+      SET state = 'active', root_identity_json = ?, containment_identity_json = ?, activated_at = ?
+      WHERE id = ? AND owner_client_id = ? AND owner_boot_nonce = ? AND state = 'requested'`)
+            .run(JSON.stringify(rootIdentity), JSON.stringify(containmentIdentity), activatedAt, instanceId, ownerClientId, this.bootNonce);
         return Number(result.changes) === 1;
     }
-    heartbeatForegroundTerminalLease(leaseId, processIdentity, heartbeatAt) {
+    beginLaunchInstanceStop(instanceId, ownerClientId, stoppingAt) {
         if (this.bootNonce === null)
-            throw new Error("foreground lease storage requires a supervisor boot identity");
-        const result = this.database.prepare(`UPDATE foreground_terminal_leases SET heartbeat_at = ?
-      WHERE id = ? AND state = 'active' AND owner_boot_nonce = ? AND process_identity_json = ?`)
-            .run(heartbeatAt, leaseId, this.bootNonce, JSON.stringify(processIdentity));
+            throw new Error("launch instance storage requires a supervisor boot identity");
+        const result = this.database.prepare(`UPDATE launch_instances SET state = 'stopping', stopping_at = ?
+      WHERE id = ? AND owner_client_id = ? AND owner_boot_nonce = ? AND state = 'active'`)
+            .run(stoppingAt, instanceId, ownerClientId, this.bootNonce);
         return Number(result.changes) === 1;
     }
-    releaseForegroundTerminalLease(leaseId, processIdentity, outcome, releasedAt) {
+    completeLaunchInstance(instanceId, ownerClientId, terminalState, outcome, completedAt) {
         if (this.bootNonce === null)
-            throw new Error("foreground lease storage requires a supervisor boot identity");
-        const expectedIdentity = processIdentity === null ? null : JSON.stringify(processIdentity);
-        const result = this.database.prepare(`UPDATE foreground_terminal_leases
-      SET state = 'released', released_at = ?, outcome_json = ?
-      WHERE id = ? AND state IN ('requested', 'active') AND owner_boot_nonce = ?
-        AND ((process_identity_json IS NULL AND ? IS NULL) OR process_identity_json = ?)`)
-            .run(releasedAt, JSON.stringify(outcome), leaseId, this.bootNonce, expectedIdentity, expectedIdentity);
+            throw new Error("launch instance storage requires a supervisor boot identity");
+        assertLaunchInstanceOutcome(outcome);
+        if (terminalState === "completed" && outcome.kind === "interrupted")
+            throw new Error("completed launch instance cannot carry an interrupted outcome");
+        if (terminalState === "interrupted" && outcome.kind !== "interrupted" && outcome.kind !== "cleanup-error") {
+            throw new Error("interrupted launch instance requires an interrupted or cleanup-error outcome");
+        }
+        const result = this.database.prepare(`UPDATE launch_instances
+      SET state = ?, completed_at = ?, outcome_json = ?
+      WHERE id = ? AND owner_client_id = ? AND owner_boot_nonce = ? AND state IN ('requested', 'active', 'stopping')`)
+            .run(terminalState, completedAt, JSON.stringify(outcome), instanceId, ownerClientId, this.bootNonce);
         return Number(result.changes) === 1;
     }
-    loadLiveForegroundTerminalLease() {
-        const row = this.database.prepare("SELECT * FROM foreground_terminal_leases WHERE state IN ('requested', 'active') LIMIT 1").get();
-        return row ? foregroundLeaseFromRow(row) : null;
+    loadActiveLaunchInstances() {
+        return this.database.prepare(`SELECT * FROM launch_instances
+      WHERE state IN ('requested', 'active', 'stopping') ORDER BY created_at, id`).all()
+            .map(launchInstanceFromRow);
     }
-    reconcilePriorBootForegroundTerminalLeases(bootNonce, reconciledAt = new Date().toISOString()) {
-        const outcome = { kind: "broker-error", message: "foreground lease owner ended before a terminal outcome", code: "stale-owner-boot" };
-        const result = this.database.prepare(`UPDATE foreground_terminal_leases
-      SET state = 'released', released_at = ?, outcome_json = ?
-      WHERE state IN ('requested', 'active') AND owner_boot_nonce <> ?`)
+    loadLaunchInstance(instanceId) {
+        const row = this.database.prepare("SELECT * FROM launch_instances WHERE id = ?").get(instanceId);
+        return row ? launchInstanceFromRow(row) : null;
+    }
+    reconcilePriorBootLaunchInstances(bootNonce, reconciledAt = new Date().toISOString()) {
+        const outcome = {
+            kind: "interrupted",
+            reason: "supervisor-disconnect",
+            message: "launch instance ownership ended with a prior supervisor boot",
+        };
+        const result = this.database.prepare(`UPDATE launch_instances
+      SET state = 'interrupted', completed_at = ?, outcome_json = ?
+      WHERE state IN ('requested', 'active', 'stopping') AND owner_boot_nonce <> ?`)
             .run(reconciledAt, JSON.stringify(outcome), bootNonce);
         return Number(result.changes);
     }
@@ -464,17 +509,22 @@ function assertWorkspaceAgentPresentation(presentation) {
         }
     }
 }
-function foregroundLeaseFromRow(row) {
-    return {
+function launchInstanceFromRow(row) {
+    const instance = {
         id: row.id,
-        ownerId: row.owner_id,
-        profile: JSON.parse(row.profile_json),
+        ownerClientId: row.owner_client_id,
+        profileId: row.profile_id,
         state: row.state,
-        generationId: row.generation_id,
-        processIdentity: row.process_identity_json ? JSON.parse(row.process_identity_json) : null,
-        acquiredAt: row.acquired_at,
-        heartbeatAt: row.heartbeat_at,
-        releasedAt: row.released_at,
+        shutdownPolicy: row.shutdown_policy,
+        guardianIdentity: JSON.parse(row.guardian_identity_json),
+        rootIdentity: row.root_identity_json ? JSON.parse(row.root_identity_json) : null,
+        containmentIdentity: row.containment_identity_json ? JSON.parse(row.containment_identity_json) : null,
+        createdAt: row.created_at,
+        activatedAt: row.activated_at,
+        stoppingAt: row.stopping_at,
+        completedAt: row.completed_at,
         outcome: row.outcome_json ? JSON.parse(row.outcome_json) : null,
     };
+    assertLaunchInstance(instance);
+    return instance;
 }

package/dist/src/foundation/supervision/server.d.ts

@@ -1,5 +1,5 @@
 import { type SupervisorSnapshot } from "../lifecycle/index.js";
-import type { MaterializedRelease } from "../release/index.js";
+import { type MaterializedRelease } from "../release/index.js";
 import { ControlStore } from "../storage/index.js";
 import { type ProductPaths } from "./paths.js";
 export declare class SupervisorServer {
@@ -7,12 +7,14 @@ export declare class SupervisorServer {
     readonly store: ControlStore;
     readonly release: MaterializedRelease;
     readonly terminateProcess: (code: number) => void;
+    readonly reconciliationDeadlineMs: number;
+    readonly shutdownDeadlineMs: number;
     readonly id: `${string}-${string}-${string}-${string}-${string}`;
     readonly bootNonce: string;
     readonly pidStartIdentity: string;
     readonly startedAt: string;
     readonly paths: ProductPaths;
-    constructor(store: ControlStore, paths: ProductPaths | undefined, release: MaterializedRelease, bootNonce?: string, terminateProcess?: (code: number) => void);
+    constructor(store: ControlStore, paths: ProductPaths | undefined, release: MaterializedRelease, bootNonce?: string, terminateProcess?: (code: number) => void, reconciliationDeadlineMs?: number, shutdownDeadlineMs?: number);
     snapshot(): SupervisorSnapshot;
     listen(): Promise<void>;
     close(stopAgents?: boolean): Promise<void>;