pi-ui-extend 0.1.37 → 0.1.39

package/external/pi-tools-suite/README.md

@@ -4,11 +4,12 @@ Local all-in-one Pi extension package.
 
 This package keeps shared Pi tools as ordinary source folders under `src/` and registers them through one entrypoint.
 
-- `src/glm-coding-discipline` — injects a deduplicated silent-mode and quality-discipline block at the very top of the main-session per-turn system prompt for GLM-family models immediately before the LLM request; disabled for async sub-agents
+- `src/coding-discipline` — injects a deduplicated silent-mode and quality-discipline block at the very top of the main-session per-turn system prompt for all main-session models immediately before the LLM request; disabled for async sub-agents
 - `src/ast-grep` — `ast_grep` / `ast_apply`
-- `src/async-subagents` — `subagents` tool and sub-agent slash commands, including oh-my-openagent-style `/ultrawork` (`/ulw`) and `/hyperplan` orchestration prompts, plus config-defined sub-agent model/thinking/args presets selected via `/subagent-preset` from `asyncSubagents` in `~/.config/pi/pi-tools-suite.jsonc`; includes the `frontend` profile for Gemini-friendly UI/UX and visual frontend work plus the `vision` profile for screenshot/image description via `openai-codex/gpt-5.4-mini`; enforces a 30-minute per-agent execution timeout, project-wide `maxConcurrent` queueing, optional retry/backoff, and `result.json` structured metadata/chaining fields next to raw `result.md`; stores project-local run files and a registry under `.pi/subagents/` so result/status collection can recover after compaction or reload while the main session remains alive
+- `src/async-subagents` — `subagents` tool and sub-agent slash commands, including oh-my-openagent-style `/ultrawork` (`/ulw`) and `/hyperplan` orchestration prompts, plus config-defined sub-agent model/thinking/args presets selected via `/subagent-preset` from `asyncSubagents` in `~/.config/pi/pi-tools-suite.jsonc`; includes the `frontend` profile for Gemini-friendly UI/UX and visual frontend work and the `oracle` profile for cross-provider second opinions; enforces a 30-minute per-agent execution timeout, project-wide `maxConcurrent` queueing, optional retry/backoff, and `result.json` structured metadata/chaining fields next to raw `result.md`; stores project-local run files and a registry under `.pi/subagents/` so result/status collection can recover after compaction or reload while the main session remains alive
 - `src/lsp` — shared LSP diagnostics hook/library that enriches mutating tool results with diagnostics and shuts down language servers on session shutdown
 - `src/comment-checker` — AI-slop comment guard that listens to the `tool_result` event for `write` / `edit` / `apply_patch` mutations, extracts net-new code comment lines, classifies them (filler phrasing, restating code, decorative separators, generic paraphrasing, or — under aggressive strictness — any non-valuable comment), and appends a short nudge to the tool result so the agent removes unnecessary comments on its next turn; TODO/FIXME, license headers, docstrings, pragmas, linter directives, shebangs, and decorators are never flagged; language-agnostic across `//` / `/* */` / `#` / `--` / `<!-- -->` / triple-quote comment styles; per-session deduplication (at most one nudge per 30 s) prevents fix/remark loops; configured via the `commentChecker` section (`enabled`, `strictness`: `conservative` | `balanced` | `aggressive`, default `balanced`) or `PI_COMMENT_CHECKER_ENABLED` / `PI_COMMENT_CHECKER_STRICTNESS`
+- `src/session-name` — `session_name` tool for reading or setting the current session title directly from tool calls, without relying on slash-command parsing
 - `src/repo-discovery` — `/idx-init`, `/idx-update`, and indexed-only `repo_architecture` / `repo_structure` / `repo_ast` / `repo_search` / `repo_explain` / `repo_deps`; tools register only when the launch project has `.indexer-cli`
 - `src/antigravity-auth` — `antigravity` custom provider with Google Antigravity OAuth login, startup account list, auth.json-only runtime account loading, `/antigravity-add-account` OAuth append into rotation, `/antigravity-account` status display, account rotation/failover, Antigravity plus Gemini CLI model registration, and streaming through the Cloud Code Assist unified gateway
 - `src/todo` — `todo` tool, `/todos`, `/todos-persist`, and `/todos-scope`; supports parent/subtask hierarchy, blockers, ready-task filtering, deferred out-of-scope items, batch operations, JSON/Markdown import/export, automatic clearing when all visible todos are completed, and optional project persistence via `/todos persist on` or `/todos-persist on`; localization/i18n has been removed
@@ -20,7 +21,7 @@ This package keeps shared Pi tools as ordinary source folders under `src/` and r
 
 `index.ts` is intentionally only a thin auto-discovery shim that re-exports `src/index.ts`. There is no `pi.extensions` manifest here, so local Pi auto-discovery loads the suite once via `~/.pi/agent/extensions/pi-tools-suite/index.ts` and does not double-register tools.
 
-Registration order is preserved in `src/index.ts`: glm-coding-discipline, ast-grep, async-subagents, lsp, comment-checker, repo-discovery command/tool gate, antigravity-auth provider, todo, model-tools, usage, web-search, dcp, then prompt-commands. Tool metadata and active model-specific tool sets have two modes: standard and repo-aware. When `.indexer-cli` enables `repo_*`, those tools stay active ahead of overlapping lower-level aliases so the indexed discovery surface has priority.
+Registration order is preserved in `src/index.ts`: coding-discipline, ast-grep, async-subagents, lsp, comment-checker, session-name, repo-discovery command/tool gate, antigravity-auth provider, todo, model-tools, usage, web-search, dcp, then prompt-commands. Tool metadata and active model-specific tool sets have two modes: standard and repo-aware. When `.indexer-cli` enables `repo_*`, those tools stay active ahead of overlapping lower-level aliases so the indexed discovery surface has priority.
 
 ## Disabling modules
 
