@saadnvd1/agent-os 0.3.572 → 0.3.574

package/app/api/models/route.ts

@@ -17,7 +17,7 @@ export async function GET() {
   });
 }
 
-// PUT /api/models {roles?, providers?, prices?, planStep?} - replaces the
+// PUT /api/models {roles?, subagents?, providers?, prices?, planStep?} - replaces the
 // saved settings. Only from this machine or the tailnet: a provider's base
 // URL and key reference decide where a key is sent, so a stolen device
 // token mustn't be able to point them anywhere.

package/app/api/usage/subagents/route.ts

@@ -0,0 +1,10 @@
+import { NextRequest, NextResponse } from "next/server";
+import { subagentModelUsage } from "@/lib/usage/subagents";
+
+// GET /api/usage/subagents?days=7 - calls and tokens by subagent type and
+// the model that answered, for the last 1-90 days.
+export async function GET(request: NextRequest) {
+  const asked = Number(request.nextUrl.searchParams.get("days"));
+  const days = Number.isFinite(asked) && asked >= 1 ? Math.min(asked, 90) : 7;
+  return NextResponse.json({ days, rows: subagentModelUsage(days) });
+}

package/components/Models/ModelsSection.tsx

@@ -10,6 +10,7 @@ import {
   type ModelPrice,
   type ModelProvider,
 } from "@/lib/models/providers";
+import { SubagentModels } from "./SubagentModels";
 import { MODEL_ROLES, ROLE_LABELS } from "@/lib/models/roles";
 import { ModelSelect } from "./ModelSelect";
 import { ProviderCard } from "./ProviderCard";
