@amaster.ai/employee-runtime-connector 0.1.1-beta.22 → 0.1.1-beta.23

package/README.md

@@ -32,6 +32,20 @@ The source of truth lives under this package's `src/` directory. The package bui
 
 Runtime code belongs in the container image. Persist only connector state, the result outbox, and workspaces under the configured state directory.
 
+## Contracted Pi model calls
+
+Pi `model_call` commands with `model_call_output_contract_v1` keep provider and
+model selection paired with the output ceiling. Command target fields have the
+highest precedence, followed by `AMASTER_PI_PROVIDER` / `AMASTER_PI_MODEL`, then
+the Pi profile's `defaultProvider` / `defaultModel`. Each selected precedence
+layer must be a complete provider/model pair: a partial command or runtime
+override fails closed instead of silently falling through to a lower-precedence
+default. The daemon copies only the normalized default pair into the isolated
+one-shot profile, validates that the resolved model exists, applies
+`maxOutputTokens` to that exact model, and records the resolved target and source
+in command-result diagnostics. Missing or unknown targets also fail closed
+before Pi is spawned.
+
 ## Pi tool-argument transport guard
 
 `AMASTER_PI_TOOL_ARGUMENT_GUARD_MODE` defaults to `shadow`; supported values are

package/dist/amaster-runtime-daemon.mjs