@@ -68,13 +69,14 @@ DCP settings are stored only under `dcp` in the user shared config file `~/.conf
       "maxContextLimit": 160000,
       "nudgeFrequency": 1,
       "iterationNudgeThreshold": 6,
+      "nudgeForce": "strong",
       "protectedTools": ["compress", "write", "edit", "subagents"]
     },
     "modelOverrides": {
-      "openai-codex/gpt-5.5": {
+      "openai-codex/gpt-5*": {
         "compress": {
-          "minContextPercent": "28%",
-          "maxContextPercent": "48%"
+          "minContextPercent": "26%",
+          "maxContextPercent": "46%"
         }
       },
       "openai-codex/gpt-5.4-mini": {
@@ -208,11 +210,11 @@ Project-local overrides can be added in `.pi/pi-tools-suite.jsonc`; pi-tools-sui
 
 Sub-agent model routing normally follows task overrides, subagent type config, then `ASYNC_SUBAGENTS_MODEL` / `PI_SUBAGENTS_MODEL` fallbacks. Set `ASYNC_SUBAGENTS_FORCE_CURRENT_MODEL=1` (or `PI_SUBAGENTS_FORCE_CURRENT_MODEL=1`) to ignore task/config/env model choices and launch every sub-agent with the current parent session model. When this flag is enabled, any `--model` entries in sub-agent extra args are stripped so they cannot override the current model.
 
-For an oh-my-openagent-style workflow, run `/ultrawork` or `/ulw` to ask the parent agent to split broad work into configured async-subagents roles (`quick`, `scan`, `research`, `docs`, `frontend`, `implement`, `tests`, `review`, `deep`, `vision`). Set `ULTRAWORK=1` before launching Pi to apply that compact routing prompt to normal non-slash user inputs automatically. Set `ULTRAWORK_AUTO=1` to ask the lightweight router model to classify only the first normal user input on non-GPT parent models: clear broad/parallel work is transformed into ultrawork, vague potentially-complex work gets a soft delegation hint, and narrow work is left unchanged. GPT-like parent models skip only this automatic transform; they can still use `/ultrawork` and `subagents` normally. `frontend` is for UI/UX, styling, layout, responsive behavior, and visual component polish; `review` covers security/performance/audit tracks; `implement` covers refactors; `deep` covers debugging/root-cause; `vision` is only for screenshots/images when the parent model is a non-vision GLM-series model. Run `/hyperplan` to pressure-test a plan before implementation.
+For an oh-my-openagent-style workflow, run `/ultrawork` or `/ulw` to ask the parent agent to split broad work into configured async-subagents roles (`quick`, `scan`, `research`, `docs`, `frontend`, `implement`, `tests`, `review`, `deep`, `oracle`). Set `ULTRAWORK=1` before launching Pi to apply that compact routing prompt to normal non-slash user inputs automatically. Set `ULTRAWORK_AUTO=1` to ask the lightweight router model to classify only the first normal user input on non-GPT parent models: clear broad/parallel work is transformed into ultrawork, vague potentially-complex work gets a soft delegation hint, and narrow work is left unchanged. GPT-like parent models skip only this automatic transform; they can still use `/ultrawork` and `subagents` normally. `frontend` is for UI/UX, styling, layout, responsive behavior, and visual component polish; `review` covers security/performance/audit tracks; `implement` covers refactors; `deep` covers debugging/root-cause; `oracle` is for sparse cross-provider second opinions on high-stakes uncertainty. Run `/hyperplan` to pressure-test a plan before implementation.
 
 Async-subagents also injects a lightweight oh-my-openagent-style system-prompt strategy by model: non-GPT parents get `parallel-first`, an orchestration-first hint that favors ultrawork/subagents for broad work, while GPT-like parents get `deep-work`, a direct deep-worker hint that uses subagents only when clearly useful. Explicit custom system prompts (`--system-prompt`, `SYSTEM.md`, custom templates) are respected and skip this injection by default. Disable it with `PI_AGENT_STRATEGY=off`; force a strategy with `PI_AGENT_STRATEGY=parallel-first` or `PI_AGENT_STRATEGY=deep-work`; set `PI_AGENT_STRATEGY_WITH_CUSTOM_PROMPT=1` to append it even when a custom prompt is present.
 
-When the parent model cannot inspect images, async-subagents adds vision-delegation guidance and can save current-turn image attachments under `.pi/subagents/attachments/` so a `vision` sub-agent can receive them as `imagePaths`. Dynamic provider capabilities can be missing or stale after switching models, so blind parent models can still be configured explicitly with case-insensitive `*` masks under `asyncSubagents.vision.blindModelPatterns` in `~/.config/pi/pi-tools-suite.jsonc`. GLM is no longer treated as blind by async-subagents by default; the main-session `glm-coding-discipline` lookup tool is the preferred path for GLM visual lookups.
+For blind-model screenshot/image inspection, use the main-session `coding-discipline` lookup tool. Async-subagents still supports `imagePaths` on tasks when a broader delegated track genuinely needs images, but it no longer ships a dedicated `vision` role. Dynamic provider capabilities can be missing or stale after switching models, so blind parent models can still be configured explicitly with case-insensitive `*` masks under `asyncSubagents.vision.blindModelPatterns` in `~/.config/pi/pi-tools-suite.jsonc`; this keeps guidance honest, not a sub-agent role.
 
 When a task omits `subagentType`, async-subagents asks a lightweight router model to choose one configured type for each task from the task text/scope and the `types.<name>.description` metadata. Explicit task `subagentType` still wins. Keep type descriptions short, literal, and distinct because they are inserted into the router prompt for a small model. Router settings live under `asyncSubagents.routing` (`enabled`, `model`, `maxTaskChars`, `maxTokens`, `maxRetries`, `timeoutMs`, `debug`); the default router model is `zai/glm-4.5-air`. If the router is disabled, unavailable, aborted, or returns invalid JSON, omitted types fall back to `defaultType`.
 
@@ -231,7 +233,7 @@ Example shared async-subagents config section:
     },
     "presets": {
       "cheap": {
-        "description": "Use GLM for text/code roles; keep vision on its dedicated model.",
+        "description": "Use GLM for text/code roles.",
         "types": {
           "quick": { "model": "zai/glm-5.2", "thinking": "off" },
           "frontend": { "model": "antigravity/gemini-3-flash-preview", "fallbackModels": ["zai/glm-5.2"], "thinking": "medium" },
@@ -253,6 +255,29 @@ Example shared async-subagents config section:
 }
 ```
 
