@akagilnc/pi-workflow-roles 0.1.2020 → 0.1.2033

package/src/public-cli/judge-run.ts

@@ -19,6 +19,7 @@ import {
   type AdmittedJudgeInvocation,
 } from "./invocation.ts";
 import {
+  buildSeatModelCliArgs,
   type CredentialProviders,
   type SeatModelConfig,
 } from "./config.ts";
@@ -89,17 +90,6 @@ export type JudgeRunEnv = {
 };
 
 
-function buildModelArgs(model: SeatModelConfig | undefined): string[] {
-  if (model === undefined) return [];
-  return [
-    "--provider",
-    model.provider,
-    "--model",
-    model.model,
-    "--thinking",
-    model.thinking,
-  ];
-}
 
 /**
  * Build Internal activation extra-args for an admitted Judge run
@@ -129,7 +119,7 @@ export function buildJudgeActivationExtraArgs(
     "judge",
     "--mode",
     "json",
-    ...buildModelArgs(options.model),
+    ...buildSeatModelCliArgs(options.model),
     prompt,
   ];
 }
@@ -160,7 +150,7 @@ export function buildJudgeResumeActivationExtraArgs(
     "judge",
     "--mode",
     "json",
-    ...buildModelArgs(options.model),
+    ...buildSeatModelCliArgs(options.model),
     RESUME_TRANSPORT_ENVELOPE,
   ];
 }
@@ -276,7 +266,7 @@ async function dispatchAdmittedJudge(input: {
         io,
       );
     }
-    await markRunRunning(admitted.runDirectory);
+    await markRunRunning(admitted.runDirectory, env.model);
     // Attempt-scoped observation: drop any prior dispatch's 429 evidence so only
     // the current initial/resume attempt can qualify v1 resume.
     await clearTypedProviderHttpObservation(admitted.runDirectory);
@@ -422,6 +412,7 @@ export async function runPublicJudge(
       attachmentPaths: parsed.attachmentPaths,
       ...(parsed.project === undefined ? {} : { project: parsed.project }),
       ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
+      ...(env.model === undefined ? {} : { model: env.model }),
     });
   } catch (error) {
     if (error instanceof CliUsageError) {

package/src/public-cli/merger-run.ts

@@ -29,6 +29,7 @@ import {
   type AdmittedMergerInvocation,
 } from "./invocation.ts";
 import {
+  buildSeatModelCliArgs,
   type CredentialProviders,
   type SeatModelConfig,
 } from "./config.ts";
@@ -88,17 +89,6 @@ export type MergerRunEnv = {
   timeoutMs?: number;
 };
 
-function buildModelArgs(model: SeatModelConfig | undefined): string[] {
-  if (model === undefined) return [];
-  return [
-    "--provider",
-    model.provider,
-    "--model",
-    model.model,
-    "--thinking",
-    model.thinking,
-  ];
-}
 
 /**
  * Build Internal activation extra-args for an admitted Merger run.
@@ -136,7 +126,7 @@ export function buildMergerActivationExtraArgs(
     admitted.mergerInputPath,
     "--mode",
     "json",
-    ...buildModelArgs(options.model),
+    ...buildSeatModelCliArgs(options.model),
     prompt,
   ];
 }
@@ -175,7 +165,7 @@ export function buildMergerResumeActivationExtraArgs(
     admitted.mergerInputPath,
     "--mode",
     "json",
-    ...buildModelArgs(options.model),
+    ...buildSeatModelCliArgs(options.model),
     RESUME_TRANSPORT_ENVELOPE,
   ];
 }
@@ -299,7 +289,7 @@ async function dispatchAdmittedMerger(input: {
         io,
       );
     }
-    await markRunRunning(admitted.runDirectory);
+    await markRunRunning(admitted.runDirectory, env.model);
     await clearTypedProviderHttpObservation(admitted.runDirectory);
 
     const childEnv: NodeJS.ProcessEnv = {
@@ -516,6 +506,7 @@ export async function runPublicMerger(
       attachmentPaths: parsed.attachmentPaths,
       ...(parsed.project === undefined ? {} : { project: parsed.project }),
       ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
+      ...(env.model === undefined ? {} : { model: env.model }),
     });
   } catch (error) {
     if (error instanceof CliUsageError) {

package/src/public-cli/registry.ts

@@ -49,7 +49,8 @@ export type PublicThinkingLevel =
 export type ModelRef = {
   provider: string;
   model: string;
-  thinking: PublicThinkingLevel;
+  /** Absent when invocation passed bare provider/model — pi/model default applies. */
+  thinking?: PublicThinkingLevel;
 };
 
 /**

package/src/public-cli/reviewer-run.ts

@@ -27,6 +27,7 @@ import {
   type AdmittedReviewerInvocation,
 } from "./invocation.ts";
 import {
+  buildSeatModelCliArgs,
   type CredentialProviders,
   type SeatModelConfig,
 } from "./config.ts";
@@ -88,17 +89,6 @@ export type ReviewerRunEnv = {
   timeoutMs?: number;
 };
 
-function buildModelArgs(model: SeatModelConfig | undefined): string[] {
-  if (model === undefined) return [];
-  return [
-    "--provider",
-    model.provider,
-    "--model",
-    model.model,
-    "--thinking",
-    model.thinking,
-  ];
-}
 
 /** Encode admitted ticketNumber as CLI argv for activation/resume (no defaults). */
 function buildReviewerTicketNumberArgs(
@@ -152,7 +142,7 @@ export function buildReviewerActivationExtraArgs(
     ...ticketNumberArgs,
     "--mode",
     "json",
-    ...buildModelArgs(options.model),
+    ...buildSeatModelCliArgs(options.model),
     prompt,
   ];
 }
