@akagilnc/pi-workflow-roles 0.1.2521 → 0.1.2653-next.71811ca

package/src/public-cli/cli.ts

@@ -1,3 +1,5 @@
+import type { DurablePrincipalAuthority } from "../host-contracts.ts";
+import { piDurablePrincipalAuthority } from "../pi/durable-principal.ts";
 /**
  * Public ak-role CLI dispatcher (roles / config / layered help / Judge run).
  */
@@ -31,10 +33,14 @@ import {
 } from "./config.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import type { CliIo } from "./cli-io.ts";
+import type { RoleTurnHost } from "../host-contracts.ts";
 import {
-  type ExplicitInternalPiRunner,
-} from "./explicit-internal.ts";
+  createPiRoleTurnHost,
+  appendPiSessionCustomEntry,
+} from "../pi/role-turn-host.ts";
 import {
+  observeLaunchedRolePackageIdentity,
+  parseAnalystArgv,
   parseCoderArgv,
   parseCollectorArgv,
   parseDoctorArgv,
@@ -43,7 +49,8 @@ import {
   parseMergerArgv,
   parseNotaryArgv,
   parseReviewerArgv,
-  parseAnalystArgv,
+  recordLaunchedPiIdentity,
+  recordLaunchedRolePackageIdentity,
 } from "./invocation.ts";
 import {
   createTypedOptionConsumer,
@@ -88,7 +95,7 @@ import type { TerminalResult } from "./terminal.ts";
 export {
   buildExplicitInternalActivationArgs,
   resolveInternalRoleEntrypoint,
-} from "./explicit-internal.ts";
+} from "../pi/role-turn-host.ts";
 export { CliUsageError } from "./cli-errors.ts";
 export type { CliIo } from "./cli-io.ts";
 
@@ -162,14 +169,19 @@ function takePublicGlobalFlag(
 
 export type CliEnv = {
   home?: string;
+  /** Host durable-principal authority; production uses the Pi adapter. */
+  principalAuthority?: DurablePrincipalAuthority;
   agentDir?: string;
   /** Process cwd for any Pi subprocess owned by ak-role. */
   cwd?: string;
   packageRoot: string;
   credentials?: CredentialProviders;
   io?: CliIo;
-  /** Injectable Pi runner (tests); production resolves `pi` on PATH. */
-  piRunner?: ExplicitInternalPiRunner;
+  /**
+   * Injectable host-neutral turn host (tests). Production composes the Pi
+   * adapter once per dispatch from packageRoot + seat extraPiArgs/timeout.
+   */
+  roleTurnHost?: RoleTurnHost;
   /** Optional caller correlation id (#78 host channel). */
   correlationId?: string;
   /** Extra Pi args for Judge runs (tests: faux provider). */
@@ -207,6 +219,116 @@ export type CliEnv = {
   createRunId?: () => string;
 };
 
+/** Compose the Pi turn host for one role dispatch (sole public-cli → pi contact). */
+function resolveRoleTurnHost(
+  env: CliEnv,
+  options: {
+    principalAuthority: DurablePrincipalAuthority;
+    extraPiArgs?: readonly string[];
+    timeoutMs?: number;
+  },
+): RoleTurnHost {
+  if (env.roleTurnHost !== undefined) return env.roleTurnHost;
+  return createPiRoleTurnHost({
+    packageRoot: env.packageRoot,
+    principalAuthority: options.principalAuthority,
+    ...(options.extraPiArgs === undefined ? {} : { extraPiArgs: options.extraPiArgs }),
+    ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }),
+    recordLaunchedPiIdentity,
+    recordLaunchedRolePackageIdentity,
+    observeLaunchedRolePackageIdentity,
+  });
+}
+
+type RoleEnvironmentOptions = {
+  role: "judge" | "coder" | "fixer" | "reviewer" | "merger" | "collector" | "doctor" | "notary";
+  home: string;
+  agentDir: string;
+  cwd: string;
+  credentials?: CredentialProviders;
+  seat: EffectiveSeat;
+  config?: PublicCliConfig;
+  /**
+   * Resume must not inject seat startup/persistent defaults as env.model — those
+   * would mask admitted.model restoration (standards-2 second facet). Only an
+   * explicit invocation --model (source === "invocation") is forwarded.
+   */
+  resume?: boolean;
+};
+
+function createRoleEnvironment(
+  env: CliEnv,
+  options: RoleEnvironmentOptions,
+) {
+  const role = options.role;
+  const extraPiArgs =
+    role === "coder"
+      ? env.coderExtraPiArgs
+      : role === "fixer"
+        ? env.fixerExtraPiArgs
+        : role === "reviewer"
+          ? env.reviewerExtraPiArgs
+          : role === "merger"
+            ? env.mergerExtraPiArgs
+            : role === "judge"
+              ? env.judgeExtraPiArgs
+              : role === "collector"
+                ? env.collectorExtraPiArgs
+                : role === "doctor"
+                  ? env.doctorExtraPiArgs
+                  : role === "notary"
+                    ? env.notaryExtraPiArgs
+                    : undefined;
+  const timeoutMs =
+    role === "coder"
+      ? env.coderTimeoutMs
+      : role === "fixer"
+        ? env.fixerTimeoutMs
+        : role === "reviewer"
+          ? env.reviewerTimeoutMs
+          : role === "merger"
+            ? env.mergerTimeoutMs
+            : role === "judge"
+              ? env.judgeTimeoutMs
+              : role === "collector"
+                ? env.collectorTimeoutMs
+                : role === "doctor"
+                  ? env.doctorTimeoutMs
+                  : role === "notary"
+                    ? env.notaryTimeoutMs
+                    : undefined;
+
+  // Initial runs take seat.selection from any source (invocation/persistent/startup).
+  // Resume only forwards an explicit CLI --model; otherwise env.model stays unset so
+  // resolveResumeModel can restore admitted.model (incl. thinking).
+  const injectModel =
+    options.seat.selection !== undefined &&
+    (options.resume !== true || options.seat.source === "invocation");
+
+  return {
+    home: options.home,
+    principalAuthority: env.principalAuthority!,
+    agentDir: options.agentDir,
+    sessionAppender: appendPiSessionCustomEntry,
+    packageRoot: env.packageRoot,
+    roleTurnHost: resolveRoleTurnHost(env, {
+      principalAuthority: env.principalAuthority!,
+      ...(extraPiArgs === undefined ? {} : { extraPiArgs }),
+      ...(timeoutMs === undefined ? {} : { timeoutMs }),
+    }),
+    cwd: options.cwd,
+    ...(options.credentials === undefined ? {} : { credentials: options.credentials }),
+    ...(env.correlationId === undefined ? {} : { correlationId: env.correlationId }),
+    ...(injectModel ? { model: options.seat.selection } : {}),
+    ...projectSeatEngine(options.seat),
+    ...(timeoutMs === undefined ? {} : { timeoutMs }),
+    ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
+    ...(options.config?.autoResumeLimit === undefined
+      ? {}
+      : { autoResumeLimit: options.config.autoResumeLimit }),
+  };
+}
+
 export type CliResult = {
   exitCode: number;
   /** Settled Terminal when an admitted Role run produced one (programmatic/tests). */
@@ -751,7 +873,11 @@ export async function runAkRole(
   try {
     // Select the installed package identity once, before any role-owned Skill,
     // runtime entry, activation argv, or invocation provenance is derived.
-    env = { ...env, packageRoot: await realpath(env.packageRoot) };
+    env = {
+      ...env,
+      packageRoot: await realpath(env.packageRoot),
+      principalAuthority: env.principalAuthority ?? piDurablePrincipalAuthority,
+    };
     const parsed = parseArgv(argv);
     // Invocation --engine rejects at the call-request seam (not role submission).
     // #356 / #378 / #391: engine axis is every callable role (not resume / support).
@@ -852,24 +978,16 @@ export async function runAkRole(
       if (resumeRole === "coder") {
         const result = await runPublicCoderResume(
           resumeRequest,
-          {
+          createRoleEnvironment(env, {
+            role: "coder",
             home,
             agentDir,
-            packageRoot: env.packageRoot,
             cwd,
             credentials,
-            ...(env.correlationId === undefined
-              ? {}
-              : { correlationId: env.correlationId }),
-            ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-            ...(seat.selection === undefined ? {} : { model: seat.selection }),
-            ...(env.coderExtraPiArgs === undefined
-              ? {}
-              : { extraPiArgs: env.coderExtraPiArgs }),
-            ...(env.coderTimeoutMs === undefined
-              ? {}
-              : { timeoutMs: env.coderTimeoutMs }),
-          },
+            seat,
+            config,
+            resume: true,
+          }),
           io,
         );
         return {
@@ -880,24 +998,16 @@ export async function runAkRole(
       if (resumeRole === "fixer") {
         const result = await runPublicFixerResume(
           resumeRequest,
-          {
+          createRoleEnvironment(env, {
+            role: "fixer",
             home,
             agentDir,
-            packageRoot: env.packageRoot,
             cwd,
             credentials,
-            ...(env.correlationId === undefined
-              ? {}
-              : { correlationId: env.correlationId }),
-            ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-            ...(seat.selection === undefined ? {} : { model: seat.selection }),
-            ...(env.fixerExtraPiArgs === undefined
-              ? {}
-              : { extraPiArgs: env.fixerExtraPiArgs }),
-            ...(env.fixerTimeoutMs === undefined
-              ? {}
-              : { timeoutMs: env.fixerTimeoutMs }),
-          },
+            seat,
+            config,
+            resume: true,
+          }),
           io,
         );
         return {
@@ -908,24 +1018,16 @@ export async function runAkRole(
       if (resumeRole === "reviewer") {
         const result = await runPublicReviewerResume(
           resumeRequest,
-          {
+          createRoleEnvironment(env, {
+            role: "reviewer",
             home,
             agentDir,
-            packageRoot: env.packageRoot,
             cwd,
             credentials,
-            ...(env.correlationId === undefined
-              ? {}
-              : { correlationId: env.correlationId }),
-            ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-            ...(seat.selection === undefined ? {} : { model: seat.selection }),
-            ...(env.reviewerExtraPiArgs === undefined
-              ? {}
-              : { extraPiArgs: env.reviewerExtraPiArgs }),
-            ...(env.reviewerTimeoutMs === undefined
-              ? {}
-              : { timeoutMs: env.reviewerTimeoutMs }),
-          },
+            seat,
+            config,
+            resume: true,
+          }),
           io,
         );
         return {
@@ -936,24 +1038,16 @@ export async function runAkRole(
       if (resumeRole === "merger") {
         const result = await runPublicMergerResume(
           resumeRequest,
-          {
+          createRoleEnvironment(env, {
+            role: "merger",
             home,
             agentDir,
-            packageRoot: env.packageRoot,
             cwd,
             credentials,
-            ...(env.correlationId === undefined
-              ? {}
-              : { correlationId: env.correlationId }),
-            ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-            ...(seat.selection === undefined ? {} : { model: seat.selection }),
-            ...(env.mergerExtraPiArgs === undefined
-              ? {}
-              : { extraPiArgs: env.mergerExtraPiArgs }),
-            ...(env.mergerTimeoutMs === undefined
-              ? {}
-              : { timeoutMs: env.mergerTimeoutMs }),
-          },
+            seat,
+            config,
+            resume: true,
+          }),
           io,
         );
         return {
@@ -963,24 +1057,16 @@ export async function runAkRole(
       }
       const result = await runPublicResume(
         resumeRequest,
-        {
+        createRoleEnvironment(env, {
+          role: "judge",
           home,
           agentDir,
-          packageRoot: env.packageRoot,
           cwd,
           credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...(env.judgeExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.judgeExtraPiArgs }),
-          ...(env.judgeTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.judgeTimeoutMs }),
-        },
+          seat,
+          config,
+          resume: true,
+        }),
         io,
       );
       return {
@@ -1008,30 +1094,7 @@ export async function runAkRole(
       );
       const result = await runPublicJudge(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.judgeExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.judgeExtraPiArgs }),
-          ...(env.judgeTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.judgeTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-          // #422: effective auto-resume ceiling resolved once here; the loop never re-reads disk.
-          ...(config.autoResumeLimit === undefined
-            ? {}
-            : { autoResumeLimit: config.autoResumeLimit }),
-        },
+        createRoleEnvironment(env, { role: "judge", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.judge.parse,
       );
@@ -1056,30 +1119,7 @@ export async function runAkRole(
       );
       const result = await runPublicCoder(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.coderExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.coderExtraPiArgs }),
-          ...(env.coderTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.coderTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-          // #422: effective auto-resume ceiling resolved once here; the loop never re-reads disk.
-          ...(config.autoResumeLimit === undefined
-            ? {}
-            : { autoResumeLimit: config.autoResumeLimit }),
-        },
+        createRoleEnvironment(env, { role: "coder", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.coder.parse,
       );
@@ -1104,30 +1144,7 @@ export async function runAkRole(
       );
       const result = await runPublicFixer(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.fixerExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.fixerExtraPiArgs }),
-          ...(env.fixerTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.fixerTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-          // #422: effective auto-resume ceiling resolved once here; the loop never re-reads disk.
-          ...(config.autoResumeLimit === undefined
-            ? {}
-            : { autoResumeLimit: config.autoResumeLimit }),
-        },
+        createRoleEnvironment(env, { role: "fixer", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.fixer.parse,
       );
@@ -1152,26 +1169,7 @@ export async function runAkRole(
       );
       const result = await runPublicCollector(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.collectorExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.collectorExtraPiArgs }),
-          ...(env.collectorTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.collectorTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-        },
+        createRoleEnvironment(env, { role: "collector", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.collector.parse,
       );
@@ -1196,30 +1194,7 @@ export async function runAkRole(
       );
       const result = await runPublicReviewer(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.reviewerExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.reviewerExtraPiArgs }),
-          ...(env.reviewerTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.reviewerTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-          // #422: effective auto-resume ceiling resolved once here; the loop never re-reads disk.
-          ...(config.autoResumeLimit === undefined
-            ? {}
-            : { autoResumeLimit: config.autoResumeLimit }),
-        },
+        createRoleEnvironment(env, { role: "reviewer", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.reviewer.parse,
       );
@@ -1244,26 +1219,7 @@ export async function runAkRole(
       );
       const result = await runPublicDoctor(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.doctorExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.doctorExtraPiArgs }),
-          ...(env.doctorTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.doctorTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-        },
+        createRoleEnvironment(env, { role: "doctor", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.doctor.parse,
       );
@@ -1288,26 +1244,7 @@ export async function runAkRole(
       );
       const result = await runPublicNotary(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.notaryExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.notaryExtraPiArgs }),
-          ...(env.notaryTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.notaryTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-        },
+        createRoleEnvironment(env, { role: "notary", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.notary.parse,
       );
@@ -1332,30 +1269,7 @@ export async function runAkRole(
       );
       const result = await runPublicMerger(
         parsed.args,
-        {
-          home,
-          agentDir,
-          packageRoot: env.packageRoot,
-          cwd,
-          credentials,
-          ...(env.correlationId === undefined
-            ? {}
-            : { correlationId: env.correlationId }),
-          ...(env.piRunner === undefined ? {} : { piRunner: env.piRunner }),
-          ...(seat.selection === undefined ? {} : { model: seat.selection }),
-          ...projectSeatEngine(seat),
-          ...(env.mergerExtraPiArgs === undefined
-            ? {}
-            : { extraPiArgs: env.mergerExtraPiArgs }),
-          ...(env.mergerTimeoutMs === undefined
-            ? {}
-            : { timeoutMs: env.mergerTimeoutMs }),
-          ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
-          // #422: effective auto-resume ceiling resolved once here; the loop never re-reads disk.
-          ...(config.autoResumeLimit === undefined
-            ? {}
-            : { autoResumeLimit: config.autoResumeLimit }),
-        },
+        createRoleEnvironment(env, { role: "merger", home, agentDir, cwd, credentials, seat, config }),
         io,
         PUBLIC_ROLE_ARGV.merger.parse,
       );