@superjackfruitlabs/salaam 0.0.3 → 0.0.4

package/src/run-grants.ts

@@ -0,0 +1,107 @@
+import { randomUUID } from 'node:crypto';
+import type { Store } from './store.js';
+
+/**
+ * "Approve for this run" (approval scopes, item B). A person answering one workspace-write approval
+ * may cover the rest of the run's writes inside the run's own directory. Each later write is still
+ * prepared, digest-bound and journaled as its own operation; the grant only answers its approval.
+ *
+ * A grant covers a station patch only when it is a write (never a delete: every delete asks), its
+ * path lies under `runs/<runId>/`, and no segment is empty, `.`, `..` or hidden (a leading dot).
+ * It is bound to the session, task, plan revision and binding digest it was given under, and ends
+ * when any of them changes or the task settles. Anything outside it asks as before.
+ */
+export interface RunGrant {
+  id: string;
+  session_id: string;
+  task_id: string;
+  plan_revision: number;
+  binding_digest: string;
+  path_prefix: string;
+  approval_id: string;
+  granted_by: string;
+  created_at: string;
+  revoked_at: string | null;
+}
+
+export const runGrantPrefix = (runId: string): string | null =>
+  /^run_[A-Za-z0-9]{6,}$/.test(runId) ? `runs/${runId}/` : null;
+
+/** Whether a station patch's arguments are a write a grant for this prefix may answer. */
+export function runGrantCovers(prefix: string, args: Record<string, unknown>): boolean {
+  if (args.action !== 'patch' || typeof args.content !== 'string') return false;
+  const path = args.path;
+  if (typeof path !== 'string' || !path.startsWith(prefix) || path.length === prefix.length)
+    return false;
+  return path.split('/').every((s) => s !== '' && s !== '.' && s !== '..' && !s.startsWith('.'));
+}
+
+export class RunGrants {
+  constructor(private readonly store: Store) {
+    store.db.exec(`CREATE TABLE IF NOT EXISTS run_grants(
+      id TEXT PRIMARY KEY NOT NULL,
+      session_id TEXT NOT NULL,
+      task_id TEXT NOT NULL,
+      plan_revision INTEGER NOT NULL,
+      binding_digest TEXT NOT NULL,
+      path_prefix TEXT NOT NULL,
+      approval_id TEXT NOT NULL UNIQUE,
+      granted_by TEXT NOT NULL,
+      created_at TEXT NOT NULL,
+      revoked_at TEXT)`);
+  }
+  /** Within the caller's transaction, next to the decision that granted it. Idempotent per approval. */
+  createInTransaction(input: Omit<RunGrant, 'id' | 'created_at' | 'revoked_at'>): RunGrant {
+    if (!this.store.db.isTransaction) throw Error('A run grant is created with its decision');
+    const saved = this.store.db
+      .prepare('SELECT * FROM run_grants WHERE approval_id=?')
+      .get(input.approval_id) as RunGrant | undefined;
+    if (saved) return saved;
+    const grant: RunGrant = {
+      ...input,
+      id: randomUUID(),
+      created_at: new Date().toISOString(),
+      revoked_at: null,
+    };
+    this.store.db
+      .prepare('INSERT INTO run_grants VALUES (?,?,?,?,?,?,?,?,?,?)')
+      .run(
+        grant.id,
+        grant.session_id,
+        grant.task_id,
+        grant.plan_revision,
+        grant.binding_digest,
+        grant.path_prefix,
+        grant.approval_id,
+        grant.granted_by,
+        grant.created_at,
+        null,
+      );
+    this.store.event(grant.session_id, 'run_grant.created', {
+      grant_id: grant.id,
+      approval_id: grant.approval_id,
+      task_id: grant.task_id,
+      path_prefix: grant.path_prefix,
+    });
+    return grant;
+  }
+  /** The live grant for exactly this session, task, plan revision and binding, if any. */
+  active(scope: {
+    session_id: string;
+    task_id: string;
+    plan_revision: number;
+    binding_digest: string;
+    task_state: string;
+  }): RunGrant | null {
+    if (['cancelled', 'succeeded', 'succeeded_with_exception'].includes(scope.task_state))
+      return null;
+    return (
+      (this.store.db
+        .prepare(
+          'SELECT * FROM run_grants WHERE session_id=? AND task_id=? AND plan_revision=? AND binding_digest=? AND revoked_at IS NULL ORDER BY created_at DESC LIMIT 1',
+        )
+        .get(scope.session_id, scope.task_id, scope.plan_revision, scope.binding_digest) as
+        RunGrant | undefined) ?? null
+    );
+  }
+}