@@ -98,6 +99,12 @@ export function ModelsSection() {
         />
       </section>
 
+      <SubagentModels
+        saved={saved.subagents}
+        disabled={update.isPending}
+        onChange={(subagents) => save({ subagents })}
+      />
+
       <section className="space-y-2">
         <h3 className="text-sm font-medium">Providers</h3>
         <p className="text-muted-foreground text-xs">

package/components/Models/SubagentModels.tsx

@@ -0,0 +1,123 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import {
+  DEFAULT_SUBAGENT_MODELS,
+  mustNotBeHaiku,
+  SUBAGENT_PATTERN,
+  SUBAGENT_TIERS,
+  TIER_LABELS,
+  type SubagentModels as Map,
+  type SubagentTier,
+} from "@/lib/models/subagent-tiers";
+
+// Which model each kind of subagent runs on (the Agent tool's
+// subagent_type), for Claude sessions. Types that plan, decide or review
+// can't be put on Haiku.
+export function SubagentModels({
+  saved,
+  disabled,
+  onChange,
+}: {
+  saved: Map | undefined;
+  disabled: boolean;
+  onChange: (next: Map) => void;
+}) {
+  const [adding, setAdding] = useState("");
+  const rows = { ...DEFAULT_SUBAGENT_MODELS, ...saved };
+  const valid = SUBAGENT_PATTERN.test(adding) && !(adding in rows);
+  const set = (type: string, tier: SubagentTier) =>
+    onChange({ ...saved, [type]: tier });
+
+  return (
+    <section className="space-y-2">
+      <h3 className="text-sm font-medium">Subagent models</h3>
+      <p className="text-muted-foreground text-xs">
+        Subagents a Claude session starts run on their own model by type: search
+        on Haiku, anything that plans, decides or reviews on Sonnet. A new
+        session picks a change up.
+      </p>
+      <ul className="space-y-2">
+        {Object.entries(rows).map(([type, tier]) => {
+          const custom = !(type in DEFAULT_SUBAGENT_MODELS);
+          return (
+            <li
+              key={type}
+              className="bg-muted/40 flex items-center gap-2 rounded-lg px-3 py-2"
+            >
+              <span className="min-w-0 flex-1 truncate font-mono text-sm">
+                {type}
+              </span>
+              <Select
+                value={tier}
+                disabled={disabled}
+                onValueChange={(v) => set(type, v as SubagentTier)}
+              >
+                <SelectTrigger
+                  aria-label={`Model for ${type}`}
+                  className="min-h-11 w-44"
+                >
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {SUBAGENT_TIERS.map((t) => (
+                    <SelectItem
+                      key={t}
+                      value={t}
+                      disabled={t === "haiku" && mustNotBeHaiku(type)}
+                    >
+                      {TIER_LABELS[t]}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              {(custom || saved?.[type] !== undefined) && (
+                <Button
+                  variant="ghost"
+                  className="min-h-11"
+                  disabled={disabled}
+                  onClick={() => {
+                    const next = { ...saved };
+                    delete next[type];
+                    onChange(next);
+                  }}
+                >
+                  {custom ? "Remove" : "Reset"}
+                </Button>
+              )}
+            </li>
+          );
+        })}
+      </ul>
+      <div className="flex gap-2">
+        <Input
+          value={adding}
+          onChange={(e) => setAdding(e.target.value.trim())}
+          placeholder="Another type, or prefix*"
+          aria-label="Subagent type to add"
+          className="min-h-11"
+        />
+        <Button
+          variant="secondary"
+          className="min-h-11"
+          disabled={disabled || !valid}
+          onClick={() => {
+            set(adding, "inherit");
+            setAdding("");
+          }}
+        >
+          Add
+        </Button>
+      </div>
+    </section>
+  );
+}

package/lib/agents/launch.ts

@@ -11,6 +11,7 @@ import { trustPromptKeys } from "../tasks/state";
 import { BUS_BRIEF } from "./brief";
 import { selfUrl } from "./self-env";
 import { autoCompactEnv } from "../chat/refresh";
+import { subagentEnv } from "../models/subagents";
 import { CLAUDE_STATUS_SETTINGS_FLAG } from "../program-status/claude-flag";
 import {
   sessionProjectEnv,
@@ -38,6 +39,7 @@ export function agentEnv(sessionId: string): Record<string, string> {
   return {
     ...sessionProjectEnv(sessionId),
     ...autoCompactEnv(sessionId),
+    ...subagentEnv(),
     AGENTOS_SESSION_ID: sessionId,
     AGENTOS_URL: selfUrl(),
     PATH: `${AOS_BIN_DIR}:${process.env.PATH ?? ""}`,

package/lib/chat/drivers/claude-approvals.ts

@@ -262,9 +262,15 @@ export function guardHook(guard: ToolGuard): HookCallback {
 // role's guard (an orchestrator's, on where it writes) sees every call.
 export function preToolUseHooks(
   approvals: Approvals,
-  guard?: ToolGuard
+  guard?: ToolGuard,
+  subagentModels?: HookCallback | null
 ): HookCallbackMatcher[] {
   return [
+    // Sets the model of a subagent call by its type. It only fills in the
+    // input, so the guard and permissions below still see the call.
+    ...(subagentModels
+      ? [{ matcher: "Agent|Task", hooks: [subagentModels] }]
+      : []),
     {
       matcher: "AskUserQuestion",
       hooks: [approvals.askQuestions],

package/lib/chat/drivers/claude.ts

@@ -25,6 +25,8 @@ import {
   URL_USERINFO,
 } from "../../orchestrator/untrusted";
 import { NO_ATTRIBUTION } from "../../agents/attribution";
+import { SUBAGENTS_ENV } from "../../models/subagent-env";
+import { parseSubagentEnv, subagentModelHook } from "../../models/subagents";
 import { callFromAssistant } from "../../usage/calls";
 
 // Claude Code through the Agent SDK, signed in with the user's own Claude
@@ -196,7 +198,11 @@ export const claudeDriver: ChatDriver = {
         allowedTools: options.allowedTools,
         disallowedTools: options.disallowedTools,
         hooks: {
-          PreToolUse: preToolUseHooks(approvals, options.toolGuard),
+          PreToolUse: preToolUseHooks(
+            approvals,
+            options.toolGuard,
+            subagentHook(options.env)
+          ),
           ...(options.compactContext && {
             SessionStart: compactedHooks(options.compactContext),
           }),
@@ -378,6 +384,13 @@ export const claudeDriver: ChatDriver = {
   },
 };
 
+// The hook that sets a subagent call's model, when the session's
+// environment carries a map.
+function subagentHook(env: Record<string, string> | undefined) {
+  const map = parseSubagentEnv(env?.[SUBAGENTS_ENV]);
+  return map ? subagentModelHook(map) : null;
+}
+
 // The tokens of each response, subagents' too (the mapper drops those), and
 // the CLI's limit readings, for the usage ledger. `agents` maps a subagent's
 // parent tool call to its type, learned from the call that started it.

package/lib/models/config.ts

@@ -22,6 +22,13 @@ import {
   REF_PATTERN,
   type ModelRole,
 } from "./roles";
+import {
+  mustNotBeHaiku,
+  SUBAGENT_PATTERN,
+  SUBAGENT_TIERS,
+  DEFAULT_SUBAGENT_MODELS,
+  type SubagentModels,
+} from "./subagent-tiers";
 
 // A name passed to `tv` or `security` as its own argument: no option, no
 // line break, nothing a shell would read.
@@ -114,8 +121,26 @@ const price = z.strictObject({
 const roleRef = z.string().trim().regex(REF_PATTERN, "must be provider/model");
 const roleMap = z.partialRecord(z.enum(MODEL_ROLES), roleRef);
 
+// Subagent type (or "prefix*") to the model its calls run on. A type that
+// plans, decides or reviews can't be put on Haiku.
+const subagentMap = z
+  .record(
+    z.string().regex(SUBAGENT_PATTERN, "not a subagent type"),
+    z.enum(SUBAGENT_TIERS)
+  )
+  .refine((m) => Object.keys(m).length <= 40, "at most 40 entries")
+  .superRefine((m, ctx) => {
+    for (const [pattern, tier] of Object.entries(m))
+      if (tier === "haiku" && mustNotBeHaiku(pattern))
+        ctx.addIssue({
+          code: "custom",
+          message: `${pattern} plans, decides or reviews, so it can't run on Haiku`,
+        });
+  });
+
 export const modelSettingsSchema = z.strictObject({
   roles: roleMap.optional(),
+  subagents: subagentMap.optional(),
   providers: z.array(providerSchema).optional(),
   prices: z.record(z.string().regex(REF_PATTERN), price).optional(),
   planStep: z.boolean().optional(),
@@ -200,6 +225,7 @@ export function setWorkspaceModels(
 // (by id), saved providers that aren't presets, and every role filled.
 export interface EffectiveModels {
   roles: Record<ModelRole, string>;
+  subagents: SubagentModels;
   providers: ModelProvider[];
   prices: Record<string, ModelPrice>;
   planStep: boolean;
@@ -212,6 +238,7 @@ export function effectiveModels(
   for (const p of saved.providers ?? []) byId.set(p.id, p as ModelProvider);
   return {
     roles: { ...DEFAULT_ROLE_MODELS, ...saved.roles },
+    subagents: { ...DEFAULT_SUBAGENT_MODELS, ...saved.subagents },
     providers: [...byId.values()],
     prices: { ...DEFAULT_PRICES, ...saved.prices },
     planStep: saved.planStep ?? true,

package/lib/models/resolve.ts

@@ -5,6 +5,7 @@
  * AGENTOS_TITLE_MODEL, then the default (lib/models/roles).
  */
 
+import { SUBAGENTS_ENV } from "./subagent-env";
 import { db, type Session } from "../db";
 import { getProject } from "../projects";
 import {
@@ -227,6 +228,8 @@ function routingEnv(p: ModelProvider, model: string): Record<string, string> {
     ANTHROPIC_DEFAULT_SONNET_MODEL: p.tiers?.sonnet ?? model,
     ANTHROPIC_DEFAULT_HAIKU_MODEL: p.tiers?.haiku ?? model,
     CLAUDE_CODE_SUBAGENT_MODEL: p.tiers?.sonnet ?? model,
+    // Per-type subagent routing is for Claude's own models.
+    [SUBAGENTS_ENV]: "",
   };
 }
 

package/lib/models/subagent-env.ts

@@ -0,0 +1,2 @@
+// The variable a session's subagent model map is passed in.
+export const SUBAGENTS_ENV = "AGENTOS_SUBAGENT_MODELS";

package/lib/models/subagent-tiers.ts

@@ -0,0 +1,42 @@
+/**
+ * Which model a subagent runs on, by its type. Read-only search (Explore)
+ * runs on Haiku; anything that plans, decides or reviews on Sonnet, and
+ * never on Haiku. Imported by the browser too, so no Node modules here.
+ */
+
+export const SUBAGENT_TIERS = ["haiku", "sonnet", "opus", "inherit"] as const;
+export type SubagentTier = (typeof SUBAGENT_TIERS)[number];
+
+// Subagent type (or "prefix*") to tier. "inherit" leaves a call on the
+// session's model.
+export type SubagentModels = Record<string, SubagentTier>;
+
+export const DEFAULT_SUBAGENT_MODELS: SubagentModels = {
+  Explore: "haiku",
+  Plan: "sonnet",
+  "general-purpose": "sonnet",
+  "review-*": "sonnet",
+};
+
+// Types that plan, decide or review: Settings can't put these on Haiku.
+export const NEVER_HAIKU = ["Plan", "general-purpose", "review-*"];
+
+export const TIER_LABELS: Record<SubagentTier, string> = {
+  haiku: "Haiku 4.5",
+  sonnet: "Sonnet 5.5",
+  opus: "Opus 5.5",
+  inherit: "Same as the session",
+};
+
+export const SUBAGENT_PATTERN = /^[A-Za-z0-9:_-]{1,80}\*?$/;
+
+// Whether a pattern could match a type that must not run on Haiku.
+export function mustNotBeHaiku(pattern: string): boolean {
+  const wild = pattern.endsWith("*");
+  const p = wild ? pattern.slice(0, -1) : pattern;
+  return NEVER_HAIKU.some((n) => {
+    const q = n.endsWith("*") ? n.slice(0, -1) : null;
+    if (q === null) return wild ? n.startsWith(p) : n === p;
+    return wild ? p.startsWith(q) || q.startsWith(p) : p.startsWith(q);
+  });
+}

package/lib/models/subagents.ts

@@ -0,0 +1,69 @@
+/**
+ * Routing a subagent's model by its type. Claude Code takes a subagent's
+ * model from the call, then its definition (the built-in Explore and Plan
+ * say "inherit"), then the session's: so a PreToolUse hook sets the call's
+ * own model. The map rides in the session's environment; a routed provider
+ * gets none (its tiers are mapped in lib/models/resolve instead).
+ */
+
+import type { HookCallback } from "@anthropic-ai/claude-agent-sdk";
+import {
+  routeAgentInput,
+  tierFor,
+} from "../../scripts/subagent-model-hook.mjs";
+import { effectiveModels } from "./config";
+import { SUBAGENTS_ENV } from "./subagent-env";
+import {
+  DEFAULT_SUBAGENT_MODELS,
+  SUBAGENT_TIERS,
+  type SubagentModels,
+} from "./subagent-tiers";
+
+export { routeAgentInput, tierFor };
+
+export const effectiveSubagentModels = (
+  saved?: SubagentModels
+): SubagentModels => ({ ...DEFAULT_SUBAGENT_MODELS, ...saved });
+
+// The environment that turns routing on for a session. A settings read that
+// fails leaves the session unrouted rather than not started.
+export function subagentEnv(): Record<string, string> {
+  try {
+    return { [SUBAGENTS_ENV]: JSON.stringify(effectiveModels().subagents) };
+  } catch (error) {
+    console.warn("[models] subagent routing off:", error);
+    return {};
+  }
+}
+
+// The map from a session's environment, or null when routing is off.
+export function parseSubagentEnv(
+  raw: string | undefined
+): SubagentModels | null {
+  if (!raw) return null;
+  try {
+    const map = JSON.parse(raw) as Record<string, unknown>;
+    const valid = Object.entries(map).filter(([, t]) =>
+      (SUBAGENT_TIERS as readonly unknown[]).includes(t)
+    );
+    return valid.length ? (Object.fromEntries(valid) as SubagentModels) : null;
+  } catch {
+    return null;
+  }
+}
+
+// The same rule as the terminal hook script, for chat sessions.
+export function subagentModelHook(map: SubagentModels): HookCallback {
+  return async (input) => {
+    if (input.hook_event_name !== "PreToolUse") return {};
+    if (input.tool_name !== "Agent" && input.tool_name !== "Task") return {};
+    const updatedInput = routeAgentInput(
+      (input.tool_input ?? {}) as Record<string, unknown>,
+      map
+    );
+    if (!updatedInput) return {};
+    return {
+      hookSpecificOutput: { hookEventName: "PreToolUse", updatedInput },
+    };
+  };
+}

package/lib/program-status/claude-hooks.ts

@@ -6,6 +6,12 @@ import { NO_ATTRIBUTION } from "../agents/attribution";
 const DIR = path.join(os.homedir(), ".agent-os");
 const HOOK = path.join(DIR, "bin", "agentos-status");
 const SETTINGS = path.join(DIR, "claude-status-hooks.json");
+const SUBAGENT_HOOK = path.join(DIR, "bin", "agentos-subagent-model.mjs");
+const SUBAGENT_SOURCE = path.join(
+  process.cwd(),
+  "scripts",
+  "subagent-model-hook.mjs"
+);
 const SOURCE = path.join(process.cwd(), "scripts", "claude-status-hook.sh");
 
 const EVENTS = [
@@ -21,8 +27,14 @@ const EVENTS = [
 const TOOL_EVENTS = new Set(["PreToolUse", "PermissionRequest", "PostToolUse"]);
 
 // The flag settings every terminal Claude AgentOS starts reads: the status
-// hooks, and no AI attribution on its commits and PRs.
-export function claudeStatusSettings(hook = HOOK) {
+// hooks, the subagent model hook (a no-op unless the session's environment
+// carries a map, lib/models/subagents), and no AI attribution on its
+// commits and PRs.
+export function claudeStatusSettings(
+  hook = HOOK,
+  subagentHook = SUBAGENT_HOOK,
+  node = process.execPath
+) {
   return {
     attribution: NO_ATTRIBUTION,
     hooks: Object.fromEntries(
@@ -39,6 +51,20 @@ export function claudeStatusSettings(hook = HOOK) {
               },
             ],
           },
+          ...(event === "PreToolUse"
+            ? [
+                {
+                  matcher: "Agent|Task",
+                  hooks: [
+                    {
+                      type: "command",
+                      command: `${JSON.stringify(node)} ${JSON.stringify(subagentHook)}`,
+                      timeout: 5,
+                    },
+                  ],
+                },
+              ]
+            : []),
         ],
       ])
     ),
@@ -64,6 +90,7 @@ export function installClaudeStatusHooks(): void {
   try {
     fs.mkdirSync(path.dirname(HOOK), { recursive: true });
     writeAtomic(HOOK, fs.readFileSync(SOURCE), 0o755);
+    writeAtomic(SUBAGENT_HOOK, fs.readFileSync(SUBAGENT_SOURCE), 0o755);
     writeAtomic(
       SETTINGS,
       Buffer.from(JSON.stringify(claudeStatusSettings(), null, 2) + "\n")

package/lib/usage/subagents.ts

@@ -0,0 +1,31 @@
+/**
+ * Which model each kind of subagent ran on: its calls and tokens by subagent
+ * type and the model the response came from, so a routing change shows up
+ * in what actually ran.
+ */
+
+import { db } from "../db";
+
+export interface SubagentModelRow {
+  agentType: string;
+  model: string;
+  calls: number;
+  tokens: number;
+}
+
+export function subagentModelUsage(
+  days: number,
+  now = Date.now()
+): SubagentModelRow[] {
+  return db
+    .prepare(
+      `SELECT COALESCE(agent_type, 'unknown') AS agentType, model, COUNT(*) AS calls,
+         SUM(input_tokens + cache_read_tokens + cache_write_5m_tokens
+           + cache_write_1h_tokens + output_tokens) AS tokens
+       FROM usage_calls
+       WHERE kind IN ('sub', 'review') AND at >= ?
+       GROUP BY agentType, model
+       ORDER BY calls DESC, agentType, model`
+    )
+    .all(now - days * 86_400_000) as SubagentModelRow[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.572",
+  "version": "0.3.574",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"

package/scripts/subagent-model-hook.d.mts

@@ -0,0 +1,5 @@
+export function tierFor(type: unknown, map: unknown): string | null;
+export function routeAgentInput(
+  toolInput: Record<string, unknown> | undefined,
+  map: Record<string, string>
+): Record<string, unknown> | null;

package/scripts/subagent-model-hook.mjs

@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+// A Claude Code PreToolUse hook for the Agent/Task tool: it sets the model of
+// a subagent call from its type, so read-only searches run on a cheaper
+// model. AgentOS copies it to ~/.agent-os/bin/agentos-subagent-model and
+// lists it in the settings it passes to terminal Claude sessions; chat
+// sessions run the same rule in-process (lib/models/subagents.ts). The map
+// (subagent type or "prefix*" to haiku|sonnet|opus|inherit) is JSON in
+// AGENTOS_SUBAGENT_MODELS. It always exits 0: a hook that fails must never
+// break the session.
+
+import { pathToFileURL } from "node:url";
+
+// The tier for a subagent type: an exact entry, else the longest "prefix*".
+export function tierFor(type, map) {
+  if (typeof type !== "string" || !map || typeof map !== "object") return null;
+  if (Object.hasOwn(map, type)) return map[type];
+  let best = null;
+  for (const pattern of Object.keys(map)) {
+    if (!pattern.endsWith("*")) continue;
+    const prefix = pattern.slice(0, -1);
+    if (
+      type.startsWith(prefix) &&
+      (best === null || prefix.length > best.length)
+    )
+      best = prefix;
+  }
+  return best === null ? null : map[`${best}*`];
+}
+
+// The call's input with its model set, or null to leave the call alone. A
+// caller's own choice is kept, except Haiku on a type routed higher: those
+// decide, and never run on Haiku.
+export function routeAgentInput(toolInput, map) {
+  const type = toolInput?.subagent_type;
+  if (type === "fork") return null;
+  const tier = tierFor(type, map);
+  if (!tier || tier === "inherit") return null;
+  const asked = toolInput.model;
+  if (asked === undefined || asked === null || asked === "")
+    return { ...toolInput, model: tier };
+  if (asked === "haiku" && tier !== "haiku")
+    return { ...toolInput, model: tier };
+  return null;
+}
+
+async function main() {
+  let map;
+  try {
+    map = JSON.parse(process.env.AGENTOS_SUBAGENT_MODELS || "");
+  } catch {
+    return;
+  }
+  let input = "";
+  for await (const chunk of process.stdin) input += chunk;
+  const call = JSON.parse(input);
+  if (call.tool_name !== "Agent" && call.tool_name !== "Task") return;
+  const updatedInput = routeAgentInput(call.tool_input, map);
+  if (updatedInput)
+    process.stdout.write(
+      JSON.stringify({
+        hookSpecificOutput: { hookEventName: "PreToolUse", updatedInput },
+      })
+    );
+}
+
+if (import.meta.url === pathToFileURL(process.argv[1] ?? "").href)
+  main().catch(() => {});