+### Parent-model-aware model selection (`modelByParent`)
+
+Any type profile can carry `modelByParent`: a map from glob model refs (matched against the **current parent model**, e.g. `"zai/*"`) to a model for that role. The first matching key wins. Values may be a model string or `{ "model": "...", "fallbackModels": [...] }`. It is resolved after an explicit task `model` / `forcedModel`, but **before** the preset/static profile `model`, so a role can always pick a model based on who the parent is — independent of the active preset.
+
+The canonical use case is an **`oracle`** role that consults a flagship model from a *different* provider than the parent for a second opinion:
+
+```jsonc
+"oracle": {
+  "description": "Cross-provider second opinion: consult a flagship from a different provider than the parent to pressure-test a hard decision. Read-only; advise, do not edit.",
+  "model": "openai-codex/gpt-5.5",
+  "fallbackModels": ["zai/glm-5.2"],
+  "thinking": "xhigh",
+  "modelByParent": {
+    "zai/*":         { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"] },
+    "openai-codex/*": "zai/glm-5.2",
+    "antigravity/*": { "model": "zai/glm-5.2", "fallbackModels": ["openai-codex/gpt-5.5"] },
+    "anthropic/*":   { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"] }
+  }
+}
+```
+
+With this config a GLM parent (`zai/*`) spawns the oracle on `gpt-5.5`, a GPT parent (`openai-codex/*`) spawns it on `glm-5.2`, and so on — automatically, at spawn time, with no `task.model` needed. The parent model ref is read from the spawn context (`ctx.model`) and passed into resolution. Pattern matching is case-insensitive `*` glob (same engine as `vision.blindModelPatterns`). When no key matches (or no parent model is known), the role falls back to its static `model` + `fallbackModels`. An explicit `task.model` or `ASYNC_SUBAGENTS_FORCE_CURRENT_MODEL=1` still overrides the match.
+
 Sub-agents run with `--no-session` by default to avoid writing duplicate Pi session JSONL files for fire-and-forget background work. Set `ASYNC_SUBAGENTS_ENABLE_SESSIONS=1` to restore persisted per-agent sessions under each agent's `sessions/` directory; this also registers the session-navigation slash commands (`/sub-open`, `/sub-back`, `/sub-where`) needed for switching and deeper post-mortem navigation.
 
 Sub-agent runs are stored in the current project's `.pi/subagents/` directory while the main session is alive. Each spawn updates `.pi/subagents/registry.json` with the latest run and `agentId -> runDir` mappings. Because of that, `subagents({ action: "status" })`, `wait`, and `stop` can omit `runDir` to target the latest run, and `subagents({ action: "result", agentId: "..." })` can resolve the run from the registry even if the exact `runDir` was lost during compaction. Result reads always return a summary-first response with artifact paths; raw `result.md` and `stderr.log` are not inlined, which avoids IPC/socket buffer overflows. Include `runDir` when you need an older or non-latest run, and use `cleanup` with `delete=true` to remove collected old runs before the session ends. On normal main-session shutdown, Pi stops sub-agents and removes the project-local run files/registry to avoid leaving `.pi/subagents/` clutter behind; reload and fork shutdowns preserve them so in-process recovery still works.

package/external/pi-tools-suite/package.json

@@ -38,9 +38,9 @@
     "vscode-languageserver-protocol": "^3.17.5"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "0.79.5",
-    "@earendil-works/pi-coding-agent": "0.79.5",
-    "@earendil-works/pi-tui": "0.79.5",
+    "@earendil-works/pi-ai": "0.79.7",
+    "@earendil-works/pi-coding-agent": "0.79.7",
+    "@earendil-works/pi-tui": "0.79.7",
     "typebox": "*"
   },
   "devDependencies": {

package/external/pi-tools-suite/src/async-subagents/async-subagents.sample.jsonc

@@ -28,10 +28,11 @@
   // for short synthetic tests.
   // "timeoutMs": 1800000,
 
-  // Parent-model vision overrides. Pi provider metadata can be missing or stale
-  // after switching models, so async-subagents treats these glob-like model refs
-  // as text-only even if dynamic capability detection is inconclusive. Matching
-  // is case-insensitive and supports `*` wildcards. Set [] to disable built-ins.
+  // Parent-model image-capability overrides. Pi provider metadata can be missing
+  // or stale after switching models, so async-subagents treats these glob-like
+  // model refs as text-only when dynamic detection is inconclusive. Blind-model
+  // screenshot inspection should use lookup; this only keeps guidance honest.
+  // Matching is case-insensitive and supports `*` wildcards.
   "vision": {
     "blindModelPatterns": ["zai/glm*", "glm*", "*/glm*"]
   },
@@ -47,6 +48,19 @@
   // ],
   // "promptOverride": "You are a specialized {subagentType} sub-agent.\nParent: {parentObjective}\nTask: {task}\nScope: {scope}",
 
+  // Parent-model-aware model selection (optional, any type profile).
+  // modelByParent maps glob model refs (matched against the current parent
+  // model, e.g. "zai/*") to a model for this role. The first matching key wins.
+  // Values may be a model string or { model, fallbackModels? }. It is resolved
+  // after an explicit task.model / forcedModel, but before the preset/static
+  // profile model, so a role like an "oracle" can always pick a flagship from a
+  // DIFFERENT provider than the parent. Example:
+  // "modelByParent": {
+  //   "zai/*": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"] },
+  //   "openai-codex/*": "zai/glm-5.2",
+  //   "antigravity/*": { "model": "zai/glm-5.2", "fallbackModels": ["openai-codex/gpt-5.5"] }
+  // }
+
   // Role auto-selection when subagentType is omitted is handled by a small LLM
   // router request. The router receives each task plus the configured type
   // descriptions, then returns one allowed subagentType per task. Explicit
@@ -95,7 +109,7 @@
 
   "presets": {
     "cheap": {
-      "description": "Use cheap GLM/Gemini Flash models for text/code roles; keep vision on the enabled GPT vision model.",
+      "description": "Use cheap GLM/Gemini Flash models for text/code roles.",
       "types": {
         "quick": { "model": "zai/glm-4.5-air", "thinking": "off" },
         "scan": { "model": "zai/glm-4.5-air", "thinking": "off" },
@@ -105,8 +119,7 @@
         "tests": { "model": "zai/glm-5-turbo", "thinking": "medium" },
         "review": { "model": "zai/glm-5.2", "thinking": "high" },
         "implement": { "model": "zai/glm-5.2", "thinking": "high" },
-        "deep": { "model": "zai/glm-5.2", "thinking": "high" },
-        "vision": { "model": "openai-codex/gpt-5.4-mini", "thinking": "off" }
+        "deep": { "model": "zai/glm-5.2", "thinking": "high" }
       }
     },
 
@@ -121,8 +134,7 @@
         "tests": { "model": "openai-codex/gpt-5.4-mini", "fallbackModels": ["zai/glm-5-turbo"], "thinking": "medium" },
         "review": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"], "thinking": "high" },
         "implement": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"], "thinking": "high" },
-        "deep": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"], "thinking": "high" },
-        "vision": { "model": "openai-codex/gpt-5.4-mini", "thinking": "off" }
+        "deep": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"], "thinking": "high" }
       }
     },
 
