@oh-my-pi/pi-coding-agent 16.4.1 → 16.4.2

package/dist/types/mcp/manager.d.ts

@@ -1,7 +1,7 @@
 import { type TSchema } from "@oh-my-pi/pi-ai";
 import type { SourceMeta } from "../capability/types.js";
 import type { CustomTool } from "../extensibility/custom-tools/types.js";
-import type { AuthStorage } from "../session/auth-storage.js";
+import { type AuthStorage } from "../session/auth-storage.js";
 import type { McpConnectionStatusEvent } from "./startup-events.js";
 import type { MCPToolDetails } from "./tool-bridge.js";
 import type { MCPToolCache } from "./tool-cache.js";

package/dist/types/mcp/oauth-flow.d.ts

@@ -125,6 +125,7 @@ export declare class MCPOAuthFlow extends OAuthCallbackFlow {
  */
 export interface RefreshMCPOAuthTokenOptions {
     fetch?: FetchImpl;
+    signal?: AbortSignal;
     /**
      * Authorization-server URL the original grant was minted against. Used to
      * filter same-origin resource indicators on refresh. Defaults to `tokenUrl`'s

package/dist/types/system-prompt.d.ts

@@ -97,8 +97,12 @@ export interface BuildSystemPromptOptions {
     eagerTasks?: boolean;
     /** When true, the Eager Tasks section uses the hard MUST/ONLY wording (`task.eager: always`) rather than the softer `preferred` nudge. */
     eagerTasksAlways?: boolean;
-    /** Whether `task.batch` is enabled; gates batch-call guidance in the Eager Tasks section. */
+    /** Whether `task.batch` is enabled; selects the centralized delegation guidance's call shape. */
     taskBatch?: boolean;
+    /** Effective task concurrency limit displayed in centralized delegation guidance. Zero means unlimited. */
+    taskMaxConcurrency?: number;
+    /** Whether IRC-backed parallel coordination can be included in delegation policy. */
+    taskIrcEnabled?: boolean;
     /** Rules with alwaysApply=true — their full content is injected into the prompt. */
     alwaysApplyRules?: AlwaysApplyRule[];
     /** Whether secret obfuscation is active. When true, explains the redaction format in the prompt. */
@@ -107,8 +111,10 @@ export interface BuildSystemPromptOptions {
     workspaceTree?: WorkspaceTree | Promise<WorkspaceTree>;
     /** Whether the local memory://root summary is active. */
     memoryRootEnabled?: boolean;
-    /** Active model identifier (e.g. "anthropic/claude-opus-4") surfaced to the agent. */
+    /** Active model identifier (e.g. "anthropic/claude-opus-4") used by prompt policy and optionally surfaced. */
     model?: string;
+    /** Whether to surface `model` in the workstation block. Model-specific prompt policy still uses it. Default: true. */
+    includeModelInPrompt?: boolean;
     /** Personality preset rendered into the default system prompt. "none" omits the block. Default: "default" */
     personality?: Personality;
     /** Whether to include the workspace directory tree in the system prompt. Default: false */

package/dist/types/task/prompt-policy.d.ts

@@ -0,0 +1,2 @@
+/** Whether task guidance should follow Codex's GPT-5.6-specific delegation policy. */
+export declare function usesCodexTaskPrompt(modelId: string | undefined): boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "16.4.1",
+	"version": "16.4.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -56,17 +56,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "16.4.1",
-		"@oh-my-pi/omp-stats": "16.4.1",
-		"@oh-my-pi/pi-agent-core": "16.4.1",
-		"@oh-my-pi/pi-ai": "16.4.1",
-		"@oh-my-pi/pi-catalog": "16.4.1",
-		"@oh-my-pi/pi-mnemopi": "16.4.1",
-		"@oh-my-pi/pi-natives": "16.4.1",
-		"@oh-my-pi/pi-tui": "16.4.1",
-		"@oh-my-pi/pi-utils": "16.4.1",
-		"@oh-my-pi/pi-wire": "16.4.1",
-		"@oh-my-pi/snapcompact": "16.4.1",
+		"@oh-my-pi/hashline": "16.4.2",
+		"@oh-my-pi/omp-stats": "16.4.2",
+		"@oh-my-pi/pi-agent-core": "16.4.2",
+		"@oh-my-pi/pi-ai": "16.4.2",
+		"@oh-my-pi/pi-catalog": "16.4.2",
+		"@oh-my-pi/pi-mnemopi": "16.4.2",
+		"@oh-my-pi/pi-natives": "16.4.2",
+		"@oh-my-pi/pi-tui": "16.4.2",
+		"@oh-my-pi/pi-utils": "16.4.2",
+		"@oh-my-pi/pi-wire": "16.4.2",
+		"@oh-my-pi/snapcompact": "16.4.2",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",
@@ -76,7 +76,7 @@
 		"@puppeteer/browsers": "^3.0.4",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",
-		"arktype": "^2.2.0",
+		"arktype": "2.2.2",
 		"chalk": "^5.6.2",
 		"diff": "^9.0.0",
 		"fast-xml-parser": "^5.9.0",

package/src/mcp/manager.ts

@@ -11,7 +11,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 import type { SourceMeta } from "../capability/types";
 import { resolveConfigValue } from "../config/resolve-config-value";
 import type { CustomTool } from "../extensibility/custom-tools/types";
-import type { AuthStorage } from "../session/auth-storage";
+import { type AuthStorage, REMOTE_REFRESH_SENTINEL } from "../session/auth-storage";
 import {
 	connectToServer,
 	disconnectServer,
@@ -1226,76 +1226,79 @@ export class MCPManager {
 			const { credentialId } = lookup;
 			try {
 				let credential: MCPStoredOAuthCredential | undefined = lookup.credential;
-				// Refresh material comes from ONE source: the credential's embedded
-				// fields (written atomically with the tokens they minted — tokenUrl
-				// always present) or, for legacy rows that predate embedding, the
-				// config auth block. Never mix the two: a shared file's auth block
-				// can belong to another profile, whose client the grant is NOT
-				// bound to.
-				const material = selectMcpOAuthRefreshMaterial(credential, auth);
-				const tokenUrl = material?.tokenUrl;
-				const clientId = material?.clientId;
-				const clientSecret = material?.clientSecret;
-				// `authorizationUrl` only lives on the embedded credential form;
-				// legacy `MCPAuthConfig` rows never carried it. Required to filter
-				// same-origin resource indicators on refresh when the authorize and
-				// token endpoints sit on different origins (issue #3502 review
-				// follow-up).
-				const authorizationUrl = material && "authorizationUrl" in material ? material.authorizationUrl : undefined;
-				const resourceIsFallback =
-					!material?.resource && (config.type === "http" || config.type === "sse") && Boolean(config.url);
-				const resource = material?.resource ?? (resourceIsFallback ? config.url : undefined);
-				// Proactive refresh: 5-minute buffer before expiry
-				// Force refresh: on 401/403 auth errors (revoked tokens, clock skew, missing expires)
 				const REFRESH_BUFFER_MS = 5 * 60_000;
-				const shouldRefresh =
-					opts?.forceRefresh || (credential.expires && Date.now() >= credential.expires - REFRESH_BUFFER_MS);
-				if (shouldRefresh && credential.refresh && tokenUrl) {
-					try {
-						const refreshed = await refreshMCPOAuthToken(
-							tokenUrl,
-							credential.refresh,
-							clientId,
-							clientSecret,
-							resource,
-							{ authorizationUrl, stripSameOriginResource: resourceIsFallback },
-						);
-						// Spread the old credential first so embedded refresh material survives rotation.
-						const refreshedCredential: MCPStoredOAuthCredential = {
-							...credential,
-							...refreshed,
-							tokenUrl,
-							clientId,
-							clientSecret,
-							resource: resourceIsFallback ? undefined : resource,
-							authorizationUrl,
-						};
-						await this.#authStorage.set(credentialId, refreshedCredential);
-						credential = refreshedCredential;
-					} catch (refreshError) {
-						const errorMsg = refreshError instanceof Error ? refreshError.message : String(refreshError);
-						if (isDefinitiveOAuthFailure(errorMsg)) {
-							// `invalid_grant` / `invalid_token` / 401 from the token endpoint means
-							// the server has retired this credential — keeping the stale access
-							// token would just re-fail with 401 on every MCP request and leave a
-							// poisoned row in agent.db that survives restarts. Drop it now so the
-							// next connect attempt surfaces a clean "needs reauth" failure and
-							// the user can recover with `/mcp reauth <server>` (or `/mcp unauth`
-							// to forget the server entirely).
-							logger.warn("MCP OAuth refresh failed definitively; cleared credential", {
-								credentialId,
-								error: errorMsg,
+				const refreshResult = await this.#authStorage.refreshStoredOAuthCredential<MCPStoredOAuthCredential>(
+					credentialId,
+					{
+						observedCredential: credential,
+						credentialFromRow: row => row,
+						forceRefresh: opts?.forceRefresh,
+						refreshSkewMs: REFRESH_BUFFER_MS,
+						canRefresh: current => {
+							const material = selectMcpOAuthRefreshMaterial(current, auth);
+							return Boolean(current.refresh && material?.tokenUrl);
+						},
+						refresh: (current, signal) => {
+							if (current.refresh === REMOTE_REFRESH_SENTINEL) {
+								throw new Error("MCP OAuth refresh token is broker-redacted; local refresh is unavailable");
+							}
+							const material = selectMcpOAuthRefreshMaterial(current, auth);
+							const tokenUrl = material?.tokenUrl;
+							if (!current.refresh || !tokenUrl) {
+								throw new Error("MCP OAuth credential is missing refresh material");
+							}
+							const clientId = material?.clientId;
+							const clientSecret = material?.clientSecret;
+							const authorizationUrl =
+								material && "authorizationUrl" in material ? material.authorizationUrl : undefined;
+							const resourceIsFallback =
+								!material?.resource && (config.type === "http" || config.type === "sse") && Boolean(config.url);
+							const resource = material?.resource ?? (resourceIsFallback ? config.url : undefined);
+							return refreshMCPOAuthToken(tokenUrl, current.refresh, clientId, clientSecret, resource, {
+								authorizationUrl,
+								stripSameOriginResource: resourceIsFallback,
+								signal,
 							});
-							await this.#authStorage.remove(credentialId);
-							credential = undefined;
-						} else {
+						},
+						mergeRefreshedCredential: (current, refreshed) => {
+							const material = selectMcpOAuthRefreshMaterial(current, auth);
+							const tokenUrl = material?.tokenUrl;
+							const clientId = material?.clientId;
+							const clientSecret = material?.clientSecret;
+							const authorizationUrl =
+								material && "authorizationUrl" in material ? material.authorizationUrl : undefined;
+							const resourceIsFallback =
+								!material?.resource && (config.type === "http" || config.type === "sse") && Boolean(config.url);
+							const resource = material?.resource ?? (resourceIsFallback ? config.url : undefined);
+							return {
+								...current,
+								...refreshed,
+								tokenUrl,
+								clientId,
+								clientSecret,
+								resource: resourceIsFallback ? undefined : resource,
+								authorizationUrl,
+							};
+						},
+						isDefinitiveFailure: error =>
+							isDefinitiveOAuthFailure(error instanceof Error ? error.message : String(error)),
+						disabledCause: error =>
+							`oauth refresh failed: ${error instanceof Error ? error.message : String(error)}`,
+						keepCredentialOnRefreshFailure: error =>
+							!(error instanceof Error && error.message.includes("broker-redacted")),
+						onRefreshFailure: refreshError => {
+							if (refreshError instanceof Error && refreshError.message.includes("broker-redacted")) return;
 							logger.warn("MCP OAuth refresh failed, using existing token", {
 								credentialId,
 								error: refreshError,
 							});
-						}
-					}
+						},
+					},
+				);
+				if (refreshResult.removed) {
+					logger.warn("MCP OAuth refresh failed definitively; cleared credential", { credentialId });
 				}
+				credential = refreshResult.credential;
 
 				if (credential) {
 					if (resolved.type === "http" || resolved.type === "sse") {

package/src/mcp/oauth-flow.ts

@@ -724,6 +724,7 @@ export class MCPOAuthFlow extends OAuthCallbackFlow {
  */
 export interface RefreshMCPOAuthTokenOptions {
 	fetch?: FetchImpl;
+	signal?: AbortSignal;
 	/**
 	 * Authorization-server URL the original grant was minted against. Used to
 	 * filter same-origin resource indicators on refresh. Defaults to `tokenUrl`'s
@@ -775,6 +776,7 @@ export async function refreshMCPOAuthToken(
 		method: "POST",
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
 		body: params.toString(),
+		signal: optsFromTrailing?.signal,
 	});
 
 	if (!response.ok) {

package/src/prompts/system/system-prompt.md

@@ -125,7 +125,6 @@ You NEVER open a file hoping. Hope is not a strategy.
 {{#has tools "grep"}}- Use `{{toolRefs.grep}}` to locate targets.{{/has}}
 {{#has tools "glob"}}- Use `{{toolRefs.glob}}` to map structure.{{/has}}
 {{#has tools "read"}}- Use `{{toolRefs.read}}` with offset/limit instead of whole-file reads.{{/has}}
-{{#has tools "task"}}- Use `{{toolRefs.task}}` to map unknown code instead of reading file after file yourself.{{/has}}
 
 {{#has tools "lsp"}}
 # LSP
@@ -142,9 +141,16 @@ You SHOULD use syntax-aware tools before text hacks:
 - Use `grep` only for plain-text lookup when structure is irrelevant.
 {{/ifAny}}
 
+{{#has tools "task"}}
 # Delegation
+{{#if useCodexTaskPrompt}}
+{{#if eagerTasks}}
+Proactive multi-agent delegation is active. Any earlier instruction requiring an explicit user request before spawning sub-agents no longer applies. Use sub-agents when parallel work would materially improve speed or quality. This mode remains active until a later multi-agent mode developer message changes it.
+{{else}}
+Do not spawn sub-agents unless the user or applicable AGENTS.md/skill instructions explicitly ask for sub-agents, delegation, or parallel agent work.
+{{/if}}
+{{else}}
 {{#if eagerTasks}}
-{{#has tools "task"}}
 {{#if eagerTasksAlways}}
 Delegation is the default here, not the exception. Once the design is settled, you MUST fan the work out to `{{toolRefs.task}}` subagents rather than doing it yourself. Work alone ONLY when one of these is unambiguously true:
 - A single-file edit under approximately 30 lines
@@ -153,8 +159,17 @@ Delegation is the default here, not the exception. Once the design is settled, y
 
 Everything else—multi-file changes, refactors, new features, tests, investigations—MUST be decomposed and delegated.{{#if taskBatch}} Batch independent slices into one parallel `{{toolRefs.task}}` call; never serialize what can run concurrently.{{/if}}{{else}}Delegation is preferred here. Once the design is settled, you SHOULD fan substantial work out to `{{toolRefs.task}}` subagents instead of doing everything yourself. Multi-file changes, refactors, new features, tests, and investigations are strong candidates. Use your judgment for small, single-file, or interactive work.{{#if taskBatch}} When you delegate independent slices, batch them into one parallel `{{toolRefs.task}}` call rather than serializing them.{{/if}}
 {{/if}}
-{{/has}}
 {{/if}}
+- Use `{{toolRefs.task}}` to map unknown code instead of reading file after file yourself.
+- NEVER abandon phases under scope pressure—delegate, don't shrink.
+- Default to parallel for complex changes. Delegate via `{{toolRefs.task}}` for non-importing file edits, multi-subsystem investigation, and decomposable work.
+- **Maximize parallelism:** Break work into the widest possible {{#if taskBatch}}array of `tasks[]`{{else}}set of parallel `task` calls{{/if}}. NEVER serialize work that can run concurrently. Tasks touching different files or independent refactors should run in parallel; agents resolve their own file collisions live.
+{{#when MAX_CONCURRENCY ">" 0}}
+- **Concurrency cap:** At most {{pluralize MAX_CONCURRENCY "subagent" "subagents"}} run at once in this session — anything beyond that just queues, so a {{#if taskBatch}}`tasks[]` batch{{else}}set of parallel `task` calls{{/if}} larger than {{MAX_CONCURRENCY}} only delays results. Keep the fan-out at or under the cap.
+{{/when}}
+- **Sequence only when necessary:** The only reason to run A before B is if B strictly requires A's output to function (e.g., a core API contract or schema migration). {{#if taskIrcEnabled}}If the missing piece is small, run them in parallel and have B ask A via `irc`!{{/if}}
+{{/if}}
+{{/has}}
 
 EXECUTION WORKFLOW
 ==============
@@ -170,8 +185,6 @@ EXECUTION WORKFLOW
 
 # 3. Decompose
 - Update todos as you go; skip them for trivial requests. Marking a todo done is a transition: start the next in the same turn.
-- NEVER abandon phases under scope pressure—delegate, don't shrink.
-  {{#has tools "task"}}- Default to parallel for complex changes. Delegate via `{{toolRefs.task}}` for non-importing file edits, multi-subsystem investigation, and decomposable work.{{/has}}
 - Plan only what makes the request work. Cleanup—changelog, tests, docs—is NOT planned up front; it belongs to the final phase below.
 
 # 4. Implement

package/src/prompts/tools/task.md

@@ -2,13 +2,7 @@
 Execution does not block your turn: you receive agent and job IDs immediately, and the final results deliver themselves when the subagents finish.{{else}}{{#if batchEnabled}}Run subagents synchronously by passing items in a `tasks[]` batch.{{else}}Run ONE subagent synchronously per call.{{/if}}
 Execution blocks your turn: the call only returns once the work is completely finished.{{/if}}
 
-# Delegation Strategy
-- **Maximize parallelism:** Break work into the widest possible {{#if batchEnabled}}array of `tasks[]`{{else}}set of parallel `task` calls{{/if}}. NEVER serialize work that can run concurrently. Tasks touching different files or independent refactors should run in parallel; agents resolve their own file collisions live.
-{{#when MAX_CONCURRENCY ">" 0}}
-- **Concurrency cap:** At most {{pluralize MAX_CONCURRENCY "subagent" "subagents"}} run at once in this session — anything beyond that just queues, so a {{#if batchEnabled}}`tasks[]` batch{{else}}set of parallel `task` calls{{/if}} larger than {{MAX_CONCURRENCY}} only delays results. Keep the fan-out at or under the cap.
-{{/when}}
-- **Sequence only when necessary:** The only reason to run A before B is if B strictly requires A's output to function (e.g., a core API contract or schema migration). {{#if ircEnabled}}If the missing piece is small, run them in parallel and have B ask A via `irc`!{{/if}}
-{{#if ircEnabled}}- **Steering delivery:** Parent-to-subagent IRC is delivered immediately as steering; subagents blocked in `job poll` / `irc wait` do not need to poll separately for it.{{/if}}
+# Assignment Design
 - **Role matching:** Assign each subagent a specific `role` (e.g. "Security Reviewer", "DB Migrator"). Do not spawn generic workers.
 - **No overhead:** Each assignment MUST instruct its agent to skip formatters, linters, and project-wide test suites. You will run those once at the end.
 - **One-pass agents:** Prefer agents that investigate **and** edit in a single pass; only spin a read-only discovery step (e.g. `scout`) when the affected files are genuinely unknown.
@@ -37,6 +31,7 @@ Execution blocks your turn: the call only returns once the work is completely fi
 
 # Context and Communication
 Subagents start blank. They have no access to your conversation history.
+{{#if ircEnabled}}- **Steering delivery:** Parent-to-subagent IRC is delivered immediately as steering; subagents blocked in `job poll` / `irc wait` do not need to poll separately for it.{{/if}}
 {{#if batchEnabled}}
 - Pass large payloads using `local://<path>` URIs, never inline text.
 {{else}}

package/src/sdk.ts

@@ -191,6 +191,7 @@ import {
 import { normalizeToolName, normalizeToolNames } from "./tools/builtin-names";
 import { ToolContextStore } from "./tools/context";
 import { getImageGenTools } from "./tools/image-gen";
+import { isIrcEnabled } from "./tools/irc";
 import { wrapToolWithMetaNotice } from "./tools/output-meta";
 import { queueResolveHandler } from "./tools/resolve";
 import { ttsTool } from "./tools/tts";
@@ -2444,11 +2445,14 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				eagerTasks,
 				eagerTasksAlways,
 				taskBatch: settings.get("task.batch"),
+				taskMaxConcurrency: settings.get("task.maxConcurrency"),
+				taskIrcEnabled: isIrcEnabled(settings, options.taskDepth ?? 0),
 				secretsEnabled,
 				workspaceTree: workspaceTreePromise,
 				includeWorkspaceTree,
 				memoryRootEnabled: memoryBackend.id === "local",
-				model: settings.get("includeModelInPrompt") ? getActiveModelString() : undefined,
+				model: getActiveModelString(),
+				includeModelInPrompt: settings.get("includeModelInPrompt"),
 				personality: agentKind === "sub" ? "none" : settings.get("personality"),
 				renderMermaid: settings.get("tui.renderMermaid"),
 				activeRepoContext,

package/src/session/agent-session.ts

@@ -286,6 +286,7 @@ import {
 	type SecretObfuscator,
 } from "../secrets/obfuscator";
 import { invalidateHostMetadata } from "../ssh/connection-manager";
+import { usesCodexTaskPrompt } from "../task/prompt-policy";
 import {
 	AUTO_THINKING,
 	type ConfiguredThinkingLevel,
@@ -6123,19 +6124,17 @@ export class AgentSession {
 		return resolveEditMode(this.#getEditModeSession());
 	}
 
-	/**
-	 * Model key (`provider/id`) currently surfaced in the system prompt, or
-	 * undefined when the model is unset or `includeModelInPrompt` is disabled.
-	 */
+	/** Cache key for model-dependent prompt content: displayed id or hidden-policy cohort. */
 	#currentPromptModelKey(): string | undefined {
-		if (!this.settings.get("includeModelInPrompt")) return undefined;
-		return this.model ? formatModelString(this.model) : undefined;
+		const model = this.model ? formatModelString(this.model) : undefined;
+		if (!model || this.settings.get("includeModelInPrompt")) return model;
+		return usesCodexTaskPrompt(model) ? "task-policy:gpt-5.6" : "task-policy:default";
 	}
 
 	async #syncAfterModelChange(previousEditMode: EditMode): Promise<void> {
 		const currentEditMode = this.#resolveActiveEditMode();
 		const editModeChanged = previousEditMode !== currentEditMode && this.getActiveToolNames().includes("edit");
-		// The system prompt may surface the active model; a switch makes the cached prompt stale.
+		// The system prompt selects model-specific policy even when it does not display the model id.
 		const modelChanged = this.#currentPromptModelKey() !== this.#promptModelKey;
 		if (editModeChanged || modelChanged) {
 			await this.refreshBaseSystemPrompt();

package/src/session/session-manager.ts

@@ -15,6 +15,7 @@ import {
 	getSessionsDir,
 	isEnoent,
 	logger,
+	stringifyJson,
 	toError,
 } from "@oh-my-pi/pi-utils";
 import { ArtifactManager } from "./artifacts";
@@ -539,7 +540,7 @@ export class SessionManager {
 	}
 
 	#lineFor(entry: FileEntry): string {
-		return `${JSON.stringify(prepareEntryForPersistence(entry, this.#blobs))}\n`;
+		return `${stringifyJson(prepareEntryForPersistence(entry, this.#blobs)) ?? "null"}\n`;
 	}
 
 	#titleSlotLine(): string {

package/src/system-prompt.ts

@@ -22,6 +22,8 @@ import friendlyPersonality from "./prompts/system/personalities/friendly.md" wit
 import pragmaticPersonality from "./prompts/system/personalities/pragmatic.md" with { type: "text" };
 import projectPromptTemplate from "./prompts/system/project-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
+import { normalizeConcurrencyLimit } from "./task/parallel";
+import { usesCodexTaskPrompt } from "./task/prompt-policy";
 import { shortenPath } from "./tools/render-utils";
 import { type ActiveRepoContext, resolveActiveRepoContext } from "./utils/active-repo-context";
 import { formatLocalCalendarDate } from "./utils/local-date";
@@ -481,8 +483,12 @@ export interface BuildSystemPromptOptions {
 	eagerTasks?: boolean;
 	/** When true, the Eager Tasks section uses the hard MUST/ONLY wording (`task.eager: always`) rather than the softer `preferred` nudge. */
 	eagerTasksAlways?: boolean;
-	/** Whether `task.batch` is enabled; gates batch-call guidance in the Eager Tasks section. */
+	/** Whether `task.batch` is enabled; selects the centralized delegation guidance's call shape. */
 	taskBatch?: boolean;
+	/** Effective task concurrency limit displayed in centralized delegation guidance. Zero means unlimited. */
+	taskMaxConcurrency?: number;
+	/** Whether IRC-backed parallel coordination can be included in delegation policy. */
+	taskIrcEnabled?: boolean;
 	/** Rules with alwaysApply=true — their full content is injected into the prompt. */
 	alwaysApplyRules?: AlwaysApplyRule[];
 	/** Whether secret obfuscation is active. When true, explains the redaction format in the prompt. */
@@ -491,8 +497,10 @@ export interface BuildSystemPromptOptions {
 	workspaceTree?: WorkspaceTree | Promise<WorkspaceTree>;
 	/** Whether the local memory://root summary is active. */
 	memoryRootEnabled?: boolean;
-	/** Active model identifier (e.g. "anthropic/claude-opus-4") surfaced to the agent. */
+	/** Active model identifier (e.g. "anthropic/claude-opus-4") used by prompt policy and optionally surfaced. */
 	model?: string;
+	/** Whether to surface `model` in the workstation block. Model-specific prompt policy still uses it. Default: true. */
+	includeModelInPrompt?: boolean;
 	/** Personality preset rendered into the default system prompt. "none" omits the block. Default: "default" */
 	personality?: Personality;
 	/** Whether to include the workspace directory tree in the system prompt. Default: false */
@@ -536,10 +544,13 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		eagerTasks = false,
 		eagerTasksAlways = false,
 		taskBatch = true,
+		taskMaxConcurrency = 0,
+		taskIrcEnabled = false,
 		secretsEnabled = false,
 		workspaceTree: providedWorkspaceTree,
 		memoryRootEnabled = false,
 		model,
+		includeModelInPrompt = true,
 		personality = "default",
 		includeWorkspaceTree = false,
 		renderMermaid = true,
@@ -770,7 +781,8 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		date,
 		dateTime,
 		cwd: promptCwd,
-		model: model ?? "",
+		model: includeModelInPrompt ? (model ?? "") : "",
+		useCodexTaskPrompt: usesCodexTaskPrompt(model),
 		personality: personality === "none" ? "" : PERSONALITY_SPECS[personality].trim(),
 		intentTracing: !!intentField,
 		intentField: intentField ?? "",
@@ -780,6 +792,8 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		eagerTasks,
 		eagerTasksAlways,
 		taskBatch,
+		MAX_CONCURRENCY: normalizeConcurrencyLimit(taskMaxConcurrency),
+		taskIrcEnabled,
 		secretsEnabled,
 		hasMemoryRoot: memoryRootEnabled,
 		hasObsidian: hasObsidian(),

package/src/task/index.ts

@@ -60,7 +60,7 @@ import {
 } from "./isolation-runner";
 import { generateTaskName } from "./name-generator";
 import { AgentOutputManager } from "./output-manager";
-import { mapWithConcurrencyLimit, normalizeConcurrencyLimit, Semaphore } from "./parallel";
+import { mapWithConcurrencyLimit, Semaphore } from "./parallel";
 import { renderResult, renderCall as renderTaskCall } from "./render";
 import { repairTaskParams } from "./repair-args";
 import { parseIsolationMode } from "./worktree";
@@ -180,7 +180,6 @@ export function formatResultOutputFallback(result: Pick<SingleResult, "output" |
  */
 function renderDescription(
 	agents: AgentDefinition[],
-	maxConcurrency: number,
 	isolationEnabled: boolean,
 	disabledAgents: string[],
 	batchEnabled: boolean,
@@ -208,7 +207,6 @@ function renderDescription(
 		defaultAgent: spawnPolicy.defaultAgent,
 		defaultAgentIsGeneric: spawnPolicy.defaultAgent === DEFAULT_SPAWN_AGENT,
 		allowedAgentsText: spawnPolicy.allowedPromptText,
-		MAX_CONCURRENCY: normalizeConcurrencyLimit(maxConcurrency),
 		isolationEnabled,
 		batchEnabled,
 		asyncEnabled,
@@ -521,11 +519,9 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 	/** Dynamic description that reflects current disabled-agent settings */
 	get description(): string {
 		const disabledAgents = this.session.settings.get("task.disabledAgents") as string[];
-		const maxConcurrency = this.session.settings.get("task.maxConcurrency");
 		const isolationMode = this.session.settings.get("task.isolation.mode");
 		return renderDescription(
 			this.#discoveredAgents,
-			maxConcurrency,
 			isolationMode !== "none",
 			disabledAgents,
 			this.#isBatchEnabled(),

package/src/task/prompt-policy.ts

@@ -0,0 +1,8 @@
+import { bareModelId, parseOpenAIModel, semverEqual } from "@oh-my-pi/pi-catalog/identity";
+
+/** Whether task guidance should follow Codex's GPT-5.6-specific delegation policy. */
+export function usesCodexTaskPrompt(modelId: string | undefined): boolean {
+	if (!modelId) return false;
+	const parsed = parseOpenAIModel(bareModelId(modelId));
+	return parsed !== null && semverEqual(parsed.version, "5.6");
+}