package/src/service.ts

@@ -1,5 +1,14 @@
 import { createServer, type Server, type ServerResponse, type IncomingMessage } from 'node:http';
-import { mkdirSync, chmodSync, existsSync, unlinkSync, realpathSync, statSync } from 'node:fs';
+import { loadPersona } from './persona.js';
+import {
+  mkdirSync,
+  chmodSync,
+  chownSync,
+  existsSync,
+  unlinkSync,
+  realpathSync,
+  statSync,
+} from 'node:fs';
 import { join, resolve } from 'node:path';
 import { providerRoute } from './provider-config.js';
 import { TaskContext } from './task-context.js';
@@ -8,6 +17,8 @@ import { SLASH_COMMANDS } from './tui-commands.js';
 import { TaskWork } from './task-work.js';
 import { TaskBudget } from './task-budget.js';
 import { AgentPodWorkDecisions } from './agentpod-work-decisions.js';
+import { RunGrants } from './run-grants.js';
+import { TaskCritic } from './task-critic.js';
 import { AgentPodWork } from './agentpod-work.js';
 import { agentpodWorkAdmission } from './agentpod-work-protocol.js';
 import { TaskVerification } from './task-verification.js';
@@ -41,6 +52,7 @@ import { DockerHarnessBackend } from './harness-backend.js';
 import { A2AInbound } from './a2a-inbound.js';
 import { AgentPodAuthority, readAgentPodPins } from './agentpod-authority.js';
 import { ToolkitResources } from './toolkit-resources.js';
+import { OperatorMcp } from './operator-mcp.js';
 import { cancelToolkitCalls, recoverToolkitCalls } from './toolkit-calls.js';
 import { ToolkitOwners } from './toolkit-owners.js';
 import { ToolkitResolutions, resolvedToolkitCallSql } from './toolkit-resolutions.js';
@@ -51,16 +63,28 @@ import { McpAdmission } from './mcp-admission.js';
 import { McpWork } from './mcp-work.js';
 import { ToolkitWork, type ToolkitWorkConfig } from './toolkit-work.js';
 import { permissionPolicy, configurePermissions } from './autonomy.js';
-import { LocalCoding } from './local-coding.js';
+import { chooseLocalSandbox, type SandboxLevel } from './command-sandbox.js';
+import { LocalCoding, type LocalSandbox } from './local-coding.js';
 import { localDiff } from './local-diff.js';
 import { reviewUndo, applyUndo, reconcileUndo } from './local-undo.js';
 import { forkPiSession } from './pi-sessions.js';
 import { StationWork } from './station-work.js';
 import { readToolkitConfig } from './toolkit-config.js';
