allye-pi 1.6.1 → 1.7.0

package/docs/install-pi.md

@@ -81,8 +81,9 @@ adaptive toolkit in the current session. Use `/allye-capabilities` to inspect
 Allye/MCP, filesystem, subagent, and Herdr capabilities.
 
 When `HERDR_ENV=1`, the optional `allye_herdr` tool provides bounded `detect`,
-`spawn`, `dispatch`, `wait`, and Allye-backed `collect` operations. Without it,
-Pi continues locally. Herdr and subagents are capabilities, not prerequisites.
+`workspace`, `tab`, `spawn`, `dispatch`, `status`, `mark_intervened`, `wait`,
+`collect`, and ownership-guarded `cleanup` operations. Without it, Pi continues
+locally. Herdr and subagents are capabilities, not prerequisites.
 Tasks are recommended for meaningful, delegated, multi-step, or review-heavy
 work, but an explicitly approved no-task path is supported.
 
@@ -138,6 +139,8 @@ Manual `herdr agent wait` commands started outside this Pi session (for example
 with `nohup` or Bash) do not wake Pi and do not generate this notification.
 
 A real Herdr dispatch still requires `HERDR_ENV=1`, a compatible Herdr session,
-and an existing isolated worktree. Pi records workspace/tab/pane/agent ownership
-for safe teardown; it never adopts foreign panes, stops Herdr, closes panes,
-merges, pushes, or publishes without explicit authorization.
+and an existing isolated worktree. Pi records execution IDs plus
+workspace/tab/pane/agent ownership for safe teardown; it never adopts foreign
+panes, stops Herdr, closes panes, merges, pushes, or publishes without explicit
+authorization. Cleanup is only allowed after a settled and collected execution;
+blocked, unknown, timed-out, interrupted, or manually assumed resources remain open.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allye-pi",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Pi package adapter for the canonical Allye workflow",
   "type": "module",
   "keywords": [

package/packages/allye-pi/src/index.ts

@@ -3,6 +3,7 @@ import { promisify } from "node:util";
 import { dirname, resolve } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { randomUUID } from "node:crypto";
 import { Type } from "typebox";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
@@ -26,9 +27,9 @@ type StartupContext = {
   allyeUnavailable: boolean;
   teams: Array<{ id: string; name: string; prefix?: string }>;
 };
-type WaitRegistrar = (name: string, timeoutMs: number) => Record<string, unknown>;
+type WaitRegistrar = (name: string, timeoutMs: number, execution?: DelegationExecution) => Record<string, unknown>;
 type WaitCanceller = (name: string) => void;
-export type WaitOutcome = "completed" | "timeout" | "error" | "aborted";
+export type WaitOutcome = "completed" | "blocked" | "unknown" | "timeout" | "error" | "aborted";
 export type WaitExecutionResult = {
   code: number;
   killed: boolean;
@@ -36,6 +37,8 @@ export type WaitExecutionResult = {
   stderr: string;
 };
 export type WaitEvent = {
+  kind?: "settled" | "intervened";
+  executionId?: string;
   name: string;
   timeoutMs: number;
   outcome: WaitOutcome;
@@ -66,10 +69,37 @@ export type OwnedPane = {
   tabId: string;
   paneId: string;
   agentName?: string;
+  resourceId?: string;
+};
+export type OwnedResource = {
+  resourceId: string;
+  level: "pane" | "tab" | "workspace";
+  workspaceId: string;
+  tabId?: string;
+  paneId?: string;
+  createdAt: string;
+};
+export type DelegationExecution = {
+  executionId: string;
+  callerPaneId?: string;
+  workspaceId: string;
+  tabId: string;
+  paneId: string;
+  resourceLevel: "pane" | "tab" | "workspace";
+  resourceId?: string;
+  worktree: string;
+  agentName?: string;
+  status: "created" | "working" | "settled" | "blocked" | "unknown" | "intervened" | "cleaned";
+  runtimeState?: "working" | "idle" | "done" | "blocked" | "unknown";
+  manualIntervention: boolean;
+  createdAt: string;
+  settledAt?: string;
 };
 export type DelegationState = {
   panes: OwnedPane[];
+  resources: Map<string, OwnedResource>;
   waits: Set<string>;
+  executions: Map<string, DelegationExecution>;
 };
 const WAIT_EVENT_TYPE = "allye-herdr-wait";
 const RUNTIME_TOOL_NAME = "allye_herdr";
@@ -87,10 +117,17 @@ function limitText(text: string, maxChars: number): string {
   return text.length <= maxChars ? text : `${text.slice(0, maxChars)}\n[context truncated]`;
 }
 
-export function describeCapabilities(env: NodeJS.ProcessEnv = process.env): AllyeCapabilities {
+type McpBridgeRuntime = typeof globalThis & {
+  __piMcpAdapterActiveToolCaller?: ActiveMcpToolCaller | null;
+};
+
+export function describeCapabilities(
+  env: NodeJS.ProcessEnv = process.env,
+  mcpAvailable = Boolean((globalThis as McpBridgeRuntime).__piMcpAdapterActiveToolCaller),
+): AllyeCapabilities {
   return {
     piSession: true,
-    allyeMcp: env.ALLYE_PI_MCP !== "0",
+    allyeMcp: env.ALLYE_PI_MCP !== "0" && mcpAvailable,
     filesystem: true,
     subagents: env.ALLYE_PI_SUBAGENTS === "1",
     herdr: env.HERDR_ENV === "1",
@@ -133,9 +170,7 @@ async function configuredMcpCall(toolName: string, args: Record<string, unknown>
   // the in-process runtime. There is no public callMcpTool export in the
   // supported package version, so do not dynamically import its TypeScript
   // source from node_modules. A missing bridge is a hard bootstrap failure.
-  const globalBridge = (globalThis as typeof globalThis & {
-    __piMcpAdapterActiveToolCaller?: ActiveMcpToolCaller | null;
-  }).__piMcpAdapterActiveToolCaller;
+  const globalBridge = (globalThis as McpBridgeRuntime).__piMcpAdapterActiveToolCaller;
   if (!globalBridge) throw new Error("pi-mcp-adapter is not initialized; start the configured MCP adapter before using Allye");
   return globalBridge(MCP_SERVER, toolName, args);
 }
@@ -182,6 +217,11 @@ export function classifyWaitResult(result?: WaitExecutionResult, timeoutMs = 0,
   const errorText = error instanceof Error ? error.message : String(error ?? "");
   if (/abort/i.test(errorText)) return "aborted";
   if (/timeout|timed out/i.test(errorText) || Boolean(result?.killed && timeoutMs > 0)) return "timeout";
+  if (/blocked/i.test(errorText)) return "blocked";
+  if (/unknown/i.test(errorText)) return "unknown";
+  const runtimeState = result ? extractAgentLifecycleState(parseJson(result.stdout)) ?? extractAgentLifecycleState(parseJson(result.stderr)) : null;
+  if (runtimeState === "blocked") return "blocked";
+  if (runtimeState === "unknown") return "unknown";
   if (!result || result.code !== 0) return "error";
   return "completed";
 }
@@ -195,7 +235,8 @@ export function shouldEmitWaitEvent(shuttingDown: boolean, settledWaits: Set<str
 export function formatWaitEvent(event: WaitEvent): string {
   const output = event.stdout?.trim() || "(no stdout)";
   const error = event.error || event.stderr?.trim() || "(none)";
-  return `Herdr wait settled for agent ${event.name}. Outcome: ${event.outcome}. `
+  const prefix = event.kind === "intervened" ? "Herdr agent intervention detected" : "Herdr wait settled";
+  return `${prefix} for agent ${event.name}. Outcome: ${event.outcome}. `
     + `This is delegation evidence only, not a completion verdict. `
     + `Use allye_herdr collect when a managed work item exists: read work_children for the story and search Allye memories for Review and Implementation evidence before declaring completion.\n\n`
     + `timeout_ms=${event.timeoutMs} code=${event.code ?? "n/a"} killed=${event.killed ?? false} timestamp=${event.timestamp}\n`
@@ -203,7 +244,7 @@ export function formatWaitEvent(event: WaitEvent): string {
 }
 
 export function waitEventNotificationLevel(event: WaitEvent): "info" | "warning" | "error" {
-  if (event.outcome === "error") return "error";
+  if (event.outcome === "error" || event.outcome === "blocked" || event.outcome === "unknown") return "error";
   if (event.outcome === "timeout") return "warning";
   return "info";
 }
@@ -255,8 +296,8 @@ export function deliverWaitEvent(
 
 export function invalidStartupContext(message: string): StartupContext {
   return {
-    text: `## Allye bootstrap blocked\n${message}\nDo not call team-scoped work_items or intelligence operations. Resolve Allye connectivity and explicitly select a team with allye_team action team_switch before continuing.`,
-    teamSelectionRequired: true,
+    text: `## Allye optional context unavailable\n${message}\nDo not call team-scoped work_items or intelligence operations until Allye connectivity and team context are available. Continue with local, non-team-scoped work when appropriate.`,
+    teamSelectionRequired: false,
     allyeUnavailable: true,
     teams: [],
   };
@@ -266,7 +307,8 @@ export function canUseOwnedPane(state: DelegationState, paneId: string): boolean
   return state.panes.some((pane) => pane.paneId === paneId);
 }
 
-async function loadStartupContext(): Promise<StartupContext> {
+async function loadStartupContext(allyeMcp = true): Promise<StartupContext> {
+  if (!allyeMcp) return invalidStartupContext("Allye/MCP is disabled for this Pi session.");
   const sections: string[] = [];
   try {
     const initialization = await callAllye("allye_initialize", {
@@ -406,9 +448,30 @@ export function activeToolsForCapabilities(activeTools: string[], capabilities:
   return [...next];
 }
 
+export type AgentLifecycleState = "working" | "idle" | "done" | "blocked" | "unknown";
+
+export function extractAgentLifecycleState(value: unknown): AgentLifecycleState | null {
+  if (!value || typeof value !== "object") return null;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const state = extractAgentLifecycleState(item);
+      if (state) return state;
+    }
+    return null;
+  }
+  const object = value as Record<string, unknown>;
+  const raw = object.agent_status;
+  if (raw === "working" || raw === "idle" || raw === "done" || raw === "blocked" || raw === "unknown") return raw;
+  for (const child of Object.values(object)) {
+    const state = extractAgentLifecycleState(child);
+    if (state) return state;
+  }
+  return null;
+}
+
 export function dispatchStateIsAcceptable(stateText: string): boolean {
-  if (/blocked|unknown/i.test(stateText)) return false;
-  return /working|idle|done/i.test(stateText);
+  const state = extractAgentLifecycleState(parseJson(stateText));
+  return state === "working" || state === "idle" || state === "done";
 }
 
 function requireHerdr(capabilities: AllyeCapabilities): void {
@@ -422,6 +485,23 @@ function requireAbsolutePath(value: unknown, name: string): string {
   return value;
 }
 
+async function cleanupExecution(execution: DelegationExecution, ownership: DelegationState): Promise<unknown> {
+  if (execution.status === "working" || execution.status === "blocked" || execution.status === "unknown" || execution.manualIntervention) {
+    throw new Error(`execution ${execution.executionId} is not safe to clean up while status=${execution.status}`);
+  }
+  const resourceId = execution.resourceId;
+  if (!resourceId) return { cleaned: false, reason: "execution has no owned resource" };
+  const resource = ownership.resources.get(resourceId);
+  if (!resource) return { cleaned: false, reason: "owned resource is already absent" };
+  if (resource.level === "pane" && resource.paneId) await runHerdr(["pane", "close", resource.paneId]);
+  else if (resource.level === "tab" && resource.tabId) await runHerdr(["tab", "close", resource.tabId]);
+  else if (resource.level === "workspace") await runHerdr(["workspace", "close", resource.workspaceId]);
+  execution.status = "cleaned";
+  ownership.resources.delete(resourceId);
+  ownership.panes = ownership.panes.filter((pane) => pane.resourceId !== resourceId);
+  return { cleaned: true, resource };
+}
+
 async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<string, unknown>, registerWait: WaitRegistrar, cancelWait: WaitCanceller, ownership: DelegationState): Promise<unknown> {
   const operation = params.operation;
   if (operation === "detect") {
@@ -436,6 +516,45 @@ async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<
 
   requireHerdr(capabilities);
 
+  if (operation === "workspace") {
+    const cwd = requireAbsolutePath(params.cwd, "cwd");
+    if (typeof params.worktree === "string" && params.worktree !== cwd) throw new Error("workspace cwd must match the requested worktree; use worktree management before creating a workspace");
+    const label = typeof params.label === "string" && params.label.trim() ? params.label.trim() : `allye-${randomUUID().slice(0, 8)}`;
+    const focus = params.focus === true ? "--focus" : "--no-focus";
+    const resource = herdrResult(await runHerdr(["workspace", "create", "--cwd", cwd, "--label", label, focus]));
+    const record = resource as Record<string, unknown>;
+    const workspace = record.workspace as Record<string, unknown> | undefined;
+    const tab = record.tab as Record<string, unknown> | undefined;
+    const rootPane = record.root_pane as Record<string, unknown> | undefined;
+    const workspaceId = typeof workspace?.workspace_id === "string" ? workspace.workspace_id : "";
+    const tabId = typeof tab?.tab_id === "string" ? tab.tab_id : "";
+    const paneId = typeof rootPane?.pane_id === "string" ? rootPane.pane_id : "";
+    if (!workspaceId || !tabId || !paneId) throw new Error("Herdr workspace response did not include workspace, tab, and root pane identifiers");
+    ownership.resources.set(workspaceId, { resourceId: workspaceId, level: "workspace", workspaceId, tabId, paneId, createdAt: new Date().toISOString() });
+    ownership.panes.push({ workspaceId, tabId, paneId, resourceId: workspaceId });
+    return { created: true, level: "workspace", resource };
+  }
+
+  if (operation === "tab") {
+    const workspace = typeof params.workspaceId === "string" ? params.workspaceId : "";
+    const cwd = requireAbsolutePath(params.cwd, "cwd");
+    const label = typeof params.label === "string" && params.label.trim() ? params.label.trim() : `task-${randomUUID().slice(0, 8)}`;
+    const focus = params.focus === true ? "--focus" : "--no-focus";
+    const args = ["tab", "create", "--workspace", workspace, "--cwd", cwd, "--label", label, focus];
+    if (!workspace) throw new Error("tab creation requires workspaceId");
+    const resource = herdrResult(await runHerdr(args));
+    const record = resource as Record<string, unknown>;
+    const tab = record.tab as Record<string, unknown> | undefined;
+    const rootPane = record.root_pane as Record<string, unknown> | undefined;
+    const tabId = typeof tab?.tab_id === "string" ? tab.tab_id : "";
+    const paneId = typeof rootPane?.pane_id === "string" ? rootPane.pane_id : "";
+    if (!tabId || !paneId) throw new Error("Herdr tab response did not include tab and root pane identifiers");
+    const resourceId = `${workspace}:${tabId}`;
+    ownership.resources.set(resourceId, { resourceId, level: "tab", workspaceId: workspace, tabId, paneId, createdAt: new Date().toISOString() });
+    ownership.panes.push({ workspaceId: workspace, tabId, paneId, resourceId });
+    return { created: true, level: "tab", resource };
+  }
+
   if (operation === "spawn") {
     const cwd = requireAbsolutePath(params.cwd, "cwd");
     const worktree = requireAbsolutePath(params.worktree, "worktree");
@@ -456,9 +575,11 @@ async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<
       && candidate.workspaceId === String(layoutMetadata.workspace_id ?? candidate.workspaceId)
       && candidate.tabId === String(layoutMetadata.tab_id ?? candidate.tabId));
     if (!record) throw new Error("Herdr returned a pane without workspace/tab ownership metadata");
-    ownership.panes.push(record);
+    const resourceId = `${record.workspaceId}:${record.tabId}:${record.paneId}`;
+    ownership.resources.set(resourceId, { resourceId, level: "pane", workspaceId: record.workspaceId, tabId: record.tabId, paneId: record.paneId, createdAt: new Date().toISOString() });
+    ownership.panes.push({ ...record, resourceId });
     await waitForInteractiveShell(newPane);
-    return { pane: newPane, worktree, cwd, direction, ready: true, ownership: record };
+    return { pane: newPane, worktree, cwd, direction, ready: true, ownership: { ...record, resourceId } };
   }
 
   if (operation === "dispatch") {
@@ -490,7 +611,23 @@ async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<
     // A fast agent can already be idle/done by the time it is inspected. The
     // server-owned wait is registered immediately so that completion is not
     // lost and a fast, successful turn is not falsely rejected.
-    const wait = registerWait(name, 3_600_000);
+    const execution: DelegationExecution = {
+      executionId: randomUUID(),
+      callerPaneId: process.env.HERDR_PANE_ID,
+      workspaceId: ownedPane.workspaceId,
+      tabId: ownedPane.tabId,
+      paneId: ownedPane.paneId,
+      resourceLevel: "pane",
+      resourceId: ownedPane.resourceId,
+      worktree,
+      agentName: name,
+      status: "working",
+      runtimeState: "working",
+      manualIntervention: false,
+      createdAt: new Date().toISOString(),
+    };
+    ownership.executions.set(execution.executionId, execution);
+    const wait = registerWait(name, 3_600_000, execution);
     let agentState: unknown;
     try {
       agentState = herdrResult(await runHerdr(["agent", "get", name]));
@@ -508,10 +645,33 @@ async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<
       started: herdrResult(start),
       state: agentState,
       wait,
+      execution,
       ownership: ownedPane,
     };
   }
 
+  if (operation === "status") {
+    const executionId = params.executionId;
+    if (typeof executionId !== "string") throw new Error("status requires executionId");
+    const execution = ownership.executions.get(executionId);
+    if (!execution) throw new Error(`execution ${executionId} is not owned by this Pi session`);
+    if (execution.agentName) {
+      const current = extractAgentLifecycleState(herdrResult(await runHerdr(["agent", "get", execution.agentName])));
+      if (current) execution.runtimeState = current;
+    }
+    return execution;
+  }
+
+  if (operation === "mark_intervened") {
+    const executionId = params.executionId;
+    if (typeof executionId !== "string") throw new Error("mark_intervened requires executionId");
+    const execution = ownership.executions.get(executionId);
+    if (!execution) throw new Error(`execution ${executionId} is not owned by this Pi session`);
+    execution.manualIntervention = true;
+    execution.status = "intervened";
+    return execution;
+  }
+
   if (operation === "wait") {
     const name = params.name;
     if (typeof name !== "string" || !AGENT_NAME.test(name)) throw new Error("valid agent name is required");
@@ -520,6 +680,14 @@ async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<
     return registerWait(name, timeout);
   }
 
+  if (operation === "cleanup") {
+    const executionId = params.executionId;
+    if (typeof executionId !== "string") throw new Error("cleanup requires executionId");
+    const execution = ownership.executions.get(executionId);
+    if (!execution) throw new Error(`execution ${executionId} is not owned by this Pi session`);
+    return cleanupExecution(execution, ownership);
+  }
+
   if (operation === "collect") {
     const storyId = params.storyId;
     if (typeof storyId !== "string" || storyId.length === 0) throw new Error("collect requires the story UUID as storyId");
@@ -528,7 +696,7 @@ async function runtimeOperation(capabilities: AllyeCapabilities, params: Record<
     const review = await callAllye("allye_intelligence", { action: "memory_search", query: reviewQuery, limit: 10, return_content: true });
     const implementationQuery = typeof params.taskKey === "string" ? `Implementation ${params.taskKey}` : `Implementation ${storyId}`;
     const implementation = await callAllye("allye_intelligence", { action: "memory_search", query: implementationQuery, limit: 10, return_content: true });
-    return { storyChildren: story, review, implementation };
+    return { storyChildren: story, review, implementation, cleanupAvailable: typeof params.executionId === "string" };
   }
 
   throw new Error(`Unknown runtime operation: ${String(operation)}`);
@@ -540,15 +708,19 @@ function registerRuntimeTool(pi: ExtensionAPI, getCapabilities: () => AllyeCapab
     label: "Allye Runtime",
     description: "Use optional Herdr capabilities for delegation, waiting, and collecting results when available.",
     parameters: Type.Object({
-      operation: Type.String({ description: "detect | spawn | dispatch | wait | collect" }),
+      operation: Type.String({ description: "detect | workspace | tab | spawn | dispatch | status | mark_intervened | wait | collect | cleanup" }),
       cwd: Type.Optional(Type.String({ description: "Absolute plugin-enabled repository root for spawn" })),
       worktree: Type.Optional(Type.String({ description: "Absolute isolated worktree path; required for spawn/dispatch" })),
+      workspaceId: Type.Optional(Type.String({ description: "Workspace id for tab creation" })),
+      label: Type.Optional(Type.String({ description: "Human-readable workspace/tab label" })),
+      focus: Type.Optional(Type.Boolean({ description: "Focus newly created workspace/tab" })),
       direction: Type.Optional(Type.String({ description: "right or down" })),
       pane: Type.Optional(Type.String({ description: "Pane id returned by Herdr" })),
       name: Type.Optional(Type.String({ description: "Stable Herdr agent name" })),
       kind: Type.Optional(Type.String({ description: "Herdr agent kind, normally pi" })),
       briefing: Type.Optional(Type.String({ description: "Complete story briefing, including the absolute worktree path" })),
       timeoutMs: Type.Optional(Type.Number({ description: "Bounded wait timeout in milliseconds" })),
+      executionId: Type.Optional(Type.String({ description: "Caller execution id for status/intervention/cleanup" })),
       storyId: Type.Optional(Type.String({ description: "Allye story UUID for collect" })),
       storyKey: Type.Optional(Type.String({ description: "Story key for review memory search" })),
       taskKey: Type.Optional(Type.String({ description: "Task key for implementation memory search" })),
@@ -574,9 +746,9 @@ export default function allyePiAdapter(pi: ExtensionAPI): void {
   let activeContext: ExtensionContext | undefined;
   const waits = new Map<string, AbortController>();
   const settledWaits = new Set<string>();
-  const ownership: DelegationState = { panes: [], waits: new Set() };
+  const ownership: DelegationState = { panes: [], resources: new Map(), waits: new Set(), executions: new Map() };
 
-  const registerWait: WaitRegistrar = (name, timeoutMs) => {
+  const registerWait: WaitRegistrar = (name, timeoutMs, execution) => {
     if (settledWaits.has(name)) return { registered: false, name, timeoutMs, duplicate: true, settled: true };
     const existing = waits.get(name);
     if (existing) return { registered: true, name, timeoutMs, duplicate: true };
@@ -587,6 +759,8 @@ export default function allyePiAdapter(pi: ExtensionAPI): void {
       signal: controller.signal,
     }).then((result) => {
       const event: WaitEvent = {
+        kind: execution?.manualIntervention ? "intervened" : "settled",
+        executionId: execution?.executionId,
         name,
         timeoutMs,
         outcome: classifyWaitResult(result, timeoutMs),
@@ -596,6 +770,11 @@ export default function allyePiAdapter(pi: ExtensionAPI): void {
         stderr: result.stderr,
         timestamp: new Date().toISOString(),
       };
+      if (execution) {
+        execution.status = execution.manualIntervention ? "intervened" : event.outcome === "blocked" ? "blocked" : event.outcome === "completed" ? "settled" : "unknown";
+        execution.runtimeState = event.outcome === "completed" ? "done" : event.outcome === "blocked" ? "blocked" : "unknown";
+        execution.settledAt = event.timestamp;
+      }
       deliverWaitEvent(event, shuttingDown, settledWaits, {
         appendEntry: (customType, value) => pi.appendEntry(customType, value),
         notify: activeContext?.hasUI ? (message, level) => activeContext?.ui.notify(message, level) : undefined,
@@ -603,12 +782,19 @@ export default function allyePiAdapter(pi: ExtensionAPI): void {
       });
     }).catch((error) => {
       const event: WaitEvent = {
+        kind: execution?.manualIntervention ? "intervened" : "settled",
+        executionId: execution?.executionId,
         name,
         timeoutMs,
         outcome: classifyWaitResult(undefined, timeoutMs, error),
         error: error instanceof Error ? error.message : String(error),
         timestamp: new Date().toISOString(),
       };
+      if (execution) {
+        execution.status = execution.manualIntervention ? "intervened" : event.outcome === "blocked" ? "blocked" : event.outcome === "completed" ? "settled" : "unknown";
+        execution.runtimeState = event.outcome === "completed" ? "done" : event.outcome === "blocked" ? "blocked" : "unknown";
+        execution.settledAt = event.timestamp;
+      }
       deliverWaitEvent(event, shuttingDown, settledWaits, {
         appendEntry: (customType, value) => pi.appendEntry(customType, value),
         notify: activeContext?.hasUI ? (message, level) => activeContext?.ui.notify(message, level) : undefined,
@@ -645,7 +831,7 @@ export default function allyePiAdapter(pi: ExtensionAPI): void {
     usingAllyeBootstrap = loadUsingAllyeSkill();
     syncCapabilityTools();
     if (ctx.hasUI) ctx.ui.setStatus("allye-pi", "loading Allye context…");
-    if (process.env.ALLYE_PI_NATIVE_BOOTSTRAP !== "0") startupContext = await loadStartupContext();
+    if (process.env.ALLYE_PI_NATIVE_BOOTSTRAP !== "0") startupContext = await loadStartupContext(capabilities.allyeMcp);
     if (startupContext.teamSelectionRequired && ctx.hasUI) {
       ctx.ui.notify("Allye has multiple teams and no active team. Use /allye-team <name|prefix|id> before team-scoped work.", "warning");
     }
@@ -658,7 +844,9 @@ export default function allyePiAdapter(pi: ExtensionAPI): void {
     for (const controller of waits.values()) controller.abort();
     waits.clear();
     ownership.waits.clear();
-    ownership.panes.length = 0;
+    // Owned Herdr resources intentionally remain open across a Pi shutdown.
+    // Cleanup requires an explicit, verified cleanup operation and never runs
+    // implicitly while the caller cannot inspect its final state.
   });
 
   pi.on("before_agent_start", async (event) => {

package/skills/agent-runtime/SKILL.md

@@ -13,7 +13,13 @@ any runtime that satisfies the contract rather than one specific tool.
 
 Load this only when a compatible runtime is actually detected and the user benefits from delegation. Without one, continue locally or use another available subagent mechanism; never let the absence or degradation of a runtime block delivery.
 
-Concrete commands for the runtimes we implement live in `references/`. This file is the
+Concrete commands for the runtimes we implement live in `references/`.
+
+For Herdr, the Pi adapter exposes `workspace` and `tab` creation in addition to
+`spawn`, and returns an execution ID from `dispatch`. The caller must retain this
+ID, use `status`/`wait`, collect the result, and only then request ownership-guarded
+`cleanup`. `mark_intervened` records human takeover and permanently blocks automatic
+cleanup for that execution. This file is the
 contract; the reference is the implementation.
 
 <!-- adapted from ogulcancelik/herdr SKILL.md (Apache-2.0) — the primitive vocabulary and the safety rules -->

package/skills/agent-runtime/references/herdr.md

@@ -22,6 +22,18 @@ fails in a way that suggests the server went away.
 Caller context is injected into every managed pane: `$HERDR_PANE_ID`, `$HERDR_TAB_ID`,
 `$HERDR_WORKSPACE_ID`.
 
+## workspace and tab ownership
+
+The Pi adapter can create a workspace or a tab without focusing it:
+
+```text
+allye_herdr(operation="workspace", cwd="/absolute/repo", label="feature-runtime")
+allye_herdr(operation="tab", workspaceId="w...", cwd="/absolute/repo", label="story-1")
+```
+
+The returned IDs are registered as owned resources. Never infer IDs from layout
+order and never use these operations to adopt an existing user resource.
+
 ## spawn
 
 ```bash
@@ -132,13 +144,31 @@ herdr agent send-keys {name} esc
 Then dispatch normally, including the submit confirmation — a freshly dismissed menu leaves
 the agent idle, which is exactly the state where a prompt lands unsubmitted.
 
-## teardown
+## execution status, intervention, and teardown
+
+Each dispatch returns an `executionId`. Retain it for the whole lifecycle:
+
+```text
+allye_herdr(operation="status", executionId="...")
+allye_herdr(operation="wait", name="story-agent", timeoutMs=3600000)
+allye_herdr(operation="mark_intervened", executionId="...")
+allye_herdr(operation="cleanup", executionId="...")
+```
+
+Use `mark_intervened` when the user takes over or modifies the managed pane. A
+manual intervention, `blocked`, `unknown`, timeout, or missing collection must
+keep the resource open. Cleanup is valid only after wait settlement, Allye/result
+collection, and verification.
+
+The adapter rejects cleanup for resources it did not create and for executions
+that are still working, blocked, unknown, or manually intervened.
 
 ```bash
 herdr pane close {pane_id}
 ```
 
-Only panes the plugin created, and only after §7.1's merge gates have passed.
+Only panes/tabs/workspaces the plugin created, and only after §7.1's merge gates
+have passed.
 
 ## Safety rules — never widened