@henryqw/pi-subagent 18.0.1 → 22.0.0

package/dist/index.d.ts

@@ -5,15 +5,16 @@ export { parseRoleMcpAllowlist, roleMcpFlagValue, selectRoleMcpConfig, type Role
 export { addUsage, capEphemeralSubagentOutput, createEphemeralSubagentExecutor, DEFAULT_MAX_TURNS, EphemeralSubagentError, EXECUTION_BUDGET_ENV, formatDuration, type EphemeralSubagentActivityEvent, type EphemeralSubagentErrorCode, type EphemeralSubagentExecutionBudget, type EphemeralSubagentExecutor, type EphemeralSubagentExecutorOptions, type EphemeralSubagentResult, type EphemeralSubagentRunInput, type EphemeralSubagentTimeout, } from "./ephemeral.ts";
 export { createChildWorktree, finalizeChildWorktree, inspectIndexFlags, inspectWorktreeDirty, WorktreeSetupError, worktreeContextNote, type WorktreeDirtyInspection, type WorktreeInfo, type WorktreePayload, } from "./worktree.ts";
 export { prepareExactReviewEvidence, REVIEW_MAX_PATCH_BYTES, REVIEW_MAX_PATHS, type PreparedReviewEvidence, type PrepareExactReviewEvidenceInput, } from "./review-evidence.ts";
-export declare const PI_ORCHESTRATOR_PROCESS_LEASE = "PI_ORCHESTRATOR_PROCESS_LEASE";
+export { captureWorkingCheckoutBaseline, captureWorkingCheckoutState, prepareWorkingChangeEvidence, sameWorkingCheckoutState, sameWorkingSnapshot, type PreparedWorkingChangeEvidence, type WorkingCheckoutBaseline, type WorkingCheckoutState, type WorkingSnapshotIdentity, } from "./working-evidence.ts";
+export declare const PI_SUBAGENT_PROCESS_LEASE = "PI_SUBAGENT_PROCESS_LEASE";
 export declare const ROLE_MCP_POLICY_FLAG = "pi-subagent-role-mcps";
 export declare const ROLE_TOOL_POLICY_FLAG = "pi-subagent-role-tools";
-export declare const CHILD_EXCLUDED_TOOL_NAMES: readonly ["delegate_task", "ask_question", "orchestrate_execute", "orchestrate_status", "orchestrate_resume", "orchestrate_abort"];
+export declare const CHILD_EXCLUDED_TOOL_NAMES: readonly ["delegate_task", "ask_question", "subagent_status", "subagent_resume", "subagent_stage", "subagent_abort"];
 export declare const CHILD_EXCLUDED_TOOLS: string;
 export declare const DELEGATE_TASK: {
     readonly id: "pi-subagent/delegateTask";
     readonly label: "Subagent delegation";
-    readonly purpose: "Launch an isolated Pi subagent.";
+    readonly purpose: "Launch direct or checked isolated Pi delegation.";
     readonly defaultProfile: "fast";
 };
 export type RoleName = string;
@@ -22,7 +23,6 @@ export interface Role {
     description: string;
     modelClass?: ProfileName;
     tools: string[];
-    isolation?: string;
     extensions: string[];
     skills: string[];
     mcps?: string[];
@@ -39,7 +39,6 @@ export interface ResolvedRoleLaunch extends PiLaunch {
 }
 export interface PreparedRoleLaunch extends ResolvedRoleLaunch {
     role: RoleName;
-    isolation?: "worktree";
     tools: readonly string[];
     systemPrompt: string;
     promptArgIndex: number;
@@ -93,3 +92,10 @@ export declare function prepareRoleLaunch(pi: Pick<ExtensionAPI, "getCommands">,
 export declare function resolveConfiguredRoleLaunch(pi: Pick<ExtensionAPI, "getCommands">, ctx: ExtensionContext, input: ResolveConfiguredRoleLaunchInput): Promise<PreparedRoleLaunch>;
 /** Restore the system prompt pair after a caller has prepared its launch argv. */
 export declare function finalizeRoleLaunch(prepared: PreparedRoleLaunch): ResolvedRoleLaunch;
+export * from "./composition.ts";
+export * from "./git-runtime.ts";
+export * from "./herdr-runtime.ts";
+export { ISOLATED_MODEL_TASK, RoleLaunchRuntime, type LaunchRuntimeOptions } from "./launch-runtime.ts";
+export * from "./runner.ts";
+export * from "./schema.ts";
+export * from "./store.ts";

package/dist/index.js

@@ -11,20 +11,21 @@ export { parseRoleMcpAllowlist, roleMcpFlagValue, selectRoleMcpConfig } from "./
 export { addUsage, capEphemeralSubagentOutput, createEphemeralSubagentExecutor, DEFAULT_MAX_TURNS, EphemeralSubagentError, EXECUTION_BUDGET_ENV, formatDuration, } from "./ephemeral.js";
 export { createChildWorktree, finalizeChildWorktree, inspectIndexFlags, inspectWorktreeDirty, WorktreeSetupError, worktreeContextNote, } from "./worktree.js";
 export { prepareExactReviewEvidence, REVIEW_MAX_PATCH_BYTES, REVIEW_MAX_PATHS, } from "./review-evidence.js";
+export { captureWorkingCheckoutBaseline, captureWorkingCheckoutState, prepareWorkingChangeEvidence, sameWorkingCheckoutState, sameWorkingSnapshot, } from "./working-evidence.js";
 const CODEX_ALIAS = /^openai-codex-(?:[2-9]|[1-9]\d+)$/;
 const MULTI_CODEX_EXTENSION = fileURLToPath(import.meta.resolve("@henryqw/pi-multi-codex/extensions/multi-codex.ts"));
 const ROLE_MCP_EXTENSION = fileURLToPath(new URL("../extensions/role-mcp.ts", import.meta.url));
 const ROLE_TOOLS_EXTENSION = fileURLToPath(new URL("../extensions/role-tools.ts", import.meta.url));
-export const PI_ORCHESTRATOR_PROCESS_LEASE = "PI_ORCHESTRATOR_PROCESS_LEASE";
+export const PI_SUBAGENT_PROCESS_LEASE = "PI_SUBAGENT_PROCESS_LEASE";
 export const ROLE_MCP_POLICY_FLAG = "pi-subagent-role-mcps";
 export const ROLE_TOOL_POLICY_FLAG = "pi-subagent-role-tools";
 export const CHILD_EXCLUDED_TOOL_NAMES = [
     "delegate_task",
     "ask_question",
-    "orchestrate_execute",
-    "orchestrate_status",
-    "orchestrate_resume",
-    "orchestrate_abort",
+    "subagent_status",
+    "subagent_resume",
+    "subagent_stage",
+    "subagent_abort",
 ];
 export const CHILD_EXCLUDED_TOOLS = CHILD_EXCLUDED_TOOL_NAMES.join(",");
 const SYSTEM_PROMPT_FLAG = "--append-system-prompt";
@@ -32,7 +33,7 @@ const CHILD_IDENTITY_POLICY = "You are a delegated Pi Subagent, not Main. Execut
 export const DELEGATE_TASK = {
     id: "pi-subagent/delegateTask",
     label: "Subagent delegation",
-    purpose: "Launch an isolated Pi subagent.",
+    purpose: "Launch direct or checked isolated Pi delegation.",
     defaultProfile: "fast",
 };
 const cleanText = (value, field, source) => {
@@ -83,7 +84,7 @@ function roleToolPolicy(role, additionalTools = []) {
 function namesMcpAdapter(extension) {
     return extension.toLowerCase().split(/[\\/:@]+/).some((component) => component === "pi-mcp-adapter" || component.startsWith("pi-mcp-adapter."));
 }
-const FORBIDDEN_ROLE_PACKAGE_SOURCE_NAMES = ["pi-orchestrator", "pi-mcp-adapter"];
+const FORBIDDEN_ROLE_PACKAGE_SOURCE_NAMES = ["pi-subagent", "pi-mcp-adapter"];
 function rejectForbiddenRolePackageSource(value, role) {
     const components = value.toLowerCase().split(/[\\/:@]+/);
     if (FORBIDDEN_ROLE_PACKAGE_SOURCE_NAMES.some((name) => components.some((component) => component === name || component.startsWith(`${name}.`)))) {
@@ -98,13 +99,10 @@ function roleModelClass(value, source) {
     }
     return value;
 }
-function roleIsolation(value, source) {
+function rejectRetiredRoleIsolation(value, source) {
     if (value === undefined)
         return;
-    if (cleanText(value, "isolation", source) !== "worktree") {
-        throw new Error(`${source}: isolation must be "worktree".`);
-    }
-    return "worktree";
+    throw new Error(`${source}: Role isolation is retired; select mode \"isolated\" on delegate_task instead.`);
 }
 // Built-in Roles resolved from the package-shipped Markdown relative to this module.
 const BUILTIN_ROLE_NAMES = ["implementer", "reviewer", "scout"];
@@ -118,14 +116,13 @@ function parseRoleFile(file, raw) {
         throw new Error(`${file}: ${error instanceof Error ? error.message : String(error)}`);
     }
     const frontmatter = parsed.frontmatter;
-    const isolation = roleIsolation(frontmatter.isolation, file);
+    rejectRetiredRoleIsolation(frontmatter.isolation, file);
     const modelClass = roleModelClass(frontmatter.modelClass, file);
     return {
         name: parseRoleName(frontmatter.name, file),
         description: cleanDisplayText(frontmatter.description, "description", file),
         ...(modelClass === undefined ? {} : { modelClass }),
         tools: stringList(frontmatter.tools, "tools", file),
-        isolation,
         extensions: extensionList(frontmatter.extensions, file),
         skills: stringList(frontmatter.skills, "skills", file),
         mcps: mcpList(frontmatter.mcps, file),
@@ -312,10 +309,10 @@ function stripRoleSystemPrompt(rawArgs) {
 }
 function prepareResolvedRoleLaunch(roleDefinition, launch, additionalTools = []) {
     const role = parseRoleName(roleDefinition.name);
-    const isolation = roleIsolation(roleDefinition.isolation, `Role ${role}`);
+    rejectRetiredRoleIsolation(roleDefinition.isolation, `Role ${role}`);
     const tools = Object.freeze(roleToolPolicy(roleDefinition, additionalTools));
     const { args, systemPrompt, promptArgIndex } = stripRoleSystemPrompt(launch.args);
-    return { ...launch, args, role, isolation, tools, systemPrompt, promptArgIndex };
+    return { ...launch, args, role, tools, systemPrompt, promptArgIndex };
 }
 function assertNoMissingRoleSkills(role, launch) {
     if (!launch.missingSkills.length)
@@ -389,3 +386,10 @@ export function finalizeRoleLaunch(prepared) {
         missingSkills: prepared.missingSkills,
     };
 }
+export * from "./composition.js";
+export * from "./git-runtime.js";
+export * from "./herdr-runtime.js";
+export { ISOLATED_MODEL_TASK, RoleLaunchRuntime } from "./launch-runtime.js";
+export * from "./runner.js";
+export * from "./schema.js";
+export * from "./store.js";

package/dist/integration-git.d.ts

@@ -0,0 +1,59 @@
+import { type WorktreeInfo } from "./worktree.ts";
+import { type CheckBatchEvidence, type CheckCommand, type ReviewEvidence, type WorkspaceIdentity } from "./schema.ts";
+export type StageReceipt = {
+    previous: WorkspaceIdentity;
+    worker: WorkspaceIdentity;
+    tip: WorkspaceIdentity;
+};
+export type GitOutcome<T> = {
+    outcome: "ready";
+    value: T;
+} | {
+    outcome: "blocked" | "conflict" | "drift" | "unknown";
+    failure: string;
+    possibleResources?: string[];
+};
+export declare class IntegrationGit {
+    /** Refresh is allowed only for the exact clean checked-out Main and a strict same-branch descendant. */
+    inspectMainAdvance(root: string, from: WorkspaceIdentity, to: WorkspaceIdentity, signal: AbortSignal): Promise<void>;
+    /** Persist the prepared path/branch/base before Git is allowed to create anything. */
+    allocate(root: string, childId: string, base: WorkspaceIdentity, onPrepared: (info: WorktreeInfo) => Promise<void>, signal: AbortSignal): Promise<GitOutcome<WorktreeInfo>>;
+    /** Prove each recorded merge before any new merge or final gate. */
+    inspectCombined(root: string, integration: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], signal: AbortSignal): Promise<WorkspaceIdentity>;
+    /** Main's correction is one exact committed child of the checked staged tip. */
+    inspectCorrection(root: string, integration: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], from: WorkspaceIdentity, to: WorkspaceIdentity, signal: AbortSignal): Promise<void>;
+    /** Main orders calls. On conflict leave MERGE_HEAD and the index untouched for manual resolution. */
+    stage(root: string, integration: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], worker: WorktreeInfo, candidate: WorkspaceIdentity, signal: AbortSignal): Promise<GitOutcome<StageReceipt>>;
+    /** After manual conflict resolution: only the exact two-parent merge is a valid receipt. */
+    confirmStage(root: string, integration: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], worker: WorktreeInfo, candidate: WorkspaceIdentity, signal: AbortSignal): Promise<GitOutcome<StageReceipt>>;
+    /** Reconcile an interrupted merge without retrying it or discarding conflict state. */
+    reconcileStage(root: string, integration: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], worker: WorktreeInfo, candidate: WorkspaceIdentity, signal: AbortSignal): Promise<GitOutcome<StageReceipt | "not_started">>;
+    inspectWorker(root: string, worker: WorktreeInfo, candidate: WorkspaceIdentity, signal: AbortSignal): Promise<void>;
+    /** Read-only reconciliation of a lost promotion response; never repeat the merge. */
+    reconcilePromotion(root: string, integration: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], signal: AbortSignal, correction?: {
+        from: WorkspaceIdentity;
+        to: WorkspaceIdentity;
+    }): Promise<GitOutcome<WorkspaceIdentity>>;
+    /** Checks/review must be persisted for this exact combined tip; never move Main via update-ref. */
+    promote(input: {
+        root: string;
+        integration: WorktreeInfo;
+        base: WorkspaceIdentity;
+        stages: readonly StageReceipt[];
+        checks: CheckBatchEvidence;
+        commands: readonly CheckCommand[];
+        review?: ReviewEvidence;
+        criterion?: string;
+        correction?: {
+            from: WorkspaceIdentity;
+            to: WorkspaceIdentity;
+        };
+    }, signal: AbortSignal): Promise<GitOutcome<WorkspaceIdentity>>;
+    /** Explicit release of an unselected clean checkout. The branch deletion is an exact ref compare-and-swap. */
+    release(root: string, info: WorktreeInfo, expected: WorkspaceIdentity, kind: "worktree" | "branch", signal: AbortSignal): Promise<GitOutcome<"removed" | "absent">>;
+    /** Cleanup is deliberately separate per resource; callers persist each proven substep. */
+    cleanup(root: string, integration: WorktreeInfo, info: WorktreeInfo, base: WorkspaceIdentity, stages: readonly StageReceipt[], promoted: WorkspaceIdentity, kind: "worktree" | "branch", signal: AbortSignal, correction?: {
+        from: WorkspaceIdentity;
+        to: WorkspaceIdentity;
+    }): Promise<GitOutcome<"removed" | "absent">>;
+}