@@ -137,8 +149,7 @@
         "tests": { "model": "antigravity/antigravity-claude-sonnet-4-6", "fallbackModels": ["openai-codex/gpt-5.4-mini", "zai/glm-5-turbo"], "thinking": "high" },
         "review": { "model": "antigravity/antigravity-claude-sonnet-4-6", "fallbackModels": ["openai-codex/gpt-5.5", "zai/glm-5.2"], "thinking": "high" },
         "implement": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"], "thinking": "high" },
-        "deep": { "model": "antigravity/antigravity-claude-opus-4-6-thinking", "fallbackModels": ["openai-codex/gpt-5.5", "zai/glm-5.2"], "thinking": "high" },
-        "vision": { "model": "openai-codex/gpt-5.4-mini", "thinking": "off" }
+        "deep": { "model": "antigravity/antigravity-claude-opus-4-6-thinking", "fallbackModels": ["openai-codex/gpt-5.5", "zai/glm-5.2"], "thinking": "high" }
       }
     }
   },
@@ -212,16 +223,19 @@
       "thinking": "high"
     },
 
-    "vision": {
-      "description": "Use only when task has imagePaths, screenshots, or asks to inspect visible UI/image content for a text-only parent.",
-      "model": "openai-codex/gpt-5.4-mini",
-      "thinking": "off",
-      "promptAppend": [
-        "You are a vision helper for a parent model that may not be able to see images.",
-        "Inspect any attached images and any image paths mentioned in the task/scope. Describe concrete visible details, UI state, text, layout, errors, and uncertainties.",
-        "If focus instructions are provided, prioritize them, but still mention other important visible findings.",
-        "Do not make code changes. Return a compact visual description that the parent agent can rely on."
-      ]
+    "oracle": {
+      "description": "Oracle: cross-provider flagship second opinion for hard or high-stakes uncertainty. Use sparingly to pressure-test architecture, plans, root-cause hypotheses, risk/security calls, or final recommendations when independent disagreement is valuable. Read-only; advise, do not edit.",
+      "model": "openai-codex/gpt-5.5",
+      "fallbackModels": ["zai/glm-5.2"],
+      "thinking": "xhigh",
+      "tools": ["read", "grep", "bash"],
+      "modelByParent": {
+        "zai/*": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"] },
+        "openai-codex/*": { "model": "zai/glm-5.2", "fallbackModels": ["openai-codex/gpt-5.5"] },
+        "antigravity/*": { "model": "zai/glm-5.2", "fallbackModels": ["openai-codex/gpt-5.5"] },
+        "anthropic/*": { "model": "openai-codex/gpt-5.5", "fallbackModels": ["zai/glm-5.2"] }
+      },
+      "promptAppend": "You are an oracle: a flagship model from a different provider giving a second opinion to the parent agent. Give a concise, decisive recommendation with key tradeoffs and risks. Disagree when warranted; do not rubber-stamp. Do not edit unless explicitly asked."
     }
   }
 }

package/external/pi-tools-suite/src/async-subagents/commands.ts

@@ -53,7 +53,7 @@ const COPY_SAMPLE_CONFIG_LABEL = "Copy sample asyncSubagents config";
 
 export const ULTRAWORK_PROMPT = `Run ultrawork mode for the current objective.
 
-Use subagents when independent parallel tracks help. Pick subagentType from configured roles: quick, scan, research, docs, frontend, implement, tests, review, deep, vision. Use review for security/performance/audit tracks, implement for refactors, deep for debugging/root-cause. Use frontend for UI/UX and visual frontend implementation; use vision only for screenshots/images when the parent model is a non-vision GLM-series model.
+Use subagents when independent parallel tracks help. Pick subagentType from configured roles: quick, scan, research, docs, frontend, implement, tests, review, deep, oracle. Use review for security/performance/audit tracks, implement for refactors, deep for debugging/root-cause. Use frontend for UI/UX and visual frontend implementation; use oracle sparingly for cross-provider second opinions on high-stakes uncertainty.
 
 Keep parent context lean: spawn for broad parallel work, read results only when needed, and finish unless genuinely blocked.`;
 

package/external/pi-tools-suite/src/async-subagents/core/agent-strategy.ts

