@dougbots/pi-agents 0.2.0 → 0.3.0

package/README.md

@@ -76,8 +76,14 @@ session and restored by `/resume`.
 
 `PI_AGENT_PROFILE=<name>` is an explicit launch-time override; `PROFILE=<name>`
 is accepted as a convenience alias. Both take precedence over a saved session
-selection. Explicit `--model` still takes precedence over an agent-profile's
-model.
+selection. Explicit `--model` and `--thinking` still take precedence over an
+agent-profile's model and thinking level.
+
+While a session has a profile active, the extension reflects it into
+`process.env.PI_AGENT_PROFILE` (cleared on `/agent-profile none`). Child
+processes inherit it, so tooling like `agent-model.sh <role> pi` resolves the
+same model the session runs, and fresh dispatches from the session stay on the
+active profile.
 
 ## Commands
 
@@ -114,7 +120,7 @@ avenor_spawn(
 )
 ```
 
-Explicit `--model` selection takes precedence over the profile default. Avenor forwards its `model` option to the pi subprocess as `--model`, so no agent config changes are needed for a one-off override.
+Explicit `--model` and `--thinking` selections take precedence over the profile defaults. Avenor forwards a roster entry's `model` and `thinking` to the pi subprocess as `--model` and `--thinking`, so no agent config changes are needed for a one-off override, and a roster entry that names an agent keeps its own thinking level.
 
 Requires [avenor](https://github.com/sdougbrown/avenor) with the pi backend (v0.3.3+). Model resolution falls back to `~/.pi/agent/agents.json` when the agent is not found in opencode config.
 

package/extensions/agents/index.ts

@@ -9,7 +9,7 @@ import {
   type AgentProfilesConfig,
   type ThinkingLevel,
 } from "./agent-profile.ts";
-import { findCliModelOverride, parseModelSpecifier } from "./model-selection.ts";
+import { findCliModelOverride, findCliThinkingOverride, parseModelSpecifier } from "./model-selection.ts";
 
 /* ------------------------------------------------------------------ */
 /*  Types                                                              */
@@ -137,10 +137,12 @@ function checkBashPermission(
 export default async function (pi: ExtensionAPI) {
   const agents = loadAgentsConfig();
   const { profiles: agentProfiles, errors: agentProfileConfigErrors } = loadAgentProfilesConfig();
-  // Built-in flags are not exposed through pi.getFlag(). Avenor forwards its
-  // model option to pi as --model, so argv is the extension-level signal that
-  // the caller's model should take precedence over the profile default.
+  // Built-in flags are not exposed through pi.getFlag(). Avenor forwards a
+  // roster entry's model and thinking level to pi as --model and --thinking,
+  // so argv is the extension-level signal that the caller's choice should take
+  // precedence over the profile default.
   const cliModelOverride = findCliModelOverride(process.argv.slice(2));
+  const cliThinkingOverride = findCliThinkingOverride(process.argv.slice(2));
   let activeAgent: { name: string; profile: AgentProfile } | null = null;
   let activeAgentProfileName: string | undefined;
 
@@ -161,6 +163,20 @@ export default async function (pi: ExtensionAPI) {
     );
   }
 
+  /**
+   * Surface the session's active agent-profile to child processes.
+   *
+   * agent-model.sh resolves a role's effective model by reading
+   * $PI_AGENT_PROFILE; absent a launch-time override, the interactive
+   * /agent-profile selection is otherwise invisible to anything pi spawns.
+   * Mirroring it into the env lets the resolver agree with the session and,
+   * since children inherit it, keeps fresh dispatches on the same profile.
+   */
+  function syncProfileEnv(name: string | undefined) {
+    if (name) process.env.PI_AGENT_PROFILE = name;
+    else delete process.env.PI_AGENT_PROFILE;
+  }
+
   /** Apply a named agent-profile, optionally saving the choice in this session. */
   async function selectAgentProfile(
     name: string | undefined,
@@ -175,6 +191,7 @@ export default async function (pi: ExtensionAPI) {
     const previousName = activeAgentProfileName;
     activeAgentProfileName = name;
     setAgentProfileStatus(ctx);
+    syncProfileEnv(name);
 
     // The active role must receive a new effective model/thinking level now;
     // future roles resolve the overlay when /agent is invoked. Do not persist
@@ -182,6 +199,7 @@ export default async function (pi: ExtensionAPI) {
     if (activeAgent && !(await applyAgent(activeAgent.name, ctx))) {
       activeAgentProfileName = previousName;
       setAgentProfileStatus(ctx);
+      syncProfileEnv(previousName);
       return false;
     }
 
@@ -215,7 +233,7 @@ export default async function (pi: ExtensionAPI) {
       await pi.setModel(model);
     }
 
-    if (profile.thinkingLevel) pi.setThinkingLevel(profile.thinkingLevel);
+    if (profile.thinkingLevel && !cliThinkingOverride) pi.setThinkingLevel(profile.thinkingLevel);
 
     // Tool restrictions — best-effort against currently registered tools.
     // tool_call handler enforces restrictions regardless of registration timing.

package/extensions/agents/model-selection.ts

@@ -4,19 +4,30 @@ export interface ModelSpecifier {
 }
 
 /**
- * Return the model explicitly supplied to pi, if any.
+ * Return the value pi received for a built-in flag, if any.
  *
- * Pi consumes --model itself, so extension flags cannot expose this value via
- * pi.getFlag(). Inspecting argv lets agent profiles respect normal CLI
- * precedence, including models forwarded by Avenor.
+ * Pi consumes its built-in flags itself, so extension flags cannot expose
+ * these values via pi.getFlag(). Inspecting argv lets agent profiles respect
+ * normal CLI precedence, including the model and thinking level Avenor
+ * forwards from a roster entry.
  */
-export function findCliModelOverride(argv: readonly string[]): string | undefined {
+function findCliFlagValue(argv: readonly string[], flag: string): string | undefined {
   for (let index = 0; index < argv.length - 1; index += 1) {
-    if (argv[index] === "--model") return argv[index + 1];
+    if (argv[index] === flag) return argv[index + 1];
   }
   return undefined;
 }
 
+/** Return the model explicitly supplied to pi, if any. */
+export function findCliModelOverride(argv: readonly string[]): string | undefined {
+  return findCliFlagValue(argv, "--model");
+}
+
+/** Return the thinking level explicitly supplied to pi, if any. */
+export function findCliThinkingOverride(argv: readonly string[]): string | undefined {
+  return findCliFlagValue(argv, "--thinking");
+}
+
 /** Split provider/model-id at the first slash so model IDs may contain slashes. */
 export function parseModelSpecifier(specifier: string): ModelSpecifier | undefined {
   const separator = specifier.indexOf("/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougbots/pi-agents",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Agent profiles for pi — preconfigured model, system prompt, tool restrictions, and permission gates",
   "scripts": {
     "test": "node --experimental-strip-types --test tests/*.test.mts"