@staix/agent-hub 0.19.0 → 0.20.0

package/plugins/agent-hub/server.js

@@ -85,7 +85,8 @@ function memoryGitEnv(env = process.env, options = {}) {
 }
 function memoryGitSync(args, options) {
   const argv = memoryGitArgv(args);
-  return childProcess().spawnSync(argv[0], argv.slice(1), { ...ambientGitTimeout !== undefined ? { timeout: ambientGitTimeout, killSignal: "SIGKILL" } : {}, ...options, env: memoryGitEnv(options.env ?? process.env) });
+  const timeout = gitTimeoutContext?.getStore();
+  return childProcess().spawnSync(argv[0], argv.slice(1), { ...timeout !== undefined ? { timeout, killSignal: "SIGKILL" } : {}, ...options, env: memoryGitEnv(options.env ?? process.env) });
 }
 function processSignature(pid) {
   try {
@@ -121,7 +122,7 @@ var require2, processes, childProcess = () => processes ??= require2("node:child
     const parent = dirname(absolute);
     return parent === absolute ? absolute : join(canonical(parent), basename(absolute));
   }
-}, DENY_SEGMENTS, DENY_NAMES, denyNamePatterns, hasSegment = (rel, seg) => `/${rel}/`.includes(`/${seg}/`), SAFE_CONFIG, CREDENTIAL_KEYS, memoryGitArgv = (args, opts = {}) => ["git", "--no-pager", ...SAFE_CONFIG.filter((c) => !opts.credentials || !CREDENTIAL_KEYS.has(c)).flatMap((c) => ["-c", c]), ...args], ambientGitTimeout;
+}, DENY_SEGMENTS, DENY_NAMES, denyNamePatterns, hasSegment = (rel, seg) => `/${rel}/`.includes(`/${seg}/`), SAFE_CONFIG, CREDENTIAL_KEYS, memoryGitArgv = (args, opts = {}) => ["git", "--no-pager", ...SAFE_CONFIG.filter((c) => !opts.credentials || !CREDENTIAL_KEYS.has(c)).flatMap((c) => ["-c", c]), ...args], gitTimeoutContext;
 var init_platform = __esm(() => {
   require2 = createRequire(import.meta.url);
   DENY_SEGMENTS = [".maru/secrets", ".agenthub/state", ".agenthub/archive"];
@@ -1415,6 +1416,7 @@ var init_reviewer_print = __esm(() => {
   ReviewerPrintPeer = class ReviewerPrintPeer extends BasePeer {
     opts;
     hubNative = true;
+    hubOwned = true;
     generation = 0;
     child;
     childCleanup;
@@ -2943,6 +2945,9 @@ var init_acp = __esm(() => {
   };
   AcpPeer = class AcpPeer extends BasePeer {
     opts;
+    deliveryOnly = true;
+    hubOwned = true;
+    form = "headless";
     permissionMode;
     nativePolicy;
     modeUnknown = false;
@@ -3058,6 +3063,10 @@ var init_acp = __esm(() => {
     recoveryMetadata() {
       return { launch: { kind: "acp", ...this.opts.launchModel ? { model: this.opts.launchModel } : {} }, ...this.sessionId ? { sessionId: this.sessionId } : {} };
     }
+    get nativeSession() {
+      const session = this.recoveryMetadata().sessionId;
+      return typeof session === "string" ? session : undefined;
+    }
     async start() {
       if (this.opts.requireOwnedGroup && this.proc)
         throw new Error("Configured ACP still has a process; stop it before starting another");
@@ -3664,6 +3673,7 @@ var init_codex_appserver = __esm(() => {
   TRACKED = new Set(["thread/start", "thread/resume"]);
   CodexPeer = class CodexPeer extends BasePeer {
     opts;
+    frontendProxy;
     permissionMode;
     actionWaits = new Map;
     get actionGated() {
@@ -3708,6 +3718,17 @@ var init_codex_appserver = __esm(() => {
       super(id, opts.watchdogMs);
       this.opts = opts;
       this.permissionMode = opts.permissionMode ?? "ask";
+      const owner = this;
+      this.frontendProxy = {
+        get url() {
+          return owner.proxyUrl;
+        },
+        get attached() {
+          return owner.proxyAttached;
+        },
+        setStartupPermissionMode: this.setStartupPermissionMode.bind(this),
+        clearPermissionMode: this.clearPermissionMode.bind(this)
+      };
     }
     recoveryMetadata() {
       return {
@@ -3718,6 +3739,9 @@ var init_codex_appserver = __esm(() => {
     get thread() {
       return this.threadId;
     }
+    get nativeSession() {
+      return this.threadId || undefined;
+    }
     get proxyUrl() {
       return `ws://127.0.0.1:${this.server?.port ?? this.opts.proxyPort}`;
     }
@@ -4324,6 +4348,9 @@ ${renderDigest(envs, false)}`;
         link.up.send(JSON.stringify({ method: "thread/revert", id, params: { threadId: this.threadId, beforeTurnId: turnId } }));
       });
     }
+    revertTurn(nativeTurn) {
+      return this.revert(nativeTurn);
+    }
     readUsage() {
       const link = this.link;
       if (!this.opts.onUsage || !link || link.up.readyState !== WebSocket.OPEN)
@@ -5902,6 +5929,15 @@ function hubWriteRegexes(root, gitDirs = [], moduleGit = [], worktreesRoot) {
     ...external
   ];
 }
+function objectStoreRules(common) {
+  const objects = `${common}/objects`, o = sbplEscape(objects);
+  const re = (s) => `(regex ${sbplString(s)})`;
+  return [
+    `(deny file-write* (subpath ${sbplString(`${objects}/info`)}) (subpath ${sbplString(`${objects}/pack`)}) ${[objects, `${objects}/info`, `${objects}/pack`].map((p) => `(literal ${sbplString(p)})`).join(" ")})`,
+    `(deny file-write-unlink ${re(`^${o}/[0-9a-f][0-9a-f]$`)})`,
+    `(deny file-write-data file-write-unlink file-write-mode file-write-flags ${re(`^${o}/[0-9a-f][0-9a-f]/[0-9a-f]+$`)})`
+  ];
+}
 function denyRegexes(root, extra = [], withNames = true) {
   const names = DENY_NAMES.map((re) => {
     const body = re.startsWith("^") ? re.slice(1) : `[^/]*${re}`;
@@ -6045,6 +6081,7 @@ function profile(cwd, network, readAllow = [], deny = [], readOnly = []) {
     "(deny file-write*)",
     ...readOnly.length ? ['(allow file-write* (literal "/dev/null"))'] : [`(allow file-write* (subpath ${q(root)}) (regex #"^/dev/") ${gitDirs.map((d) => `(subpath ${q(d)})`).join(" ")})`],
     `(deny file-write* ${hubWriteRegexes(root, gitDirs, moduleGit, worktrees).join(" ")})`,
+    ...worktrees ? objectStoreRules(dirname9(worktrees)) : [],
     `(deny file-read* file-write* ${creds.map((c) => `(subpath ${q(join12(home, c))})`).join(" ")})`,
     `(deny file-read* file-write* ${denyRegexes(root, deny).join(" ")})`,
     ...network ? [`(allow file-read* ${CA_BUNDLES.map((p) => `(literal ${q(p)})`).join(" ")} (regex ${q("/certifi/cacert\\.pem$")}))`, `(deny file-read* file-write* ${places})`] : []
@@ -6464,6 +6501,7 @@ var init_pi = __esm(() => {
     opts;
     preflight;
     hubNative = true;
+    hubOwned = true;
     proc;
     server;
     buffer = "";
@@ -6577,6 +6615,10 @@ var init_pi = __esm(() => {
       const file = this.sessionFile && (exists || !empty) ? this.sessionFile : undefined;
       return { launch: { kind: "pi", cwd: this.opts.cwd, mode: this.opts.mode, backend: this.opts.backend, ...this.opts.model ? { model: this.opts.model } : {}, ...file ? { sessionFile: file } : {} }, ...this.sessionId ? { sessionId: this.sessionId } : {}, ...file ? { sessionFile: file } : {} };
     }
+    get nativeSession() {
+      const session = this.recoveryMetadata().sessionId;
+      return typeof session === "string" ? session : undefined;
+    }
     async captureResume() {
       if (this.state === "offline") {
         if (this.canReuseVerifiedEmptyResume())
@@ -6941,6 +6983,9 @@ var init_pi = __esm(() => {
     get mode() {
       return this.opts.mode;
     }
+    get form() {
+      return this.opts.mode;
+    }
     async detachForRoster() {
       if (this.opts.mode !== "tui")
         throw new Error("Pi roster detach requires a personal TUI");
@@ -10319,6 +10364,8 @@ var init_local_worker = __esm(() => {
   LocalPeer = class LocalPeer extends BasePeer {
     opts;
     hubNative = true;
+    deliveryOnly = true;
+    hubOwned = true;
     history = [];
     sessionId = `agent-hub-local-${randomUUID6()}`;
     routes;
@@ -11015,6 +11062,7 @@ var init_claude_implementer = __esm(() => {
   ClaudeImplementerPeer = class ClaudeImplementerPeer extends BasePeer {
     options;
     hubNative = true;
+    hubOwned = true;
     generation = 0;
     owned;
     running;
@@ -13995,8 +14043,49 @@ var init_lifecycle = __esm(() => {
   init_shard();
 });
 
+// node_modules/@staix/agent-mem/src/memory/search-score.ts
+function sql(expr, rank) {
+  const get = (part) => sql(part, rank);
+  switch (expr.op) {
+    case "rank":
+      return rank;
+    case "tier":
+      return `CASE tier ${Object.entries(TIER_WEIGHTS).map(([name, value]) => `WHEN '${name}' THEN ${real(value)}`).join(" ")} ELSE ${real(DEFAULT_TIER_WEIGHT)} END`;
+    case "age":
+      return `((julianday(?) - julianday(at)) / ${real(MONTH_DAYS)})`;
+    case "constant":
+      return real(expr.value);
+    case "negative":
+      return `(-(${get(expr.value)}))`;
+    case "reciprocal":
+      return `(1.0 / ${get(expr.value)})`;
+    case "add":
+      return `(${get(expr.left)} + ${get(expr.right)})`;
+    case "multiply":
+      return expr.right.op === "reciprocal" ? `(${get(expr.left)} / ${get(expr.right.value)})` : `(${get(expr.left)} * ${get(expr.right)})`;
+    case "max":
+      return `max(${get(expr.left)}, ${get(expr.right)})`;
+  }
+}
+function rankedScoreSql(rank = "bm25(docs)") {
+  return sql(SCORE, rank);
+}
+var MONTH_DAYS = 30, TIER_WEIGHTS, DEFAULT_TIER_WEIGHT = 0.9, TIER_FACTOR, DENOMINATOR, RECENCY_FACTOR, SCORE, real = (value) => Number.isInteger(value) ? `${value}.0` : String(value);
+var init_search_score = __esm(() => {
+  TIER_WEIGHTS = { long: 1, capture: 0.5 };
+  TIER_FACTOR = { op: "tier" };
+  DENOMINATOR = { op: "add", left: { op: "constant", value: 1 }, right: { op: "max", left: { op: "constant", value: 0 }, right: { op: "age" } } };
+  RECENCY_FACTOR = { op: "reciprocal", value: DENOMINATOR };
+  SCORE = { op: "multiply", left: { op: "multiply", left: { op: "negative", value: { op: "rank" } }, right: TIER_FACTOR }, right: RECENCY_FACTOR };
+});
+
 // node_modules/@staix/agent-mem/src/memory/search-fts.ts
-var init_search_fts = () => {};
+var SCREENED_SCORE, SCREENED_SUBSTRING_SCORE;
+var init_search_fts = __esm(() => {
+  init_search_score();
+  SCREENED_SCORE = rankedScoreSql();
+  SCREENED_SUBSTRING_SCORE = rankedScoreSql("-1.0");
+});
 
 // node_modules/@staix/agent-mem/src/memory/capture-input.ts
 var init_capture_input = __esm(() => {
@@ -14252,6 +14341,7 @@ var init_store = __esm(() => {
   init_machine();
   init_lifecycle();
   init_machine();
+  init_search_score();
   init_search_fts();
   init_shard();
   init_capture();
@@ -21344,7 +21434,8 @@ var MACHINE_LOCAL = [
   "local.read_allow",
   "local.bash_network",
   "local.network_allow",
-  "terminal.open"
+  "terminal.open",
+  "tasks.auto_pull"
 ];
 var ALL_MACHINE_LOCAL = [...MACHINE_LOCAL, "action_policy", "protect_instruction_files", "qwen_cmd", "jcode_cmd", "jcode_home", "jcode_provider_profile", "adapters", "adapter_modules", "text_projection", "instances"];
 function configRefusal(cwd, name) {
@@ -21715,7 +21806,7 @@ var tool2 = (name, description, inputSchema, readOnlyHint = true) => ({
   annotations: { readOnlyHint, destructiveHint: false, openWorldHint: false }
 });
 var MCP_TOOLS = [
-  tool2("amem_search", "Search screened memory in this project. Capture results are recall, not curated evidence.", object6({ query: string(1000), limit, since: string(40), includeCapture: { type: "boolean" } }, ["query"])),
+  tool2("amem_search", "Search screened memory in this project. Capture results are recall, not curated evidence.", object6({ query: string(1000), limit, since: string(40), includeCapture: { type: "boolean" }, explain: { type: "boolean" } }, ["query"])),
   tool2("amem_evidence", "Return a bounded bundle of cited, live curated entries for a question. Untrusted memory data only: no answer or model call. Capture, repo-only notes, pending candidates and model answers are not evidence.", object6({ question: string(1000), limit: { type: "integer", minimum: 1, maximum: 20 }, maxBytes: { type: "integer", minimum: 256, maximum: 8192 } }, ["question"])),
   tool2("amem_show", "Show a screened memory entry in this project by its exact id or unique prefix.", object6({ id: string(80) }, ["id"])),
   tool2("amem_timeline", "Read screened memory near an entry or time in this project.", object6({ id: string(80), since: string(40), limit })),
@@ -21874,7 +21965,7 @@ init_sdlc_metrics();
 // package.json
 var package_default = {
   name: "@staix/agent-hub",
-  version: "0.19.0",
+  version: "0.20.0",
   description: "Native multi-agent hub: Claude Code, Codex, Kimi Code, Pi and local inference as peers in one project",
   license: "MIT",
   type: "module",
@@ -21891,7 +21982,7 @@ var package_default = {
     bun: ">=1.4.2"
   },
   dependencies: {
-    "@staix/agent-mem": "0.10.0"
+    "@staix/agent-mem": "0.11.0"
   },
   devDependencies: {
     "@modelcontextprotocol/sdk": "^1.27.1",
@@ -22007,6 +22098,10 @@ init_registry();
 // src/hub/task-sweep.ts
 var GROOMING_CODES = new Set(["tests", "spec", "roster", "pull-only", "not-attached", "excluded", "owner-admission", "offline", "paused", "failing", "pii", "policy", "cancelled", "unavailable", "runner", "approvals", "quota", "dependency", "no-writes"]);
 
+// src/hub/ci-watch.ts
+init_sdlc();
+var CI_WATCH_DEADLINE_MS = 45 * 60000;
+
 // src/hub/tasks.ts
 init_sdlc();
 init_routing();
@@ -22016,6 +22111,7 @@ var QUIET_EVENTS = new Set(["answer", "reviewer changed", "idle sweep", "memory
 QUIET_EVENTS.add("ready held");
 QUIET_EVENTS.add("plan observed");
 QUIET_EVENTS.add("planner changed");
+QUIET_EVENTS.add("shell branch bound");
 var OWNERSHIP_EVENTS = new Set(["assigned", "escalated", "reassigned", "unassigned"]);
 var GROOM_FYI_WINDOW_MS = 10 * 60000;
 

package/src/adapters/acp.ts

@@ -10,6 +10,7 @@ export { QwenIdentityError } from "./definitions/qwen-native.ts";
 import { BasePeer } from "../hub/peers.ts";
 import { peerChildEnv, stopOwnedProcess, trackGroup } from "../hub/child-process.ts";
 import { AcpOwnedGroup } from "./acp-owned-group.ts";
+import type { StartForm } from "./registry-types.ts";
 
 export interface PermissionOption {
   optionId: string;
@@ -163,6 +164,9 @@ function jsonObject(text: string | undefined): object | undefined {
 
 /** ACP client (JSON-RPC 2.0, newline-delimited, over the child's stdio). One session, one prompt in flight. */
 export class AcpPeer extends BasePeer {
+  readonly deliveryOnly: boolean = true;
+  readonly hubOwned: boolean = true;
+  readonly form: StartForm = "headless";
   private permissionMode: PermissionMode;
   private readonly nativePolicy: AcpOptions["nativePolicy"];
   private modeUnknown = false;
@@ -256,6 +260,10 @@ export class AcpPeer extends BasePeer {
   recoveryMetadata(): Record<string, unknown> {
     return { launch: { kind: "acp", ...(this.opts.launchModel ? { model: this.opts.launchModel } : {}) }, ...(this.sessionId ? { sessionId: this.sessionId } : {}) };
   }
+  get nativeSession(): string | undefined {
+    const session = this.recoveryMetadata().sessionId;
+    return typeof session === "string" ? session : undefined;
+  }
 
   async start(): Promise<void> {
     if (this.opts.requireOwnedGroup && this.proc) throw new Error("Configured ACP still has a process; stop it before starting another");

package/src/adapters/channel-peer.ts

@@ -1,6 +1,7 @@
 import { BasePeer, type PeerAdapter } from "../hub/peers.ts";
 import type { Envelope } from "../hub/envelope.ts";
 import { definitionOf } from "./registry.ts";
+import type { StartForm } from "./registry-types.ts";
 
 /** Only the control socket operations the peer owns; authentication remains in the daemon. */
 export interface ChannelSocket {
@@ -12,6 +13,7 @@ export interface ChannelSocket {
 
 /** A peer that lives in another process and attaches over the control WS (the Claude channel plugin). */
 export class WsPeer extends BasePeer {
+  readonly form: StartForm = "tui";
   private generation = crypto.randomUUID();
   // Checkpoints become stale at hello/claim, before asynchronous recall finishes and attach changes delivery generation.
   private claimGeneration = crypto.randomUUID();
@@ -23,7 +25,7 @@ export class WsPeer extends BasePeer {
   private delivered = new Set<string>();
   private sock: ChannelSocket | undefined;
   private claimed: ChannelSocket | undefined;
-  private nativeSession: string | undefined;
+  private nativeTurnSession: string | undefined;
   private nativeActive = false;
   /** The attached session said it cannot show channel pushes (issue #205): the bus keeps its queue for `inbox`. */
   pullOnly = false;
@@ -66,7 +68,7 @@ export class WsPeer extends BasePeer {
     this.sock = sock;
     this.generation = crypto.randomUUID();
     this.delivered.clear();
-    this.nativeSession = undefined;
+    this.nativeTurnSession = undefined;
     this.nativeActive = false;
     this.pullOnly = this.claimedPullOnly; // before idle: the idle transition drains
     // Native TUI readback in #493 proves important channel input can be consumed before the turn ends.
@@ -112,13 +114,13 @@ export class WsPeer extends BasePeer {
   owns(sock: ChannelSocket): boolean { return this.sock === sock; }
   nativeStarted(session: string): void {
     if (!this.sock) return;
-    this.nativeSession = session;
+    this.nativeTurnSession = session;
     this.nativeActive = true;
     this.setState("busy");
   }
   nativeStopped(session: string): boolean {
-    if (!this.sock || (this.nativeSession !== undefined && this.nativeSession !== session)) return false;
-    this.nativeSession = session;
+    if (!this.sock || (this.nativeTurnSession !== undefined && this.nativeTurnSession !== session)) return false;
+    this.nativeTurnSession = session;
     this.nativeActive = false;
     this.setState("idle");
     return true;

package/src/adapters/claude-implementer.ts

@@ -72,6 +72,7 @@ export async function proveClaudeImplementer(peer: string, command: readonly str
 /** One owned print child at a time. Idle holds no native process; task continuity is ids-only on disk. */
 export class ClaudeImplementerPeer extends BasePeer {
   readonly hubNative = true;
+  readonly hubOwned: boolean = true;
   private generation = 0;
   private owned: OwnedPrintChild | undefined;
   private running: Promise<void> | undefined;

package/src/adapters/codex-appserver.ts

@@ -2,7 +2,7 @@ import { spawn, type ChildProcess } from "node:child_process";
 import type { Server, ServerWebSocket } from "bun";
 import { renderDigest, replyAudience, replyParent, type Envelope, type PeerId } from "../hub/envelope.ts";
 import type { PermissionMode } from "../hub/permission-mode.ts";
-import { BasePeer } from "../hub/peers.ts";
+import { BasePeer, type FrontendProxyPort } from "../hub/peers.ts";
 import { codexContext, type ContextReading } from "../hub/context-window.ts";
 import { peerChildEnv, stopOwnedProcess, trackGroup } from "../hub/child-process.ts";
 import type { ContextReader } from "./registry-types.ts";
@@ -82,6 +82,7 @@ const TRACKED = new Set(["thread/start", "thread/resume"]);
  * TUI's, and their responses are swallowed.
  */
 export class CodexPeer extends BasePeer {
+  readonly frontendProxy: FrontendProxyPort;
   private permissionMode: PermissionMode;
   private readonly actionWaits = new Map<AbortController, { link: Link; turn: string | undefined }>();
   get actionGated(): boolean { return this.opts.actionGate !== undefined; }
@@ -136,6 +137,13 @@ export class CodexPeer extends BasePeer {
   ) {
     super(id, opts.watchdogMs);
     this.permissionMode = opts.permissionMode ?? "ask";
+    const owner = this;
+    this.frontendProxy = {
+      get url() { return owner.proxyUrl; },
+      get attached() { return owner.proxyAttached; },
+      setStartupPermissionMode: this.setStartupPermissionMode.bind(this),
+      clearPermissionMode: this.clearPermissionMode.bind(this),
+    };
   }
 
   recoveryMetadata(): Record<string, unknown> {
@@ -149,6 +157,7 @@ export class CodexPeer extends BasePeer {
   get thread(): string {
     return this.threadId;
   }
+  get nativeSession(): string | undefined { return this.threadId || undefined; }
 
   get proxyUrl(): string {
     return `ws://127.0.0.1:${this.server?.port ?? this.opts.proxyPort}`;
@@ -694,6 +703,7 @@ export class CodexPeer extends BasePeer {
       link.up.send(JSON.stringify({ method: "thread/revert", id, params: { threadId: this.threadId, beforeTurnId: turnId } }));
     });
   }
+  revertTurn(nativeTurn: string): Promise<void> { return this.revert(nativeTurn); }
 
   /** account/rateLimits/read through the TUI's connection, with a hub id so the answer never reaches the TUI. */
   private readUsage(): void {

package/src/adapters/conformance/enrollment.ts

@@ -4,7 +4,7 @@ import { isFixedBuiltinDefinition } from "../registry.ts";
 /** Stable generic ACP legs; both actual test registration and enrollment validation consume this catalog. */
 export const ACP_LEGS = Object.freeze(["native-approval-rpc", "native-mode-ack", "native-quota", "watchdog-generation"] as const);
 export type AcpLeg = typeof ACP_LEGS[number];
-/** Reserved until 2b supplies the restrictive ACP product members; not an executable ACP leg yet. */
+/** Mandatory product invariant, asserted for generic and owned ACP factories rather than skipped protocol legs. */
 export const ACP_PORTS_LEG = "restrictive-ports";
 export const NATIVE_PROOF_PORTS_LEG = "native-proof-ports";
 /** No unsupported key or non-generic ACP engine can silently escape an executable catalog leg. */
@@ -18,8 +18,9 @@ export function assertAcpLegEnrollment(definitions: readonly AdapterDefinition[]
       if (!row || !isFixedBuiltinDefinition(row.definition)) throw new Error(`${key}: only fixed builtin proof legs may be nonapplicable`);
       continue;
     }
-    if (separator < 1 || !acp.has(kind) || !(ACP_LEGS as readonly string[]).includes(leg) && leg !== ACP_PORTS_LEG) throw new Error(`${key}: stale or unknown unsupported ACP leg`);
-    if (leg === ACP_PORTS_LEG && reason !== "ports added in 2b") throw new Error(`${key}: reserved ACP ports leg requires reason ports added in 2b`);
+    if (separator < 1 || !acp.has(kind)) throw new Error(`${key}: stale or unknown unsupported ACP leg`);
+    if (leg === ACP_PORTS_LEG) throw new Error(`${key}: mandatory ACP restrictive ports leg cannot be unsupported`);
+    if (!(ACP_LEGS as readonly string[]).includes(leg)) throw new Error(`${key}: stale or unknown unsupported ACP leg`);
   }
   for (const definition of acp.values()) if (definition.start.daemonPort !== "acp") {
     for (const leg of ACP_LEGS) {
@@ -50,7 +51,6 @@ export function assertEnrollment(definitions: readonly AdapterDefinition[], enro
   }
   for (const { id, definition } of rows) {
     if (isFixedBuiltinDefinition(definition) && !Object.hasOwn(unsupportedLegs, `${id}:${NATIVE_PROOF_PORTS_LEG}`)) throw new Error(`${id}: native proof ports need an explicit nonapplicable reason`);
-    if (definition.transport === "acp" && !Object.hasOwn(unsupportedLegs, `${id}:${ACP_PORTS_LEG}`)) throw new Error(`${id}: ACP restrictive ports require the reserved 2b reason`);
     if (!enrolled.includes(id) && !Object.hasOwn(unsupported, id)) throw new Error(`${id}: no conformance fixture or unsupported reason`);
     if (definition.transport === "acp" && !enrolled.includes(id)) throw new Error(`${id}: every ACP definition must run the ACP legs`);
     if (id.endsWith(":reviewer") && !definition.reviewer) throw new Error(`${id}: reviewer variant lacks reviewer policy`);

package/src/adapters/conformance/factories.ts

@@ -1,7 +1,7 @@
 import type { AdapterDefinition, CreateContext, DaemonPorts } from "../registry-types.ts";
 import type { PeerAdapter } from "../../hub/peers.ts";
 import { join } from "node:path";
-import { assertNativeProofPorts } from "./kit.ts";
+import { assertAcpProductPorts, assertNativeProofPorts } from "./kit.ts";
 
 /** The supplied definition creates its actual adapter, with only this fixture's transport options. */
 export function createFromDefinition<T extends PeerAdapter>(definition: AdapterDefinition, daemon: DaemonPorts): T {
@@ -10,6 +10,7 @@ export function createFromDefinition<T extends PeerAdapter>(definition: AdapterD
   const product = definition.start.create({ instance: definition.kind, projectRoot: options.cwd, stateDir: options.stateDir ?? join(options.cwd, "state"),
     kindConfig: {}, permission: "ask", mcpServers: options.mcpServers ?? [], daemon }) as T;
   assertNativeProofPorts(definition, product);
+  assertAcpProductPorts(definition, product);
   return product;
 }
 /** Explicit watchdog seam on the factory-created implementation, replacing direct test subclasses. */

package/src/adapters/conformance/kit.ts

@@ -24,6 +24,15 @@ export interface AdapterConformance {
   create(): Promise<ConformanceFixture>;
 }
 
+/** Every ACP factory product keeps the transport's restrictive delivery and ownership contract. */
+export function assertAcpProductPorts(definition: AdapterDefinition | undefined, product: PeerAdapter): void {
+  if (definition?.transport !== "acp") return;
+  for (const port of ["deliveryOnly", "hubOwned"] as const) {
+    if (product[port] !== true) throw new Error(`${definition.kind}: ACP restrictive port ${port} must be true`);
+  }
+  if (product.form !== "headless") throw new Error(`${definition.kind}: ACP restrictive port form must be headless`);
+}
+
 /** Presence itself is forbidden on a foreign product: even an undefined native proof port must fail the kit. */
 export function assertNativeProofPorts(definition: AdapterDefinition | undefined, product: PeerAdapter): void {
   if (isFixedBuiltinDefinition(definition)) return;
@@ -38,6 +47,7 @@ export function registerConformance(adapter: AdapterConformance): void {
     const f = await adapter.create();
     try {
       assertNativeProofPorts(adapter.definition, f.peer);
+      assertAcpProductPorts(adapter.definition, f.peer);
       expect(f.peer.id).toBe(adapter.kind);
       expect(f.peer.state).toBe("idle");
       const envelope: Envelope = newEnvelope("user", "conformance ping", { to: [adapter.kind] });

package/src/adapters/local-worker.ts

@@ -77,6 +77,8 @@ const system = (cwd: string, preamble = "") =>
 /** Hub-native agent loop: the hub owns every model call, so it can choose the model per call (L2) and the gateway (L3). */
 export class LocalPeer extends BasePeer {
   readonly hubNative = true;
+  readonly deliveryOnly: boolean = true;
+  readonly hubOwned: boolean = true;
   private readonly history: ChatMessage[] = [];
   private readonly sessionId = `agent-hub-local-${randomUUID()}`;
   private readonly routes: HubRouteRuntime;

package/src/adapters/pi.ts

@@ -12,6 +12,7 @@ import { PiSessionBookmarkMismatch, validatePiSession } from "../pi/session.ts";
 import { ApprovalWaitStop, toolResultFailed, type ApprovalProvenance } from "../local/tools.ts";
 import { piToolStepCeiling, type PiToolStepCeiling } from "../pi/ceiling.ts";
 import type { ExecutionBudgetDecision, ExecutionUnit } from "../hub/execution-budget.ts";
+import type { StartForm } from "./registry-types.ts";
 
 export interface PiModelDescriptor { id: string; name?: string; contextWindow?: number; maxTokens?: number; reasoning?: boolean; }
 export interface PiToolSchema { name: string; description?: string; parameters: Record<string, unknown>; }
@@ -99,6 +100,7 @@ function ownerStillAlive(pid: number, signature: string | undefined): boolean {
 
 export class PiPeer extends BasePeer {
   readonly hubNative = true;
+  readonly hubOwned: boolean = true;
   private proc?: ChildProcessWithoutNullStreams;
   private server?: ReturnType<typeof Bun.serve>;
   private buffer = "";
@@ -202,6 +204,10 @@ export class PiPeer extends BasePeer {
     const file = this.sessionFile && (exists || !empty) ? this.sessionFile : undefined;
     return { launch: { kind: "pi", cwd: this.opts.cwd, mode: this.opts.mode, backend: this.opts.backend, ...(this.opts.model ? { model: this.opts.model } : {}), ...(file ? { sessionFile: file } : {}) }, ...(this.sessionId ? { sessionId: this.sessionId } : {}), ...(file ? { sessionFile: file } : {}) };
   }
+  get nativeSession(): string | undefined {
+    const session = this.recoveryMetadata().sessionId;
+    return typeof session === "string" ? session : undefined;
+  }
 
   /** Verify the live source before choosing ID-only restoration. Never infer emptiness from a missing file. */
   async captureResume(): Promise<Record<string, unknown>> {
@@ -502,6 +508,7 @@ export class PiPeer extends BasePeer {
     return pending.map((call) => call.settled);
   }
   get mode(): "headless" | "tui" { return this.opts.mode; }
+  get form(): StartForm { return this.opts.mode; }
 
   /** Withdraw hub admission without shutting down a person's Pi TUI or its bridge. */
   async detachForRoster(): Promise<void> {

package/src/adapters/reviewer-print.ts

@@ -156,6 +156,7 @@ const reviewTask = (env: Envelope): number | undefined => {
 
 export class ReviewerPrintPeer extends BasePeer {
   readonly hubNative = true;
+  readonly hubOwned: boolean = true;
   private generation = 0;
   private child: OwnedPrintChild | undefined;
   private childCleanup: (() => Promise<void>) | undefined;