@@ -14,7 +14,7 @@ const TRUE_ENV_PATTERN = /^(1|true|on|yes|auto)$/i;
 const PARALLEL_FIRST_STRATEGY_PROMPT = `<agent_strategy name="parallel-first">
 This is an orchestration hint for Pi, not a replacement for the user's instructions.
 
-Default posture: orchestration-first for non-GPT models. For broad, multi-file, ambiguous, review/audit, frontend, test-strategy, architecture, or root-cause work, prefer ultrawork mode: split independent tracks and spawn focused async subagents with the configured roles. Keep the parent context lean, collect compact results only when needed, synthesize the findings, then verify before finishing.
+Default posture: orchestration-first for non-GPT models. For broad, multi-file, ambiguous, review/audit, frontend, test-strategy, architecture, or root-cause work, prefer ultrawork mode: split independent tracks and spawn focused async subagents with the configured roles. For high-stakes uncertainty, add one oracle track for a cross-provider second opinion. Keep the parent context lean, collect compact results only when needed, synthesize the findings, then verify before finishing.
 
 Before DCP/compress while work is unfinished, keep one in_progress todo with objective + next step; compression summaries must preserve Active objective and Next step.
 
@@ -28,7 +28,7 @@ Default posture: autonomous deep worker. Build context directly, make concrete p
 
 Before DCP/compress while work is unfinished, keep one in_progress todo with objective + next step; compression summaries must preserve Active objective and Next step.
 
-For broad work, keep delegation explicit and bounded: spawn focused review/research/tests/frontend/deep tracks, read compact results, make the final decisions in the parent session, and report only what matters.
+For broad work, keep delegation explicit and bounded: spawn focused review/research/tests/frontend/deep tracks, plus one oracle track only for high-stakes uncertainty or final plan checks. Read compact results, make the final decisions in the parent session, and report only what matters.
 </agent_strategy>`;
 
 export function agentStrategyPrompt(options: AgentStrategyOptions = {}): string | undefined {

package/external/pi-tools-suite/src/async-subagents/core/config.ts

@@ -6,11 +6,25 @@ import { applyEdits, modify, parse as parseJsonc } from "jsonc-parser";
 import { ensurePiToolsSuiteUserConfig, getPiToolsSuiteUserConfigPath } from "../../config.js";
 import type { AgentTask, RetryConfig } from "./types.js";
 
+export interface ModelByParentEntry {
+	/** Model ref to use when the parent model matches the entry's pattern. */
+	model: string;
+	/** Ordered fallbacks used when this entry's model hits quota/rate limits; replaces the normal fallback chain. */
+	fallbackModels?: string[];
+}
+
 export interface SubagentTypeConfig {
 	description?: string;
 	model?: string;
 	/** Ordered model fallbacks used when the selected model hits quota/rate limits. */
 	fallbackModels?: string[];
+	/**
+	 * Parent-model-aware model selection. Keys are glob model refs (e.g. "zai/*")
+	 * matched against the current parent model; the first matching key wins.
+	 * Values may be a model ref string or { model, fallbackModels? }.
+	 * Resolved after explicit task.model / forcedModel, before preset/static model.
+	 */
+	modelByParent?: Record<string, ModelByParentEntry>;
 	thinking?: string;
 	tools?: string[];
 	extraArgs?: string[];
@@ -127,6 +141,8 @@ export interface ResolveAgentTaskOptions {
 	extraArgs?: string[];
 	/** Force every sub-agent to use this model, ignoring task/profile/env model selection. */
 	forcedModel?: string;
+	/** Current parent model ref (provider/model). Enables type.modelByParent matching. */
+	parentModel?: string;
 	/** Force a wall-clock timeout for every sub-agent spawned by this call. */
 	timeoutMs?: number;
 }
@@ -201,16 +217,19 @@ const BUILTIN_CONFIG: SubagentConfig = {
 			description: "Use for broad hard reasoning: architecture, root-cause analysis, cross-module impact, complex debugging or tradeoffs.",
 			thinking: "high",
 		},
-		vision: {
-			description: "Use only when task has imagePaths, screenshots, or asks to inspect visible UI/image content for a text-only parent.",
-			model: "openai-codex/gpt-5.4-mini",
-			thinking: "off",
-			promptAppend: [
-				"You are a vision helper for a parent model that may not be able to see images.",
-				"Inspect any attached images and any image paths mentioned in the task/scope. Describe concrete visible details, UI state, text, layout, errors, and uncertainties.",
-				"If focus instructions are provided, prioritize them, but still mention other important visible findings.",
-				"Do not make code changes. Return a compact visual description that the parent agent can rely on.",
-			].join("\n"),
+		oracle: {
+			description: "Oracle: cross-provider flagship second opinion for hard or high-stakes uncertainty. Use sparingly to pressure-test architecture, plans, root-cause hypotheses, risk/security calls, or final recommendations when independent disagreement is valuable. Read-only; advise, do not edit.",
+			model: "openai-codex/gpt-5.5",
+			fallbackModels: ["zai/glm-5.2"],
+			modelByParent: {
+				"zai/*": { model: "openai-codex/gpt-5.5", fallbackModels: ["zai/glm-5.2"] },
+				"openai-codex/*": { model: "zai/glm-5.2", fallbackModels: ["openai-codex/gpt-5.5"] },
+				"antigravity/*": { model: "zai/glm-5.2", fallbackModels: ["openai-codex/gpt-5.5"] },
+				"anthropic/*": { model: "openai-codex/gpt-5.5", fallbackModels: ["zai/glm-5.2"] },
+			},
+			thinking: "xhigh",
+			tools: ["read", "grep", "bash"],
+			promptAppend: "You are an oracle: a flagship model from a different provider giving a second opinion to the parent agent. Give a concise, decisive recommendation with key tradeoffs and risks. Disagree when warranted; do not rubber-stamp. Do not edit unless explicitly asked.",
 		},
 	},
 };
@@ -325,14 +344,19 @@ export function resolveAgentTaskConfig(
 	const promptAppend = joinTextBlocks(profile?.promptAppend, task.promptAppend);
 	const forcedModel = trimString(globalOptions.forcedModel);
 	const taskModel = trimString(task.model);
+	const parentMatch = resolveModelByParent(profile, trimString(globalOptions.parentModel));
+	const parentMatchModel = trimString(parentMatch?.model);
 	const presetTypeModel = trimString(presetType?.model);
 	const globalModel = trimString(globalOptions.model);
 	const presetModel = trimString(preset?.model);
 	const profileModel = trimString(profile?.model);
-	const model = forcedModel || taskModel || presetTypeModel || globalModel || presetModel || profileModel;
+	const model = forcedModel || taskModel || parentMatchModel || presetTypeModel || globalModel || presetModel || profileModel;
+	const usedParentMatch = Boolean(parentMatchModel) && model === parentMatchModel;
 	const fallbackModels = forcedModel || taskModel
 		? []
-		: resolveFallbackModels({ model, presetType, preset, profile });
+		: usedParentMatch && parentMatch?.fallbackModels && parentMatch.fallbackModels.length > 0
+			? parentMatch.fallbackModels
+			: resolveFallbackModels({ model, presetType, preset, profile });
 	const extraArgs = forcedModel
 		? stripModelArgs([...profileExtraArgs, ...presetTypeExtraArgs, ...taskExtraArgs, ...presetExtraArgs, ...globalExtraArgs])
 		: [...profileExtraArgs, ...presetTypeExtraArgs, ...taskExtraArgs, ...presetExtraArgs, ...globalExtraArgs];
@@ -480,6 +504,7 @@ function normalizeConfig(value: Record<string, unknown>, file: string): Partial<
 			description: trimString(rawProfile.description),
 			model: trimString(rawProfile.model),
 			fallbackModels: modelList(rawProfile.fallbackModels, rawProfile.fallbackModel),
+			modelByParent: normalizeModelByParent(rawProfile.modelByParent, name, file),
 			thinking: trimString(rawProfile.thinking),
 			tools: arrayOfStrings(rawProfile.tools),
 			extraArgs: arrayOfStrings(rawProfile.extraArgs),
@@ -555,6 +580,7 @@ function compactProfile(profile: SubagentTypeConfig): SubagentTypeConfig {
 	if (profile.description) compact.description = profile.description;
 	if (profile.model) compact.model = profile.model;
 	if (profile.fallbackModels && profile.fallbackModels.length > 0) compact.fallbackModels = profile.fallbackModels;
+	if (profile.modelByParent) compact.modelByParent = profile.modelByParent;
 	if (profile.thinking) compact.thinking = profile.thinking;
 	if (profile.tools && profile.tools.length > 0) compact.tools = profile.tools;
 	if (profile.extraArgs && profile.extraArgs.length > 0) compact.extraArgs = profile.extraArgs;
@@ -606,6 +632,38 @@ function normalizePresetTypeOverrides(value: unknown, file: string, presetName:
 	return Object.keys(types).length > 0 ? types : undefined;
 }
 
+function normalizeModelByParent(value: unknown, typeName: string, file: string): Record<string, ModelByParentEntry> | undefined {
+	if (value === undefined || value === null) return undefined;
+	if (!isRecord(value)) throw new Error(`Subagent type "${typeName}" modelByParent must be an object: ${file}`);
+	const out: Record<string, ModelByParentEntry> = {};
+	for (const [pattern, raw] of Object.entries(value)) {
+		const pat = trimString(pattern);
+		if (!pat) continue;
+		if (typeof raw === "string") {
+			const model = trimString(raw);
+			if (model) out[pat] = { model };
+			continue;
+		}
+		if (isRecord(raw)) {
+			const model = trimString(raw.model);
+			if (!model) throw new Error(`Subagent type "${typeName}" modelByParent["${pat}"].model must be a non-empty string: ${file}`);
+			out[pat] = { model, fallbackModels: modelList(raw.fallbackModels, raw.fallbackModel) };
+			continue;
+		}
+		throw new Error(`Subagent type "${typeName}" modelByParent["${pat}"] must be a string or object: ${file}`);
+	}
+	return Object.keys(out).length > 0 ? out : undefined;
+}
+
+function resolveModelByParent(profile: SubagentTypeConfig | undefined, parentModelRef: string | undefined): ModelByParentEntry | undefined {
+	const entries = profile?.modelByParent;
+	if (!entries || !parentModelRef) return undefined;
+	for (const [pattern, entry] of Object.entries(entries)) {
+		if (modelPatternRegExp(pattern).test(parentModelRef)) return entry;
+	}
+	return undefined;
+}
+
 function resolveFallbackModels(options: {
 	model?: string;
 	presetType?: SubagentPresetTypeOverride;

package/external/pi-tools-suite/src/async-subagents/core/routing.ts

@@ -32,7 +32,7 @@ export interface RoutedSubagentTasks {
 const ROUTER_SYSTEM_PROMPT = [
 	"You route Pi async sub-agent tasks to the best configured subagentType.",
 	"Choose exactly one allowed type for each task. Use the allowed type descriptions as the source of truth.",
-	"Prefer the most specific matching type over generic quick/deep. Use frontend for UI/UX implementation or visual frontend polish; use vision only for attached images/screenshots or image inspection.",
+	"Prefer the most specific matching type over generic quick/deep. Use frontend for UI/UX implementation or visual frontend polish. For pure image inspection, use the lookup tool rather than subagents.",
 	"Return only strict JSON with this shape: {\"routes\":[{\"id\":\"task-id\",\"subagentType\":\"type\"}]}",
 	"Do not include markdown, comments, explanations, or unknown types.",
 ].join("\n");

package/external/pi-tools-suite/src/async-subagents/core/spawn.ts

@@ -677,7 +677,7 @@ function subagentEnvironment(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
 		PI_TERMINAL_BELL_DISABLED: "1",
 		PI_TOOLS_SUITE_DISABLED_MODULES: appendEnvList(env.PI_TOOLS_SUITE_DISABLED_MODULES, [
 			"async-subagents",
-			"glm-coding-discipline",
+			"coding-discipline",
 			"question",
 		]),
 	};

package/external/pi-tools-suite/src/async-subagents/core/types.ts

@@ -14,7 +14,7 @@ export interface AgentTask {
 	promptAppend?: string;
 	/** Full prompt replacement for this task. Supports prompt template variables. */
 	promptOverride?: string;
-	/** Optional visual attention instructions for vision-capable sub-agents. */
+	/** Optional visual attention instructions for agents that receive imagePaths. */
 	focus?: string;
 	/** Local image files to attach to the sub-agent RPC prompt. */
 	imagePaths?: string[];

package/external/pi-tools-suite/src/async-subagents/index.ts

@@ -351,7 +351,7 @@ function visionCapabilityPrompt(event: unknown, ctx: unknown): string | undefine
 		: "The current parent model cannot inspect images/screenshots directly.";
 	const delegation = subagentsAvailable
 		? visionSubagentDelegationText(bridge?.attachments ?? [])
-		: "If visual understanding is required, ask the user to switch to a vision-capable model or provide a path that can be inspected by a vision-capable helper.";
+		: "If visual understanding is required, use the lookup tool if available; otherwise ask the user to switch to a vision-capable model or provide an inspectable image path.";
 	const bridgeWarning = visionBridgeWarning(bridge);
 	return [
 		"Vision capability constraint:",
@@ -360,8 +360,8 @@ function visionCapabilityPrompt(event: unknown, ctx: unknown): string | undefine
 		bridgeWarning,
 		delegation,
 		bridge?.attachments.length
-			? "Use those bridged paths exactly as imagePaths if delegating."
-			: "If an image only arrived as an attachment and no local file path/reference is available to subagents, ask the user for a file path or to switch the parent model to one with image input support.",
+		? "Use those bridged paths exactly as lookup imagePaths if needed."
+		: "If an image only arrived as an attachment and no local file path/reference is available to lookup, ask the user for a file path or to switch the parent model to one with image input support.",
 	].filter(Boolean).join(" ");
 }
 
@@ -380,16 +380,16 @@ function visionCapableParentPrompt(event: unknown): string | undefined {
 		"Vision capability note:",
 		"The current parent model supports image input.",
 		"If the user provided image attachments or local image file paths, inspect them directly first; for local paths, use the read tool on the image path.",
-		"Do not delegate to a vision sub-agent solely to gain visual access; use a vision sub-agent only when the user explicitly asks to delegate/parallelize or a separate visual review is useful.",
+		"Do not delegate solely to gain visual access; use lookup for focused visual checks and subagents only for broader independent tracks.",
 	].join(" ");
 }
 
 function visionSubagentDelegationText(attachments: BridgedImageAttachment[]): string {
 	if (attachments.length === 0) {
-		return "If visual understanding is required, delegate to the subagents tool with subagentType='vision' plus imagePaths/focus when the image is available as a local file path.";
+		return "If visual understanding is required, use the lookup tool with imagePaths/focus when the image is available as a local file path.";
 	}
 	const imagePaths = attachments.map((attachment) => attachment.relativePath);
-	return `Attached images were saved for vision delegation. If visual understanding is required, delegate to the subagents tool with subagentType='vision' and imagePaths=${JSON.stringify(imagePaths)} plus a focused task/focus.`;
+	return `Attached images were saved for lookup. If visual understanding is required, call lookup with imagePaths=${JSON.stringify(imagePaths)} and a focused question.`;
 }
 
 function visionBridgeWarning(bridge: BridgeImageAttachmentsResult | undefined): string | undefined {

package/external/pi-tools-suite/src/async-subagents/lib.ts

@@ -12,7 +12,7 @@ export type {
 } from "./core/types.js";
 
 export { createRunDir, getRunRoot, resolveRunDir, validateBasename } from "./core/paths.js";
-export type { CopySubagentConfigSampleResult, ResolvedAgentTaskConfig, ResolvedSubagentRoutingConfig, ResolveAgentTaskOptions, SubagentConfig, SubagentPreset, SubagentRoutingConfig, SubagentTypeConfig, SubagentVisionConfig } from "./core/config.js";
+export type { CopySubagentConfigSampleResult, ModelByParentEntry, ResolvedAgentTaskConfig, ResolvedSubagentRoutingConfig, ResolveAgentTaskOptions, SubagentConfig, SubagentPreset, SubagentRoutingConfig, SubagentTypeConfig, SubagentVisionConfig } from "./core/config.js";
 export {
 	configFiles,
 	copySubagentConfigSample,

package/external/pi-tools-suite/src/async-subagents/tools/spawn.ts

@@ -167,12 +167,12 @@ const AgentTaskSchema = Type.Object({
 	id: Type.Optional(Type.String({ description: "Short identifier for this agent (used as directory name). If omitted, the spawn action assigns agent-1, agent-2, etc." })),
 	task: Type.String({ description: "Focused task description for the sub-agent" }),
 	scope: Type.Optional(Type.String({ description: "Relevant files/areas for this task" })),
-	subagentType: Type.Optional(Type.String({ description: "Logical sub-agent type/profile from config. Usually omit this so the router selects from the current config; set only for an explicit user-requested role, vision/image handling, deterministic tests, or another concrete override." })),
+	subagentType: Type.Optional(Type.String({ description: "Logical sub-agent type/profile from config. Usually omit this so the router selects from the current config; set only for an explicit user-requested role, deterministic tests, or another concrete override." })),
 	model: Type.Optional(Type.String({ description: "Explicit model override for this sub-agent. Prefer subagentType for reusable routing." })),
 	thinking: Type.Optional(Type.String({ description: "Per-agent thinking level override (off, minimal, low, medium, high, xhigh)." })),
 	promptAppend: Type.Optional(Type.String({ description: "Extra prompt instructions appended after the generated/type prompt." })),
 	promptOverride: Type.Optional(Type.String({ description: "Full prompt replacement for this sub-agent. Prefer configuring this per subagentType." })),
-	focus: Type.Optional(Type.String({ description: "For vision sub-agents: what to pay special attention to while inspecting attached images." })),
+	focus: Type.Optional(Type.String({ description: "Optional focus/attention instructions for attached images or scoped inspection." })),
 	attention: Type.Optional(Type.String({ description: "Alias for focus, accepted for compatibility." })),
 	imagePaths: Type.Optional(Type.Array(Type.String(), { description: "Local image paths to attach to this sub-agent prompt (jpg, png, gif, or webp). Relative paths resolve from cwd." })),
 	tools: Type.Optional(Type.Array(Type.String(), { description: "Tool names to enable (e.g. ['read','grep','bash'])" })),
@@ -237,12 +237,14 @@ export function registerSpawnTool(
 			}
 			const routed = await routeSubagentTasks(normalized.tasks ?? [], config, ctx as any, signal ?? undefined);
 			const timeoutMs = timeoutMsFromSeconds(params.timeoutSeconds);
+			const parentModel = currentModelRef((ctx as { model?: unknown }).model);
 			const resolvedTasks = routed.tasks.map((task) => applySessionModelFallback(
 				resolveAgentTaskConfig(task, config, {
 					preset: activePreset,
 					thinking: params.thinking,
 					extraArgs: Array.isArray(params.extraArgs) ? params.extraArgs : [],
 					forcedModel,
+					parentModel,
 					timeoutMs,
 				}),
 			));

package/external/pi-tools-suite/src/async-subagents/tools/subagents.ts

@@ -19,12 +19,12 @@ const AgentTaskSchema = Type.Object({
 	id: Type.Optional(Type.String({ description: "Short identifier for this agent (used as directory name). If omitted, assigns agent-1, agent-2, etc." })),
 	task: Type.String({ description: "Focused task description for the sub-agent" }),
 	scope: Type.Optional(Type.String({ description: "Relevant files/areas for this task" })),
-	subagentType: Type.Optional(Type.String({ description: "Logical sub-agent type/profile from config. Usually omit this so the router selects from the current config; set only for an explicit user-requested role, vision/image handling, deterministic tests, or another concrete override." })),
+	subagentType: Type.Optional(Type.String({ description: "Logical sub-agent type/profile from config. Usually omit this so the router selects from the current config; set only for an explicit user-requested role, deterministic tests, or another concrete override." })),
 	model: Type.Optional(Type.String({ description: "Explicit model override for this sub-agent. Prefer subagentType for reusable routing." })),
 	thinking: Type.Optional(Type.String({ description: "Per-agent thinking level override (off, minimal, low, medium, high, xhigh)." })),
 	promptAppend: Type.Optional(Type.String({ description: "Extra prompt instructions appended after the generated/type prompt." })),
 	promptOverride: Type.Optional(Type.String({ description: "Full prompt replacement for this sub-agent. Prefer configuring this per subagentType." })),
-	focus: Type.Optional(Type.String({ description: "For vision sub-agents: what to pay special attention to while inspecting attached images." })),
+	focus: Type.Optional(Type.String({ description: "Optional focus/attention instructions for attached images or scoped inspection." })),
 	attention: Type.Optional(Type.String({ description: "Alias for focus, accepted for compatibility." })),
 	imagePaths: Type.Optional(Type.Array(Type.String(), { description: "Local image paths to attach to this sub-agent prompt (jpg, png, gif, or webp). Relative paths resolve from cwd." })),
 	tools: Type.Optional(Type.Array(Type.String(), { description: "Tool names to enable (e.g. ['read','grep','bash'])" })),

package/external/pi-tools-suite/src/{glm-coding-discipline → coding-discipline}/index.ts

@@ -59,7 +59,7 @@ const LOOKUP_TOOL_PARAMS = Type.Object(
 );
 
 const QUALITY_DISCIPLINE_LINES = [
-	"GLM TOOL-ONLY CODING AGENT CONTRACT.",
+	"TOOL-ONLY CODING AGENT CONTRACT.",
 	"",
 	"This contract controls the assistant output channel. Follow it literally.",
 	"Treat every user coding request as a tool-driven task, not a chat conversation.",
@@ -126,9 +126,14 @@ const QUALITY_DISCIPLINE_LINES = [
 	"While WORKING, this behavior is internal and expressed only through tool choices, not prose.",
 	"",
 	"Maintain these invariants:",
-	"- preserve existing behavior unless the user asked to change it;",
-	"- make minimal, localized changes;",
-	"- respect project conventions already present in nearby code;",
+	"- make the smallest correct change;",
+	"- keep diffs local; no unrelated refactors, renames, moves, reformatting, or dependency changes;",
+	"- inspect code before editing; do not invent APIs, files, commands, or behavior;",
+	"- before non-trivial edits, know the verification path;",
+	"- for bugs, prefer a failing test or repro first; then make the minimal fix; then verify;",
+	"- high-risk changes need a short spec before coding: goal, scope, behavior, risks, verification;",
+	"- high-risk includes security, privacy, auth/authz, data/schema/migrations, public APIs, external integrations, payments, jobs, concurrency, and irreversible or cross-cutting changes;",
+	"- follow nearby conventions; preserve existing behavior unless explicitly changing it;",
 	"- handle edge cases, errors, cancellation, and async behavior;",
 	"- avoid blocking UI/event loops;",
 	"- avoid duplicate state, duplicate prompts, and repeated side effects.",
@@ -147,6 +152,9 @@ const FINAL_DISCIPLINE_LINES = [
 	"",
 	"When uncertain, test or inspect instead of assuming.",
 	"If blocked by missing required information, ask exactly one concise question.",
+	"Verify every non-trivial change. Never claim tests passed unless they were actually run.",
+	"Report: what changed, what was verified, what was not verified, and any risks.",
+	"Ask at most one blocking question; otherwise proceed with grounded best effort.",
 ];
 
 const SILENCE_REMINDER_TEXT = [
@@ -175,7 +183,7 @@ const LOOKUP_SYSTEM_PROMPT = [
 	"Return concise factual observations and practical implications for the parent agent.",
 ].join("\n");
 
-export default function glmCodingDiscipline(pi: ExtensionAPI) {
+export default function codingDiscipline(pi: ExtensionAPI) {
 	let selectedModelRef: string | undefined;
 	let lookupRegistered = false;
 	let silenceViolationCount = 0;
@@ -226,8 +234,9 @@ export default function glmCodingDiscipline(pi: ExtensionAPI) {
 
 	pi.on("before_provider_request", async (event: { payload?: unknown }, ctx: unknown) => {
 		const modelRef = modelRefFromPayload(event.payload) ?? selectedModelRef ?? modelRefFromContext(ctx);
-		if (!isGlmModel(modelRef)) return undefined;
-		return injectCodingDisciplineIntoPayload(event.payload, { lookupEnabled: Boolean(lookupModelFromConfig(contextCwd(ctx))) });
+		return injectCodingDisciplineIntoPayload(event.payload, {
+			lookupEnabled: isGlmModel(modelRef) && Boolean(lookupModelFromConfig(contextCwd(ctx))),
+		});
 	});
 
 	pi.on("context", async (event: { messages?: unknown[] }, ctx: unknown) => {
@@ -454,7 +463,7 @@ function createSilenceReminderMessage() {
 }
 
 function lookupModelFromConfig(cwd?: string): string | undefined {
-	return loadPiToolsSuiteConfig(["glm-coding-discipline"], { cwd: cwd ?? process.cwd() }).lookupModel;
+	return loadPiToolsSuiteConfig(["coding-discipline"], { cwd: cwd ?? process.cwd() }).lookupModel;
 }
 
 function buildLookupPrompt(params: LookupParams, recentContext: string, imageCount: number, warnings: string[]): string {