@@ -2008,13 +2008,7 @@ function syncAmasterProviderFiles(agentDir, executorEnv) {
 function normalizePiModelId(modelId) {
   return readString(modelId)?.replace(/:(?:off|minimal|low|medium|high|xhigh|max)$/i, "") ?? null;
 }
-function applyModelCallOutputContract(agentDir, providerId, modelId, maxOutputTokens) {
-  const provider = readString(providerId);
-  const model = normalizePiModelId(modelId);
-  const tokenLimit = Number(maxOutputTokens);
-  if (!provider || !model || !Number.isSafeInteger(tokenLimit) || tokenLimit <= 0) {
-    throw new Error("pi_model_call_output_contract_invalid");
-  }
+function assertPiModelConfigured(agentDir, provider, model) {
   const modelsPath = join3(agentDir, "models.json");
   const config = readJsonFile(modelsPath);
   const providers = asRecord(config.providers);
@@ -2025,6 +2019,42 @@ function applyModelCallOutputContract(agentDir, providerId, modelId, maxOutputTo
   if (!configuredModelExists && !(model in existingOverrides)) {
     throw new Error(`pi_model_call_model_missing: ${provider}/${model}`);
   }
+  return { modelsPath, config, providers, providerConfig, existingOverrides };
+}
+function resolvePiModelCallTarget(agentDir, providerId, modelId, explicitSource = "command") {
+  const explicitProvider = readString(providerId);
+  const explicitModel = normalizePiModelId(modelId);
+  if (Boolean(explicitProvider) !== Boolean(explicitModel)) {
+    throw new Error("pi_model_call_target_partial");
+  }
+  let provider = explicitProvider;
+  let model = explicitModel;
+  let source = explicitSource;
+  if (!provider || !model) {
+    const settings = readJsonFile(join3(agentDir, "settings.json"));
+    const defaultProvider = readString(settings.defaultProvider);
+    const defaultModel = normalizePiModelId(settings.defaultModel);
+    if (Boolean(defaultProvider) !== Boolean(defaultModel)) {
+      throw new Error("pi_model_call_default_partial");
+    }
+    if (!defaultProvider || !defaultModel) {
+      throw new Error("pi_model_call_default_missing");
+    }
+    provider = defaultProvider;
+    model = defaultModel;
+    source = "pi_settings_default";
+  }
+  assertPiModelConfigured(agentDir, provider, model);
+  return { provider, model, source };
+}
+function applyModelCallOutputContract(agentDir, providerId, modelId, maxOutputTokens) {
+  const provider = readString(providerId);
+  const model = normalizePiModelId(modelId);
+  const tokenLimit = Number(maxOutputTokens);
+  if (!provider || !model || !Number.isSafeInteger(tokenLimit) || tokenLimit <= 0) {
+    throw new Error("pi_model_call_output_contract_invalid");
+  }
+  const { modelsPath, config, providers, providerConfig, existingOverrides } = assertPiModelConfigured(agentDir, provider, model);
   writeJsonFileAtomic(modelsPath, {
     ...config,
     providers: {
@@ -4401,24 +4431,6 @@ function continuationText(context) {
   if (!body) return "";
   return [readString(summary.title), body].filter(Boolean).join("\n");
 }
-function onDemandRefs(input) {
-  const context = asRecord(input.context);
-  const issue = asRecord(context.paperclipIssue);
-  const wake = asRecord(context.paperclipWake);
-  const refs = [
-    readString(issue.id) ? `issue:${readString(issue.id)}` : null,
-    ...commentRefs(context).map((id) => `comment:${id}`),
-    ...(Array.isArray(context.childIssueSummaries) ? context.childIssueSummaries : []).map((entry) => readString(asRecord(entry).id)).filter(Boolean).map((id) => `child_issue:${id}`),
-    ...(Array.isArray(wake.workProducts) ? wake.workProducts : []).map((entry) => readString(asRecord(entry).id)).filter(Boolean).map((id) => `work_product:${id}`)
-  ];
-  const unique = [...new Set(refs.filter(Boolean))];
-  if (unique.length === 0) return "";
-  return [
-    "Large context objects are intentionally omitted from this prompt.",
-    "Use managed typed read tools when more detail is required; preserve returned source and freshness metadata.",
-    ...unique.map((ref) => `- ${ref}`)
-  ].join("\n");
-}
 function governedReadSection(context) {
   const reads = Array.isArray(context.governedReadResults) ? context.governedReadResults : [];
   if (reads.length === 0) return { content: "", provenance: [] };
@@ -4828,6 +4840,7 @@ function fixedRules(input, includeIssueLine) {
     "Before changing the task status to done, audit every explicit requirement in the task against the final evidence. A successful tool or document write proves delivery, not acceptance: inspect the delivered content for required sections, diagrams, tables, and factual constraints.",
     "Do not leave stale in-progress wording such as \u201Ccurrent run\u201D in a terminal deliverable; rewrite it to the final observed state. Do not list finalization itself as remaining or next work in a terminal deliverable.",
     serverOwnedBusinessOutcomeReview ? "If any requirement is missing or cannot be verified, do not mark done or request final completion or Business Outcome review. Keep the issue in_progress with the exact gap and next owner. An intermediate review remains available only for an exact document revision that must be approved before execution can continue: use create_interaction with kind request_confirmation, payload.resolutionMode review, and purposeCode review_document_revision; never use that interaction as final completion or Outcome acceptance." : "If anything is missing, do not mark done. `update_parent` cannot write `in_review` or `blocked`. Human review: create_interaction kind request_confirmation with payload.resolutionMode review. Required platform/provider/external action needs a typed interaction or first-class blocker; otherwise keep todo with the gap and owner.",
+    "A create_interaction result with status=pending or mustEndRun=true establishes human attention and is the final mutation of this run. End the run immediately: do not publish a Delivery Manifest, update a document or task, or submit any other mutation. Continue only in the new run created after the interaction is resolved.",
     DEADLINE_POSTURE_GUARD,
     "Do not install operating-system or user-global packages, and do not use host package managers such as brew, apt, yum, or global pip/npm installs. Use tools already available or workspace-local dependencies or virtual environments. If a required renderer or evaluator is unavailable, keep the source artifact, record the exact verification gap, and do not mutate the host.",
     `- command id: ${input.commandId}`,
@@ -5164,30 +5177,26 @@ function overflowDependencyRefsText(overflowRefs) {
     ...overflowRefs.map((ref) => `- issue ${JSON.stringify(ref.selector)}, key ${JSON.stringify(ref.key)}`)
   ].join("\n");
 }
-function taskCommentRefGuidance(input) {
+function taskCommentRefGuidance(input, taskText) {
   if (!input.hasGovernedMcp || !readString(input.issueId)) return "";
+  if (!/\[comment body (?:omitted|truncated)[^\]]*comment:[^\s\]]+\]/i.test(taskText)) return "";
   const call = readIssueEvidenceCommentCallText(input.issueId, "<id>", input);
   return `References like comment:<id> above mark truncated comment bodies. Fetch the full text before relying on them \u2014 ${call} (replace <id> with the referenced comment id).`;
 }
-function piMcpProxyExamplesText(input) {
+function piMcpUsageText(input) {
   if (!input.hasGovernedMcp || input.executorKind !== "pi" || !managedPiMcpProxyAvailable(input) || isRecoveryWakeReason(input.wakeReason)) return "";
-  const hybrid = input.managedMcpToolMode === "hybrid";
   const proxy = (tool, args) => JSON.stringify({
     server: "amaster",
     tool,
     args: JSON.stringify(args)
   });
   return [
-    hybrid ? "For governed tools not exposed in the direct typed list, use the outer `mcp` proxy. Before the first long-tail proxy call, describe that exact canonical tool; `args` is the stringified inner canonical object and must never be object-valued." : "The Pi native tool is the outer `mcp` proxy. Emit these as actual tool calls; `args` is the stringified inner canonical object. Pi validates this string schema before extension hooks, so never send object-valued `args`:",
+    "This run uses the outer `mcp` proxy for Governed MCP calls. Emit actual tool calls; `args` is the stringified inner canonical object. Pi validates this string schema before extension hooks, so never send object-valued `args`.",
+    "Before the first write, describe that exact canonical action and use the returned schema; do not infer write arguments from this example.",
     "Keep review payload strings short. Reference the exact document key and revision in `target`; do not duplicate the reviewed document body in `prompt` or `detailsMarkdown`.",
     "payload.supersedesInteractionId is invalid. provenance.supersedesInteractionId is only for replacing a currently pending governed interaction; after changes_requested or rejected resolution, do not send a supersession id.",
     "update_parent.comment creates a separate persistent issue comment. Omit it when add_comment already recorded the message.",
-    ...!hybrid ? [`- describe: ${proxy("runtime_action.describe", { schemaVersion: "runtime-action-v1", actionType: "update_parent" })}`] : [],
-    `- submit: ${proxy("runtime_action.submit", { schemaVersion: "runtime-action-v1", idempotencyKey: "task-123-progress", action: { type: "update_parent", status: "in_progress" } })}`,
-    `- submit intermediate document review interaction: ${proxy("runtime_action.submit", { schemaVersion: "runtime-action-v1", idempotencyKey: "task-123-review", action: { type: "create_interaction", kind: "request_confirmation", continuationPolicy: "wake_assignee_on_accept", provenance: { purposeCode: "review_document_revision", requirementRefs: ["acceptance:document_review"], attentionOwner: { kind: "board", id: "board" }, epochKey: "document_revision:22222222-2222-4222-8222-222222222222" }, payload: { version: 1, resolutionMode: "review", prompt: "Review `plan` revision 1.", target: { type: "issue_document", issueId: "11111111-1111-4111-8111-111111111111", documentId: "33333333-3333-4333-8333-333333333333", key: "plan", revisionId: "22222222-2222-4222-8222-222222222222", revisionNumber: 1 } } } })}`,
-    `- plan: ${proxy("runtime_action.plan", { schemaVersion: "runtime-action-v1", idempotencyKey: "task-123-plan", actions: [{ type: "update_parent", status: "in_progress" }] })}`,
-    `- commit the returned plan revision: ${proxy("runtime_action.commit", { schemaVersion: "runtime-action-v1", planId: "11111111-1111-4111-8111-111111111111", revision: "plan-revision-1" })}`,
-    ...!hybrid ? [`- read document: ${proxy("amaster.read_issue_document", { issueId: "AM-123", key: "plan" })}`] : []
+    `- minimal envelope example: ${proxy("runtime_action.describe", { schemaVersion: "runtime-action-v1", actionType: "update_parent" })}`
   ].join("\n");
 }
 function piDirectTypedToolsText(input) {
@@ -5198,9 +5207,8 @@ function piDirectTypedToolsText(input) {
     return "Direct typed governed tools are unavailable because the run catalog snapshot is empty. Do not guess a proxy or tool name.";
   }
   return [
-    input.managedMcpToolMode === "hybrid" ? "This run exposes the attested high-frequency Governed MCP tools below as direct typed tools. Call these exact names with object arguments and do not send them through the `mcp` proxy." : "This run uses the attested direct typed Governed MCP surface below. Call these exact names with object arguments; do not call the `mcp` proxy and do not stringify an inner argument envelope.",
-    ...tools.map((tool) => `- ${tool.name}${tool.description ? `: ${tool.description}` : ""}`),
-    input.managedMcpToolMode === "hybrid" ? "For a canonical tool not listed above, use the single managed `mcp` proxy only after exact describe. Never infer an alias, use REST, or bypass the governed Gateway." : "A tool not listed above is unavailable in this run. Do not infer a namespace or fall back to REST/bare MCP."
+    input.managedMcpToolMode === "hybrid" ? "Use the attested direct typed tools already present in the provider tool definitions with object arguments; do not duplicate them through the `mcp` proxy." : "Use only the attested direct typed tools already present in the provider tool definitions. Call their exact names with object arguments; do not call the `mcp` proxy and do not stringify an inner argument envelope.",
+    input.managedMcpToolMode === "hybrid" ? "For a canonical tool absent from those definitions, first use the direct typed `runtime_action_describe`, then call the single managed `mcp` proxy with stringified inner `args`. Never infer an alias, use REST, or bypass the governed Gateway." : "A tool absent from the provider tool definitions is unavailable in this run. Do not infer a namespace or fall back to REST/bare MCP."
   ].join("\n");
 }
 function sectionText(section) {
@@ -5254,7 +5262,7 @@ var CONTEXT_AVAILABILITY_SECTION_TITLES = Object.freeze({
   runtime_decomposition_requirement: "Required Task Decomposition",
   task_context_authority: "Task Context Authority",
   verified_company_context: "Verified Company Context",
-  pi_mcp_proxy_examples: "Pi MCP Proxy Examples",
+  pi_mcp_usage: "Pi Governed MCP Usage",
   governed_reads: "Governed External Reads",
   optional_task_wiki_context: "Optional Company Wiki Context",
   agent_instructions: "Agent Instructions",
@@ -5286,14 +5294,6 @@ function projectModelContextAvailability(manifestSections) {
     );
     coveredSections.push(...budgetOmissions);
   }
-  const rawSnapshot = bySection.get("raw_snapshot");
-  const onDemandRefs2 = bySection.get("on_demand_refs");
-  if (rawSnapshot?.omitted === true && rawSnapshot.truncationReason === "on_demand_large_object" && Number(rawSnapshot.originalChars ?? 0) > 0 && (!onDemandRefs2 || onDemandRefs2.omitted === true)) {
-    lines.push(
-      "Additional raw run context was intentionally not inlined and no managed on-demand reference was provided. Do not assume that omitted details are absent."
-    );
-    coveredSections.push("raw_snapshot");
-  }
   return {
     content: lines.join("\n"),
     coveredSections: [...new Set(coveredSections)]
@@ -5384,8 +5384,8 @@ function compileCommandPromptWithManifest(input, options = {}) {
 ${resolvedDependencies.details.content}` : ""
   ].filter(Boolean).join("\n\n") : "";
   const piDirectTypedTools = piDirectTypedToolsText(input);
-  const piMcpProxyExamples = [
-    resolvedDependencies.required.content ? "" : piMcpProxyExamplesText(input),
+  const piMcpUsage = [
+    input.managedMcpToolMode === "proxy_only" && !resolvedDependencies.required.content ? piMcpUsageText(input) : "",
     piDirectTypedTools
   ].filter(Boolean).join("\n");
   const deliveryReadinessContent = runtimeDeliveryReadinessText(context, input);
@@ -5395,7 +5395,7 @@ ${resolvedDependencies.details.content}` : ""
     { name: "recovery_instruction", title: "Recovery Instruction", priority: 100, sourceRef: `run:${input.runId ?? "unknown"}`, content: completeRecoveryInstruction, truncationReason: completeRecoveryInstruction ? null : "mode_selection" },
     { name: "approval_continuation", title: "Approved Runtime Action Continuation", priority: 99, sourceRef: `run:${input.runId ?? "unknown"}`, content: approvalContinuationText(input), truncationReason: mode === "continuation" ? null : "mode_selection" },
     { name: "wake_comments", title: wakeDeltaTitle, priority: interactionResolution ? 99 : 95, sourceRef: wakeDeltaSourceRefs, originalContent: wakeDeltaOriginal, content: wakeDeltaContent, truncationReason: commentsSelected ? null : "duplicate_task_context" },
-    { name: "task", title: "Task Context", priority: 90, sourceRef: `issue:${input.issueId ?? "unknown"}`, originalContent: [taskText, taskCommentRefGuidance(input)].filter(Boolean).join("\n"), content: includeTask ? [taskText, taskCommentRefGuidance(input)].filter(Boolean).join("\n") : "", truncationReason: includeTask ? null : "mode_selection" },
+    { name: "task", title: "Task Context", priority: 90, sourceRef: `issue:${input.issueId ?? "unknown"}`, originalContent: [taskText, taskCommentRefGuidance(input, taskText)].filter(Boolean).join("\n"), content: includeTask ? [taskText, taskCommentRefGuidance(input, taskText)].filter(Boolean).join("\n") : "", truncationReason: includeTask ? null : "mode_selection" },
     ...governedBusinessState ? [{ name: "governed_business_state", title: "Governed Business State", priority: 99, ...governedBusinessState }] : [],
     { name: "continuation_summary", title: "Continuation Summary", priority: 97, sourceRef: readString(asRecord(context.paperclipContinuationSummary).key) ?? `issue:${input.issueId ?? "unknown"}`, observedAt: readString(asRecord(context.paperclipContinuationSummary).updatedAt), originalContent: continuationSummary, content: mode === "cold" ? "" : continuationSummary, truncationReason: mode === "cold" ? "mode_selection" : null },
     ...resolvedDependencyContent ? [{
@@ -5412,18 +5412,18 @@ ${resolvedDependencies.details.content}` : ""
     { name: "runtime_decomposition_requirement", title: "Required Task Decomposition", priority: 98, sourceRef: `issue:${input.issueId ?? "unknown"}`, content: runtimeDecompositionRequirementText(context) },
     ...taskContextAuthority ? [{ name: "task_context_authority", title: "Task Context Authority", priority: 98, ...taskContextAuthority }] : [],
     ...verifiedCompanyContext.content ? [{ name: "verified_company_context", title: "Verified Company Context", priority: 96, sourceRef: verifiedCompanyContext.sourceRef, observedAt: verifiedCompanyContext.observedAt, freshness: { kind: "run_snapshot" }, content: verifiedCompanyContext.content }] : [],
-    ...piMcpProxyExamples ? [{
-      name: "pi_mcp_proxy_examples",
-      title: piDirectTypedTools ? "Pi Governed MCP Tools" : "Pi MCP Proxy Examples",
+    ...piMcpUsage ? [{
+      name: "pi_mcp_usage",
+      title: "Pi Governed MCP Usage",
       priority: 96,
       sourceRef: "amaster_governed_mcp_proxy_contract",
-      content: piMcpProxyExamples
+      content: piMcpUsage
     }] : [],
     { name: "governed_reads", title: "Governed External Reads", priority: 88, sourceRef: governedReads.provenance.map((entry) => entry.sourceRef), observedAt: governedReads.provenance.map((entry) => entry.observedAt), freshness: governedReads.provenance.map((entry) => entry.freshness), scope: governedReads.provenance.map((entry) => entry.scope), content: governedReads.content },
     ...optionalTaskWikiContext ? [optionalTaskWikiContext] : [],
     { name: "agent_instructions", title: "Agent Instructions", priority: 100, sourceRef: "agent_instructions_bundle", content: readString(input.agentInstructions) ?? "" },
     { name: "attachments", title: "Materialized Inputs", priority: 80, sourceRef: "materialized_attachments", content: readString(input.attachmentsText) ?? "" },
-    { name: "on_demand_refs", title: "On-demand Context References", priority: 70, sourceRef: `issue:${input.issueId ?? "unknown"}`, content: [onDemandRefs(input), overflowDependencyRefsText(resolvedDependencies.overflowRefs)].filter(Boolean).join("\n") },
+    { name: "on_demand_refs", title: "On-demand Context References", priority: 70, sourceRef: `issue:${input.issueId ?? "unknown"}`, content: overflowDependencyRefsText(resolvedDependencies.overflowRefs) },
     { name: "raw_snapshot", title: "Raw Context Snapshot", priority: 0, sourceRef: `run:${input.runId ?? "unknown"}`, originalChars: jsonCharLength(context), content: "", truncationReason: "on_demand_large_object" }
   ];
   const seenContent = /* @__PURE__ */ new Set();
@@ -5529,10 +5529,7 @@ function renderAgentInstructionsBundle(bundle, delivery) {
     ].join("\n");
   }
   if (resolvedDelivery.mode === "executor_auto_load") {
-    return [
-      materialized,
-      "This executor has already loaded ./AGENTS.md through its project-instruction channel. Follow it for the whole run; do not read it again merely to initialize. Read sibling instruction files only when ./AGENTS.md references them or the current task requires them."
-    ].join("\n");
+    return "";
   }
   return [
     materialized,
@@ -10255,7 +10252,7 @@ function assertSourceAcquisitionRuntimeAuthority({
 }
 
 // src/amaster-runtime-daemon.mjs
-var CONNECTOR_VERSION = "0.1.1-beta.22";
+var CONNECTOR_VERSION = "0.1.1-beta.23";
 var CONNECTOR_CONTRACT_VERSION = "2026-06-04.v1";
 var SOURCE_ACQUISITION_CAPABILITY = "source_acquisition_v1";
 var SOURCE_ACQUISITION_PROFILE_VERSION = "source_acquisition_v1";
@@ -11889,7 +11886,30 @@ function copyPiModelCallConfig(sourceRoot, targetRoot, fileName, required) {
   copyFileSync3(source, target);
   chmodSync6(target, 384);
 }
-function preparePiModelCallProfile(commandId, baseEnv) {
+function copyPiModelCallDefaults(sourceRoot, targetRoot) {
+  const source = join15(sourceRoot, "settings.json");
+  if (!existsSync14(source)) return;
+  const sourceStat = lstatSync7(source);
+  if (!sourceStat.isFile() || sourceStat.isSymbolicLink()) {
+    throw new Error("pi_model_call_profile_unsafe: settings.json");
+  }
+  let settings;
+  try {
+    settings = asRecord(JSON.parse(readFileSync11(source, "utf8")));
+  } catch {
+    throw new Error("pi_model_call_profile_invalid: settings.json");
+  }
+  const defaultProvider = readString(settings.defaultProvider);
+  const defaultModel = normalizePiModelId(settings.defaultModel);
+  const target = join15(targetRoot, "settings.json");
+  writeFileSync9(target, `${JSON.stringify({
+    ...defaultProvider ? { defaultProvider } : {},
+    ...defaultModel ? { defaultModel } : {}
+  }, null, 2)}
+`, { mode: 384 });
+  chmodSync6(target, 384);
+}
+function preparePiModelCallProfile(commandId, baseEnv, options = {}) {
   const sourceRoot = readString(process.env.PI_CODING_AGENT_DIR) ?? readString(process.env.PI_AGENT_HOME) ?? readString(process.env["AMASTER-CLI_CODING_AGENT_DIR"]);
   if (!sourceRoot) throw new Error("pi_model_call_profile_missing: source Pi home");
   const sourceStat = lstatSync7(sourceRoot);
@@ -11907,6 +11927,7 @@ function preparePiModelCallProfile(commandId, baseEnv) {
   try {
     copyPiModelCallConfig(sourceRoot, agentDir, "models.json", true);
     copyPiModelCallConfig(sourceRoot, agentDir, "auth.json", false);
+    if (options.includeDefaults === true) copyPiModelCallDefaults(sourceRoot, agentDir);
     return {
       profileRoot,
       env: {
@@ -11991,8 +12012,9 @@ function buildExecutorInvocation(executor, command = {}, workspace = null, optio
     if (executor.kind === "pi") {
       const args = ["--mode", "json"];
       const responseContract = options.responseContract ?? null;
-      const provider = readString(payload.provider) ?? readString(process.env.AMASTER_PI_PROVIDER);
-      const configuredModel = readString(payload.model) ?? readString(process.env.AMASTER_PI_MODEL);
+      const modelTarget = asRecord(options.modelTarget);
+      const provider = readString(modelTarget.provider) ?? readString(payload.provider) ?? readString(process.env.AMASTER_PI_PROVIDER);
+      const configuredModel = readString(modelTarget.model) ?? readString(payload.model) ?? readString(process.env.AMASTER_PI_MODEL);
       const model = responseContract ? normalizePiModelId(configuredModel) : configuredModel;
       if (provider) args.push("--provider", provider);
       if (model) args.push("--model", model);
@@ -12088,7 +12110,6 @@ async function executeModelCallCommand(config, command, signal) {
     throw new Error("model_call command requires a prompt");
   }
   const responseContract = modelCallResponseContract(payload);
-  const invocation = buildExecutorInvocation(executor, command, null, { responseContract });
   const timeoutSeconds = Math.max(1, Math.min(
     config.executorTimeoutSeconds,
     readNumber(payload.timeoutSeconds, Math.min(config.executorTimeoutSeconds, 60))
@@ -12097,14 +12118,9 @@ async function executeModelCallCommand(config, command, signal) {
     config.executorMaxOutputBytes,
     readNumber(payload.maxOutputBytes, 512 * 1024)
   ));
-  await ackCommand(config, command, "spawned");
-  await ingestLog(config, command, "system", "info", `Starting ${executor.kind} runtime model call`, {
-    executorKind: executor.kind,
-    args: invocation.args,
-    purpose: readString(payload.purpose) ?? null,
-    promptBytes: Buffer.byteLength(prompt, "utf8")
-  });
   let piModelCallProfile = null;
+  let modelTarget = null;
+  let invocation = null;
   let execution;
   try {
     const baseEnv = buildExecutorEnv(config, command, {
@@ -12112,7 +12128,16 @@ async function executeModelCallCommand(config, command, signal) {
       cwd: process.cwd(),
       sourceWorkspacePath: process.cwd()
     });
-    piModelCallProfile = executor.kind === "pi" ? preparePiModelCallProfile(command.commandId, baseEnv) : null;
+    const commandProvider = readString(payload.provider);
+    const commandModel = readString(payload.model);
+    const commandTargetRequested = Boolean(commandProvider || commandModel);
+    const envProvider = readString(process.env.AMASTER_PI_PROVIDER);
+    const envModel = readString(process.env.AMASTER_PI_MODEL);
+    const envTargetRequested = Boolean(envProvider || envModel);
+    const configuredTarget = commandTargetRequested ? { provider: commandProvider, model: commandModel, source: "command" } : { provider: envProvider, model: envModel, source: "runtime_env" };
+    piModelCallProfile = executor.kind === "pi" ? preparePiModelCallProfile(command.commandId, baseEnv, {
+      includeDefaults: Boolean(responseContract && !commandTargetRequested && !envTargetRequested)
+    }) : null;
     if (piModelCallProfile) {
       await syncPiExecutorProviderConfig(
         config,
@@ -12121,16 +12146,28 @@ async function executeModelCallCommand(config, command, signal) {
         resolvePiExecutorProviderConfig(config, command, baseEnv)
       );
       if (responseContract) {
-        const provider = readString(payload.provider) ?? readString(process.env.AMASTER_PI_PROVIDER);
-        const model = readString(payload.model) ?? readString(process.env.AMASTER_PI_MODEL);
+        modelTarget = resolvePiModelCallTarget(
+          piModelCallProfile.env.PI_CODING_AGENT_DIR,
+          configuredTarget.provider,
+          configuredTarget.model,
+          configuredTarget.source
+        );
         applyModelCallOutputContract(
           piModelCallProfile.env.PI_CODING_AGENT_DIR,
-          provider,
-          model,
+          modelTarget.provider,
+          modelTarget.model,
           responseContract.maxOutputTokens
         );
       }
     }
+    invocation = buildExecutorInvocation(executor, command, null, { responseContract, modelTarget });
+    await ackCommand(config, command, "spawned");
+    await ingestLog(config, command, "system", "info", `Starting ${executor.kind} runtime model call`, {
+      executorKind: executor.kind,
+      args: invocation.args,
+      purpose: readString(payload.purpose) ?? null,
+      promptBytes: Buffer.byteLength(prompt, "utf8")
+    });
     execution = await runExecutor(invocation.command, invocation.args, {
       cwd: process.cwd(),
       env: piModelCallProfile?.env ?? baseEnv,
@@ -12173,6 +12210,11 @@ async function executeModelCallCommand(config, command, signal) {
     ...responseContract ? {
       driver: "pi_cli_json_v1",
       responseContract,
+      ...modelTarget ? {
+        provider: modelTarget.provider,
+        model: modelTarget.model,
+        modelTargetSource: modelTarget.source
+      } : {},
       stopReason: parsed.stopReason ?? null,
       terminalEventType: parsed.terminalEventType ?? null,
       semanticBytes,

package/dist/amaster-runtime.mjs

@@ -6,7 +6,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import { homedir, hostname } from "node:os";
 import { fileURLToPath } from "node:url";
 
-const CONNECTOR_VERSION = "0.1.1-beta.22";
+const CONNECTOR_VERSION = "0.1.1-beta.23";
 
 const CAPABILITIES = [
   "remote_registration",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/employee-runtime-connector",
-  "version": "0.1.1-beta.22",
+  "version": "0.1.1-beta.23",
   "description": "MirrorX runtime connector CLI and daemon",
   "license": "MIT",
   "type": "module",