+import { probeToolsUser, serviceToolIdentity, type ToolIdentity } from './tool-identity.js';
 
 export interface ServiceOptions extends Omit<SupervisorOptions, 'stateDir' | 'bridgeSocket'> {
   hostManifestDigest?: string;
+  /** Receipt fields for the launcher profile; reported only by a manifest-served host. */
+  hostReceipt?: Record<string, unknown>;
+  /** Launcher profile: one group may traverse state and use the operator socket. */
+  operatorAccess?: { group: string; gid: number };
   agentpodConfig?: string;
+  /** Operator-declared MCP file (never a workspace path); absent means none declared. */
+  operatorMcpConfig?: string;
+  /** Item 9: the host's pinned persona file and the digest host plan reviewed. */
+  personaConfig?: { config: string; digest: string };
+  /** Environment that ${VAR} references resolve from; defaults to process.env. */
+  operatorMcpEnvironment?: NodeJS.ProcessEnv;
   managedMcp?: { config: string; profile_digest: string };
   /** Internal trusted host seam; never accepted from ACP or a worker. */
   managedToolkit?: ToolkitWorkConfig;
@@ -83,11 +107,25 @@ export interface ServiceOptions extends Omit<SupervisorOptions, 'stateDir' | 'br
   effectConnector?: EffectConnector;
   approvalTtlMs?: number;
   codingRoot?: string;
+  /** Unprivileged OS user for agent-initiated local commands and edits (Linux, sudo -n -u). */
+  toolsUser?: string;
+  /** Item 10: the sandbox level for agent-initiated local commands (default workspace-write).
+   * full-access is unsandboxed and must be chosen explicitly. */
+  localSandbox?: SandboxLevel;
+  /** Host config `unsandboxed_commands: "allow"`: run local commands unsandboxed on a host with no
+   * usable sandbox. Absent, they are refused (operator ruling 2026-10-30, option A). */
+  unsandboxedCommands?: 'allow';
+  /** Host config `command_network: "broker"`: sandboxed local commands reach the network only
+   * through this stk local-commands socket (operator rulings 2026-10-30). */
+  commandNetwork?: { socket: string };
+  /** Internal test seam: argv prefix replacing `sudo -n -u <toolsUser> --`. */
+  toolsLauncher?: string[];
   codingSocket?: string;
   codingBackend?: ExecutionBackend;
   expectedExecution?: { profile_digest: string; engine_id: string };
 }
 export class SalaamService {
+  operatorMcpPath?: string;
   readonly agentpod?: AgentPodAuthority;
   readonly agentpodWork?: AgentPodWork;
   readonly toolkitResources: ToolkitResources;
@@ -124,6 +162,7 @@ export class SalaamService {
   readonly workspaces: Workspaces;
   readonly coding: CodingWork;
   readonly localCoding: LocalCoding;
+  readonly toolIdentity: ToolIdentity;
   readonly codingSocket: string | null;
   readonly closed: Promise<void>;
   private resolveClosed!: () => void;
@@ -136,12 +175,18 @@ export class SalaamService {
   private revocationStops = new Set<Promise<void>>();
   private authorityTimer?: NodeJS.Timeout;
   private readonly hostManifestDigest: string | null;
+  private readonly hostReceipt: Record<string, unknown> | null;
+  private readonly operatorAccess: { group: string; gid: number } | null;
   private readonly agentpodWorkProgression: boolean;
   private constructor(options: ServiceOptions) {
     this.agentpodWorkProgression = options.agentpodWorkProgression === true;
     if (this.agentpodWorkProgression && (!options.stationConfig || !options.agentpodConfig))
       throw Error('Strict work requires reviewed AgentPod protected station configuration');
     this.hostManifestDigest = options.hostManifestDigest ?? null;
+    this.hostReceipt = options.hostManifestDigest ? (options.hostReceipt ?? null) : null;
+    if (options.operatorAccess && !this.agentpodWorkProgression)
+      throw Error('Operator group access is only for the strict work launcher profile');
+    this.operatorAccess = options.operatorAccess ?? null;
     if (process.platform === 'win32') throw new Error('Windows transport is not implemented');
     this.stateDir = resolve(options.stateDir);
     if (options.managedMcp && !options.agentpodConfig)
@@ -169,6 +214,9 @@ export class SalaamService {
     this.codingSocket = options.codingSocket ? resolve(options.codingSocket) : null;
     mkdirSync(this.stateDir, { recursive: true, mode: 0o700 });
     this.stateDir = realpathSync(this.stateDir);
+    this.toolIdentity = options.toolsUser
+      ? probeToolsUser(options.toolsUser, this.stateDir, options.toolsLauncher)
+      : serviceToolIdentity();
     const mcpAdmission = options.managedMcp
       ? new McpAdmission(
           options.managedMcp.config,
@@ -183,6 +231,11 @@ export class SalaamService {
     this.release = acquireStateLock(this.stateDir);
     try {
       this.store = new Store(join(this.stateDir, 'journal.sqlite'));
+      this.store.toolExecution = {
+        mode: this.toolIdentity.mode,
+        user: this.toolIdentity.user,
+        uid: this.toolIdentity.uid,
+      };
       try {
         this.artifacts = new Artifacts(join(this.stateDir, 'artifacts'), this.store);
         this.tasks = new TaskContext(this.store, this.artifacts);
@@ -248,6 +301,26 @@ export class SalaamService {
           this.coding,
           this.artifacts,
         );
+        // Item 8: the completion critic. Its reviewer grant is the narrow built-in one, admitted
+        // only while the task's admitted plan still declares a critic.
+        this.taskVerification.critic = new TaskCritic(this.store, this.artifacts, {
+          admit: (task, request) =>
+            this.agents.admitCritic(task.session_id, request, () => {
+              if (!this.taskWork.get(task.id).completion_gate?.critic)
+                throw new ServiceError('authority_denied', 'The admitted plan declares no critic');
+            }),
+          spawn: (task, parentAttempt, step, prompt, budget, grant, snapshot) =>
+            this.children.spawnCritic(
+              task.session_id,
+              parentAttempt,
+              step,
+              prompt,
+              budget,
+              grant,
+              snapshot,
+            ),
+          workerId: (childId) => this.store.workerBoundary.view(childId).binding.worker_id,
+        });
         this.taskCheckpoints = new TaskCheckpoints(
           this.store,
           this.taskWork,
@@ -262,6 +335,19 @@ export class SalaamService {
           effectsEnabled: !!options.effectConnector,
         });
         this.supervisor.tasks = this.tasks;
+        if (options.personaConfig) {
+          const persona = loadPersona(options.personaConfig.config);
+          if (persona.digest !== options.personaConfig.digest)
+            throw Error('Host persona changed; run host plan again');
+          this.supervisor.persona = persona;
+        }
+        if (options.operatorMcpConfig) {
+          this.operatorMcpPath = options.operatorMcpConfig;
+          this.supervisor.operatorMcp = OperatorMcp.load(
+            options.operatorMcpConfig,
+            options.operatorMcpEnvironment ?? process.env,
+          );
+        }
         this.taskWork.providerCheck = (limits, session) =>
           this.supervisor.assertTaskProviderSupported(
             limits,
@@ -283,8 +369,19 @@ export class SalaamService {
               : this.supervisor.failControl(id, error),
         });
         this.supervisor.managed = this.managed;
-        this.localCoding = new LocalCoding(this.store, this.managed, (id, epoch, attempt) =>
-          this.supervisor.assertActive(id, epoch, attempt),
+        // Item 10: Linux runs local commands under bubblewrap and macOS under Seatbelt when
+        // usable; a host with neither refuses them unless the operator allowed them unsandboxed.
+        const localSandbox: LocalSandbox = {
+          ...chooseLocalSandbox(options.localSandbox ?? 'workspace-write'),
+          allowUnsandboxed: options.unsandboxedCommands === 'allow',
+          ...(options.commandNetwork ? { network: { socket: options.commandNetwork.socket } } : {}),
+        };
+        this.localCoding = new LocalCoding(
+          this.store,
+          this.managed,
+          (id, epoch, attempt) => this.supervisor.assertActive(id, epoch, attempt),
+          this.toolIdentity,
+          localSandbox,
         );
         this.supervisor.localCoding = this.localCoding;
         this.agents = new AgentProfiles(
@@ -459,6 +556,16 @@ export class SalaamService {
             },
           );
           this.supervisor.station = this.station;
+          // "Approve for this run": one grant store for decisions and the station.
+          this.station.grants = this.runGrants();
+          this.station.grantScope = (session) => {
+            const row = this.store.db
+              .prepare('SELECT task_id FROM agentpod_work WHERE session_id=?')
+              .get(session) as { task_id?: string } | undefined;
+            if (!row?.task_id) return null;
+            const task = this.taskWork.get(row.task_id);
+            return { task_id: task.id, plan_revision: task.plan_revision, task_state: task.state };
+          };
           this.taskVerification.installStation(this.station);
           this.agentpodWork = new AgentPodWork(
             this.store,
@@ -613,6 +720,7 @@ export class SalaamService {
       }
       await service.listen(service.bridgeServer, service.bridgeSocket);
       await service.listen(service.operator, service.socket);
+      service.shareOperatorSocket();
       service.taskDriver.start();
       service.jobs.start();
       service.recurring.start();
@@ -685,6 +793,16 @@ export class SalaamService {
     }
     await Promise.allSettled(jobs);
   }
+  /** The launcher profile's only widening: group traverse on state and rw on operator.sock.
+   * The bridge socket, journal, keys and every file below state stay owner-only. */
+  private shareOperatorSocket(): void {
+    if (!this.operatorAccess) return;
+    const { gid } = this.operatorAccess;
+    chownSync(this.socket, process.getuid!(), gid);
+    chmodSync(this.socket, 0o660);
+    chownSync(this.stateDir, process.getuid!(), gid);
+    chmodSync(this.stateDir, 0o710);
+  }
   private async listen(server: Server, path: string): Promise<void> {
     // The exclusive state lock is held before removing a stale socket.
     if (existsSync(path)) unlinkSync(path);
@@ -697,6 +815,11 @@ export class SalaamService {
       });
     });
   }
+  private grantStore?: RunGrants;
+  /** One "Approve for this run" grant store, shared by decisions and the station. */
+  private runGrants(): RunGrants {
+    return (this.grantStore ??= new RunGrants(this.store));
+  }
   private send(res: ServerResponse, status: number, value: unknown): void {
     res.writeHead(status, { 'content-type': 'application/json' });
     res.end(JSON.stringify(value));
@@ -816,6 +939,50 @@ export class SalaamService {
           });
           return;
         }
+        // Item 11b: restore a checkpoint's files, exactly as approved, for an ended run.
+        if (parts[2] === 'work-restore') {
+          if (!this.agentpodWork)
+            throw new ServiceError('work_disabled', 'Strict work is not enabled');
+          if (
+            Object.keys(body).sort().join(',') !==
+            'approved_by,binding,checkpoint_id,request_id,restore_digest'
+          )
+            throw new ServiceError('invalid_work_payload', 'Closed restore request required');
+          const restoreDigest = string(body.restore_digest, 'restore_digest', 64);
+          if (!/^[a-f0-9]{64}$/.test(restoreDigest))
+            throw new ServiceError('invalid_work_payload', 'A restore names its exact digest');
+          this.send(
+            res,
+            200,
+            await this.agentpodWork.restore(
+              body.binding,
+              string(body.request_id, 'request_id', 128),
+              string(body.checkpoint_id, 'checkpoint_id', 128),
+              restoreDigest,
+              string(body.approved_by, 'approved_by', 128),
+            ),
+          );
+          return;
+        }
+        // Item 11: read-only checkpoints of the bound run and one checkpoint's diff.
+        if (parts[2] === 'work-checkpoints' || parts[2] === 'work-checkpoint-diff') {
+          if (!this.agentpodWork)
+            throw new ServiceError('work_disabled', 'Strict work is not enabled');
+          const keys = parts[2] === 'work-checkpoints' ? 'binding' : 'binding,checkpoint_id';
+          if (Object.keys(body).sort().join(',') !== keys)
+            throw new ServiceError('invalid_work_payload', 'Closed checkpoint request required');
+          this.send(
+            res,
+            200,
+            parts[2] === 'work-checkpoints'
+              ? this.agentpodWork.checkpoints(body.binding)
+              : await this.agentpodWork.checkpointDiff(
+                  body.binding,
+                  string(body.checkpoint_id, 'checkpoint_id', 128),
+                ),
+          );
+          return;
+        }
         if (parts[2] === 'work-status' || parts[2] === 'work-progress') {
           if (!this.agentpodWork || !this.agentpodWorkProgression)
             throw new ServiceError('work_disabled', 'Strict progression is not enabled');
@@ -1002,6 +1169,14 @@ export class SalaamService {
           this.send(res, 200, await this.agentpodWork.completion(body.binding));
           return;
         }
+        if (parts[2] === 'work-read') {
+          if (!this.agentpodWork)
+            throw new ServiceError('work_disabled', 'Strict progression is not enabled');
+          if (Object.keys(body).sort().join(',') !== 'answer,binding')
+            throw new ServiceError('invalid_board_read', 'Closed board read answer required');
+          this.send(res, 200, this.agentpodWork.answerBoardRead(body.binding, body.answer));
+          return;
+        }
         if (parts[2] === 'work-decisions' || parts[2] === 'work-decision') {
           if (!this.agentpodWork)
             throw new ServiceError(
@@ -1011,7 +1186,11 @@ export class SalaamService {
           const answering = parts[2] === 'work-decision';
           if (Object.keys(body).sort().join(',') !== (answering ? 'answer,binding' : 'binding'))
             throw new ServiceError('invalid_work_decision', 'Closed decision payload required');
-          const decisions = new AgentPodWorkDecisions(this.agentpodWork, this.managed);
+          const decisions = new AgentPodWorkDecisions(
+            this.agentpodWork,
+            this.managed,
+            this.runGrants(),
+          );
           this.send(
             res,
             200,
@@ -1090,7 +1269,18 @@ export class SalaamService {
         }
         const request = string(body.request_id, 'request_id', 128);
         if (parts[2] === 'admit') {
-          this.send(res, 200, this.agentpod.admit(body.binding, request));
+          this.send(
+            res,
+            200,
+            this.agentpod.admit(
+              body.binding,
+              request,
+              body.continue_from === undefined
+                ? undefined
+                : string(body.continue_from, 'continue_from', 128),
+              body.approval_rules,
+            ),
+          );
           return;
         }
         if (parts[2] === 'renew') {
@@ -1101,6 +1291,7 @@ export class SalaamService {
               body.binding,
               request,
               integer(body.lease_sequence, 'lease_sequence'),
+              body.approval_rules,
             ),
           );
           return;
@@ -1664,11 +1855,22 @@ export class SalaamService {
           pid: process.pid,
           host_manifest_digest: this.hostManifestDigest,
           host_supervisor_connected: this.hostManifestDigest ? process.connected === true : null,
+          host_receipt: this.hostReceipt,
           runtime_node: realpathSync(process.execPath),
           service_version: VERSION,
           context_admission: { version: 1, automatic_discovery: false, child_inheritance: false },
           agentpod_config: this.agentpod?.configPath ?? null,
           agentpod_pins_digest: this.agentpod ? digest(this.agentpod.pins) : null,
+          persona: this.supervisor.persona
+            ? { digest: this.supervisor.persona.digest, text: this.supervisor.persona.text }
+            : null,
+          operator_mcp: this.operatorMcpPath
+            ? {
+                config: this.operatorMcpPath,
+                digest: this.supervisor.operatorMcp!.digest,
+                servers: this.supervisor.operatorMcp!.provenance(),
+              }
+            : null,
           managed_mcp: this.mcp
             ? { profile_digest: this.mcp.options.admission.profileDigest }
             : null,
@@ -1680,6 +1882,12 @@ export class SalaamService {
             ? { configuration_digest: this.station.configurationDigest }
             : null,
           service: 'healthy',
+          tool_execution: {
+            mode: this.toolIdentity.mode,
+            user: this.toolIdentity.user,
+            uid: this.toolIdentity.uid,
+            warning: this.toolIdentity.warning,
+          },
           a2a: {
             inbound_enabled: !!this.a2aInbound,
             listener: this.a2aInbound?.server.address() ?? null,
@@ -1741,9 +1949,11 @@ export class SalaamService {
                 backend: this.coding.executor?.evidence ?? null,
               }
             : EXECUTION_STATUS,
+          last_activity_at: new Date(this.store.lastActivityAny()).toISOString(),
           sessions: sessions.map((x) => ({
             id: x.id,
             state: x.state,
+            last_activity_at: iso(this.store.lastActivity(x.id)),
             error: x.error,
             capabilities: x.capabilities,
             pending_approvals: this.store
@@ -2011,6 +2221,7 @@ export class SalaamService {
                   )
                     throw new ServiceError('session_busy', 'Wait for queued work before undo');
                 },
+                this.toolIdentity,
               ),
             );
             return;
@@ -2795,6 +3006,7 @@ export class SalaamService {
     await attempt(() => this.toolkitResolutions.close());
     await attempt(() => this.children.close());
     await attempt(() => this.supervisor.close());
+    await attempt(() => this.supervisor.operatorMcp?.close());
     await attempt(() => this.dispatcher.drain());
     await attempt(() => this.managed.close());
     await attempt(() =>
@@ -2826,3 +3038,7 @@ export class SalaamService {
     if (this.shutdownFailure) throw this.shutdownFailure;
   }
 }
+
+function iso(ms: number | null): string | null {
+  return ms === null ? null : new Date(ms).toISOString();
+}