@@ -198,7 +188,7 @@ export function buildReviewerResumeActivationExtraArgs(
     ...ticketNumberArgs,
     "--mode",
     "json",
-    ...buildModelArgs(options.model),
+    ...buildSeatModelCliArgs(options.model),
     RESUME_TRANSPORT_ENVELOPE,
   ];
 }
@@ -306,7 +296,7 @@ async function dispatchAdmittedReviewer(input: {
         io,
       );
     }
-    await markRunRunning(admitted.runDirectory);
+    await markRunRunning(admitted.runDirectory, env.model);
     await clearTypedProviderHttpObservation(admitted.runDirectory);
     await clearReviewerDispatchRejection(admitted.runDirectory);
 
@@ -463,6 +453,7 @@ export async function runPublicReviewer(
       authorityRefs: parsed.authorityRefs,
       ...(parsed.project === undefined ? {} : { project: parsed.project }),
       ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
+      ...(env.model === undefined ? {} : { model: env.model }),
     });
   } catch (error) {
     if (error instanceof CliUsageError) {

package/src/public-cli/run-lifecycle.ts

@@ -24,6 +24,7 @@ export {
 import type { FixerPhase } from "../package-contracts/fixer-output.ts";
 import type { FixerPrerequisite } from "../package-contracts/fixer-packet.ts";
 import {
+  recordEffectiveInvocationModel,
   requireAuthorityRef,
   type AdmittedCoderInvocation,
   type AdmittedFixerInvocation,
@@ -34,6 +35,7 @@ import {
   type CoderPhase,
   type DerivedMergerEnvelope,
   type FrozenAttachment,
+  type InvocationEffectiveModel,
 } from "./invocation.ts";
 
 /** Providers eligible for v1 typed-429 resume (Codex / xAI only). */
@@ -226,7 +228,18 @@ export async function markRunAdmitted(
   });
 }
 
-export async function markRunRunning(runDirectory: string): Promise<void> {
+/**
+ * Shared dispatch execution seam: record the effective launch model (initial or
+ * resume override) onto invocation.json when known, then transition to running.
+ * Role runners must not coordinate lifecycle ledger writes themselves.
+ */
+export async function markRunRunning(
+  runDirectory: string,
+  effectiveModel?: InvocationEffectiveModel,
+): Promise<void> {
+  if (effectiveModel !== undefined) {
+    await recordEffectiveInvocationModel(runDirectory, effectiveModel);
+  }
   const current = await readRoleRunState(runDirectory);
   if (current === undefined) {
     throw new Error("cannot mark running: run state missing");

package/src/ticket-trajectory.ts

@@ -288,11 +288,15 @@ async function readInvocation(runDir: string): Promise<InvocationInfo | undefine
     const info: InvocationInfo = {};
     if (typeof parsed.role === "string" && parsed.role.trim()) info.role = parsed.role.trim();
     if (typeof parsed.thinking === "string" && parsed.thinking.trim()) info.thinking = parsed.thinking.trim();
+    if (typeof parsed.provider === "string" && parsed.provider.trim()) {
+      info.provider = parsed.provider.trim();
+    }
     if (typeof parsed.model === "string" && parsed.model.trim()) {
       const rawModel = parsed.model.trim();
       if (rawModel.includes("/")) {
         const slash = rawModel.indexOf("/");
-        info.provider = rawModel.slice(0, slash);
+        // Combined provider/model form (legacy pages).
+        if (info.provider === undefined) info.provider = rawModel.slice(0, slash);
         info.model = rawModel.slice(slash + 1);
       } else {
         info.model = rawModel;