pantheon-opencode 1.6.0-beta.10 → 1.6.0-beta.12

package/src/mcp/mcp_persistence.py

@@ -914,15 +914,35 @@ def _validate_delegations(delegations: object) -> None:
 
 def _validate_tail(tail: object, payload_bytes: int | None = None) -> list[str]:
     """Validate bounded serialized tail lines."""
-    if not isinstance(tail, list) or len(tail) > MAX_TAIL_ITEMS:
-        raise ValueError("tail exceeds its size limit")
+    if not isinstance(tail, list):
+        raise ValueError("tail must be an array")
+    if len(tail) > MAX_TAIL_ITEMS:
+        raise ValueError(
+            f"tail has {len(tail)} items; maximum is {MAX_TAIL_ITEMS}; "
+            "remove tail entries or omit tail"
+        )
     for line in tail:
-        if not isinstance(line, str) or len(line.encode()) > MAX_TAIL_LINE_LENGTH:
-            raise ValueError("tail entries exceed their size limit")
+        if not isinstance(line, str):
+            raise ValueError("tail entries must be strings")
+        line_bytes = len(line.encode())
+        if line_bytes > MAX_TAIL_LINE_LENGTH:
+            raise ValueError(
+                f"tail entries are {line_bytes:,} UTF-8 bytes; maximum is "
+                f"{MAX_TAIL_LINE_LENGTH:,}; remove or shorten tail entries, "
+                "or omit tail"
+            )
     if payload_bytes is not None and payload_bytes > MAX_CONTEXT_CONTENT_BYTES:
-        raise ValueError("tail payload exceeds its size limit")
-    if sum(len(line.encode()) for line in tail) > MAX_CONTEXT_CONTENT_BYTES:
-        raise ValueError("tail payload exceeds its size limit")
+        raise ValueError(
+            f"tail payload is {payload_bytes:,} UTF-8 bytes; maximum is "
+            f"{MAX_CONTEXT_CONTENT_BYTES:,}; remove tail entries or omit tail"
+        )
+    tail_bytes = sum(len(line.encode()) for line in tail)
+    if tail_bytes > MAX_CONTEXT_CONTENT_BYTES:
+        raise ValueError(
+            f"tail contains {tail_bytes:,} UTF-8 bytes across strings; maximum "
+            f"is {MAX_CONTEXT_CONTENT_BYTES:,} bytes; remove tail entries or "
+            "omit tail"
+        )
     return tail
 
 
@@ -1020,8 +1040,14 @@ def _collect_context_content_errors(
     if not isinstance(content, str):
         errors.shape(prefix, "a string", content)
         return
-    if len(content.encode()) > MAX_CONTEXT_CONTENT_BYTES:
-        errors.add(prefix, f"exceeds the {MAX_CONTEXT_CONTENT_BYTES}-byte limit")
+    content_bytes = len(content.encode())
+    if content_bytes > MAX_CONTEXT_CONTENT_BYTES:
+        errors.add(
+            prefix,
+            f"is {content_bytes:,} UTF-8 bytes; maximum is "
+            f"{MAX_CONTEXT_CONTENT_BYTES:,} bytes. Reduce content or omit "
+            "optional tail if it contributes",
+        )
         return
     try:
         parsed = json.loads(content)
@@ -1030,11 +1056,10 @@ def _collect_context_content_errors(
         # it as a checkpoint. It is still bounded above.
         return
     if isinstance(parsed, list) and key == "tail":
-        if len(parsed) > MAX_TAIL_ITEMS or any(
-            not isinstance(line, str) or len(line.encode()) > MAX_TAIL_LINE_LENGTH
-            for line in parsed
-        ):
-            errors.add(f"{prefix}.tail", "exceeds its size limit")
+        try:
+            _validate_tail(parsed)
+        except ValueError as exc:
+            errors.reroot(prefix, str(exc))
         return
     if not isinstance(parsed, dict):
         # The message already names 'content': do not prepend the path again.
@@ -1164,6 +1189,11 @@ def _upsert_context_entry(
     name="context_save",
     description="Save a context checkpoint for a session/phase. "
     "Stores structured JSON in persistence KV with a key-specific TTL. "
+    "The serialized content is limited to 65,536 UTF-8 bytes. An included "
+    "tail may contain at most 100 strings, each at most 4,096 UTF-8 bytes, "
+    "with at most 65,536 UTF-8 bytes across all tail strings. Oversized "
+    "content or tail is rejected, never truncated; remove or omit optional "
+    "tail data when applicable. "
     "content is a JSON STRING; when it parses to an object, 'goal', 'phase', "
     "'delegations' and 'heartbeat' must each be JSON OBJECTS and 'tail' must "
     "be a JSON ARRAY. 'phase' is an object {current,total,name} — NOT a phase "
@@ -1180,7 +1210,12 @@ async def context_save(
         str,
         Field(
             description=(
-                "JSON checkpoint string. When it parses to an object, 'goal', "
+                "JSON checkpoint string, limited to 65,536 UTF-8 bytes. An "
+                "included 'tail' may contain at most 100 strings, each at "
+                "most 4,096 UTF-8 bytes, with at most 65,536 UTF-8 bytes "
+                "across all tail strings. Oversized input is rejected, never "
+                "truncated; remove or omit optional 'tail' when applicable. "
+                "When it parses to an object, 'goal', "
                 "'phase', 'delegations' and 'heartbeat' must be objects and "
                 "'tail' must be an array; all are optional. 'phase' is an "
                 "object {current,total,name}, not a counter. Example: "

package/src/pantheon/cost-command.ts

@@ -129,7 +129,7 @@ const costArgs = {
     .min(1)
     .max(365)
     .optional()
-    .describe('Number of days of delegation history to include (default 7).'),
+    .describe('Number of rolling 24-hour days of history to include (default 7).'),
 } satisfies z.ZodRawShape
 
 /** The XDG state directory every real host installation writes its ledger to. */
@@ -459,6 +459,9 @@ function renderMarkdown(query: CostQuery, days: number): string {
   const header = `## Token usage by agent and phase (last ${days} days)`
   const footer = [
     formatCoverage(coverage, days),
+    'Window: rolling 24-hour days from query time (not calendar days or session boundaries).',
+    'Aggregation: per agent and phase; phase may be unknown on V2.',
+    'Limits: not grouped by session, task, model, or provider; tokens only (no dollar costs), so this cannot establish model-specific savings or deltas.',
     `Source: opencode.db (read-only) — table families: ${coverage.sources.join(' + ')} — ${coverage.assistantRows} assistant row(s) scanned`,
   ].join('\n')
   if (rows.length === 0) {
@@ -823,7 +826,7 @@ export function createCostCommand(options?: CostCommandOptions): CostCommand {
   return {
     pantheon_cost: {
       description:
-        'Report input, output, and total token usage by agent and phase over the last N days, read from opencode.db (read-only, no monetary values). The report states the coverage window it actually covers.',
+        'Report input, output, and total token usage by agent and phase in a rolling N × 24-hour window from query time (read-only, no monetary values). It is not grouped by session, task, model, or provider; phase may be unknown on V2, so it cannot establish model-specific savings or deltas. The report states the coverage window it actually covers.',
       args: costArgs,
       execute,
     },

package/src/pantheon/model-agents.ts

@@ -0,0 +1,19 @@
+/** Canonical agent IDs shared by model routing and V2 override validation. */
+export const KNOWN_AGENTS = [
+  'zeus',
+  'athena',
+  'apollo',
+  'hermes',
+  'aphrodite',
+  'demeter',
+  'themis',
+  'prometheus',
+  'hephaestus',
+  'nyx',
+  'gaia',
+  'iris',
+  'mnemosyne',
+  'talos',
+] as const
+
+export type KnownAgent = (typeof KNOWN_AGENTS)[number]

package/src/pantheon/model-command.ts

@@ -8,7 +8,7 @@
  * - set --agent X --model Y --effort Z --scope project|global: validates
  *   via CAPABILITY_TABLE/hasVision and persists atomically with .bak + lock.
  * - reset --agent X [--scope]: removes override.
- * - wizard (no args): askQuestions flow agent → model → effort → scope.
+ * - legacy V1 wizard (no args): askQuestions flow agent → model → effort → scope.
  *
  * Atomic writes use sibling .bak and temporary-file rename with O_NOFOLLOW
  * and per-path in-memory lock.
@@ -23,6 +23,7 @@ import { lstat, mkdir, open, rename, unlink } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { basename, dirname, join, resolve } from 'node:path'
 import { z } from 'zod'
+import { KNOWN_AGENTS } from './model-agents.ts'
 import {
   capabilityEntry,
   hasVision,
@@ -31,6 +32,10 @@ import {
   resolveActivePreset,
 } from './presets.mjs'
 import type { ToolContextLike } from './tool-context.ts'
+import { readV2ModelConfiguration } from './v2-model-overrides.ts'
+
+export type { KnownAgent } from './model-agents.ts'
+export { KNOWN_AGENTS } from './model-agents.ts'
 
 export type ModelScope = 'project' | 'global'
 export type ModelAction = 'status' | 'show' | 'set' | 'reset'
@@ -38,24 +43,6 @@ export type ModelAction = 'status' | 'show' | 'set' | 'reset'
 const MODEL_REF_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*\/[A-Za-z0-9][A-Za-z0-9._:+-]*$/
 const SAFE_PRESET_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/
 
-/** 14 canonical agents — must stay in sync with src/routing.yml agents. */
-export const KNOWN_AGENTS = [
-  'zeus',
-  'athena',
-  'apollo',
-  'hermes',
-  'aphrodite',
-  'demeter',
-  'themis',
-  'prometheus',
-  'hephaestus',
-  'nyx',
-  'gaia',
-  'iris',
-  'mnemosyne',
-  'talos',
-] as const
-export type KnownAgent = (typeof KNOWN_AGENTS)[number]
 const KNOWN_AGENTS_SET = new Set<string>(KNOWN_AGENTS)
 
 const modelArgs = {
@@ -107,6 +94,10 @@ export interface ModelCommandOptions {
   ask?: (questions: unknown[]) => Promise<Record<string, unknown>>
   /** Optional readline injection for wizard fallback. */
   rl?: { question: (q: string) => Promise<string>; close?: () => void }
+  /** V2 ignores static presets and reports/applies only explicit per-agent overrides. */
+  v2Mode?: boolean
+  /** Filesystem seam for secure V2 preset reads, including post-write verification. */
+  v2PresetReadFileSystem?: V2PresetReadFileSystem
 }
 
 export interface ModelTool {
@@ -127,6 +118,22 @@ interface ReadFileResult {
   data: unknown
 }
 
+interface V2PresetReadStats {
+  isFile(): boolean
+  mode: number
+}
+
+interface V2PresetReadHandle {
+  stat(): Promise<V2PresetReadStats>
+  readFile(encoding: 'utf8'): Promise<string>
+  close(): Promise<void>
+}
+
+/** Filesystem operations injectable for focused V2 race-safety tests. */
+export interface V2PresetReadFileSystem {
+  open(path: string, flags: number): Promise<V2PresetReadHandle>
+}
+
 interface AgentStatus {
   agent: string
   model: string | undefined
@@ -375,6 +382,75 @@ async function readActivePresetRaw(path: string, label: string): Promise<ReadFil
   }
 }
 
+/** Read V2 mutation state from one nonblocking, no-follow file descriptor. */
+export async function readV2ActivePresetRaw(
+  path: string,
+  label: string,
+  fileSystem: V2PresetReadFileSystem = {
+    open: async (filePath, flags) => open(filePath, flags),
+  },
+): Promise<ReadFileResult> {
+  const noFollowFlag = constants.O_NOFOLLOW
+  const nonBlockFlag = constants.O_NONBLOCK
+  if (
+    noFollowFlag === undefined ||
+    noFollowFlag === 0 ||
+    nonBlockFlag === undefined ||
+    nonBlockFlag === 0
+  ) {
+    throw new ModelCommandError(
+      `${label} cannot be read securely on this platform; configuration was not changed`,
+    )
+  }
+
+  let file: V2PresetReadHandle | undefined
+  try {
+    file = await fileSystem.open(path, constants.O_RDONLY | noFollowFlag | nonBlockFlag)
+    const openedStats = await file.stat()
+    if (!openedStats.isFile()) {
+      throw new ModelCommandError(
+        `${label} must be a regular file and must not be a symlink; configuration was not changed`,
+      )
+    }
+    const content = await file.readFile('utf8')
+    try {
+      const parsed: unknown = JSON.parse(content)
+      if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return {
+          exists: true,
+          valid: false,
+          data: null,
+          content,
+          mode: openedStats.mode & PERMISSION_MASK,
+        }
+      }
+      return {
+        exists: true,
+        valid: true,
+        data: parsed as Record<string, unknown>,
+        content,
+        mode: openedStats.mode & PERMISSION_MASK,
+      }
+    } catch {
+      return {
+        exists: true,
+        valid: false,
+        data: null,
+        content,
+        mode: openedStats.mode & PERMISSION_MASK,
+      }
+    }
+  } catch (error: unknown) {
+    if (errorCode(error) === 'ENOENT') return { exists: false, valid: true, data: null }
+    if (errorCode(error) === 'ELOOP') {
+      throw new ModelCommandError(`${label} must not be a symlink; configuration was not changed`)
+    }
+    throw error
+  } finally {
+    await file?.close().catch(() => undefined)
+  }
+}
+
 function normalizeAgentName(value: string): string {
   return value.trim().toLowerCase()
 }
@@ -464,11 +540,14 @@ async function writeActivePresetAtomically(
 
 function ensureActivePresetShape(
   raw: Record<string, unknown> | null,
-  fallbackPreset: string,
+  fallbackPreset?: string,
 ): Record<string, unknown> {
   const out: Record<string, unknown> = raw && typeof raw === 'object' ? { ...raw } : {}
   if (typeof out.version !== 'number') out.version = 1
-  if (typeof out.preset !== 'string' || (out.preset as string).trim() === '') {
+  if (
+    fallbackPreset !== undefined &&
+    (typeof out.preset !== 'string' || (out.preset as string).trim() === '')
+  ) {
     out.preset = fallbackPreset
   }
   if (typeof out.source !== 'string') out.source = 'cli'
@@ -516,34 +595,39 @@ async function updateActivePreset(
 
   const path = presetPathForScope(options, scope)
   return withPathLock(path, async () => {
-    const current = await readActivePresetRaw(path, 'configuration file')
+    const current = options.v2Mode
+      ? await readV2ActivePresetRaw(path, 'configuration file', options.v2PresetReadFileSystem)
+      : await readActivePresetRaw(path, 'configuration file')
     if (current.exists && !current.valid) {
       throw new ModelCommandError(`${scope} preset file contains invalid JSON; file preserved`)
     }
 
-    const env = envValue(options)
-    let fallbackPreset = defaultFallbackPreset()
-    // Prefer env preset if set and known
-    const envPreset = env.PANTHEON_MODEL_PRESET?.trim()
-    if (envPreset && envPreset !== '' && envPreset !== 'none') {
-      try {
-        const defs = loadPresetDefs()
-        if (Object.hasOwn(defs, envPreset)) fallbackPreset = envPreset
-      } catch {
-        // ignore
-      }
-    } else if (
-      current.data &&
-      typeof current.data === 'object' &&
-      (current.data as Record<string, unknown>).preset
-    ) {
-      const existing = (current.data as Record<string, unknown>).preset as string
-      if (
-        typeof existing === 'string' &&
-        existing.trim() !== '' &&
-        SAFE_PRESET_NAME.test(existing.trim())
+    let fallbackPreset: string | undefined
+    if (!options.v2Mode) {
+      const env = envValue(options)
+      fallbackPreset = defaultFallbackPreset()
+      // Prefer env preset if set and known (V1 legacy behavior only).
+      const envPreset = env.PANTHEON_MODEL_PRESET?.trim()
+      if (envPreset && envPreset !== '' && envPreset !== 'none') {
+        try {
+          const defs = loadPresetDefs()
+          if (Object.hasOwn(defs, envPreset)) fallbackPreset = envPreset
+        } catch {
+          // ignore
+        }
+      } else if (
+        current.data &&
+        typeof current.data === 'object' &&
+        (current.data as Record<string, unknown>).preset
       ) {
-        fallbackPreset = existing.trim()
+        const existing = (current.data as Record<string, unknown>).preset as string
+        if (
+          typeof existing === 'string' &&
+          existing.trim() !== '' &&
+          SAFE_PRESET_NAME.test(existing.trim())
+        ) {
+          fallbackPreset = existing.trim()
+        }
       }
     }
 
@@ -603,13 +687,25 @@ async function updateActivePreset(
 
       // health-check: verify file parses and preset resolves
       try {
-        const written = await readRegularFile(path, 'configuration file')
-        if (written) JSON.parse(written.content)
+        if (options.v2Mode) {
+          const written = await readV2ActivePresetRaw(
+            path,
+            'configuration file',
+            options.v2PresetReadFileSystem,
+          )
+          if (written.exists && written.content !== undefined) JSON.parse(written.content)
+        } else {
+          const written = await readRegularFile(path, 'configuration file')
+          if (written) JSON.parse(written.content)
+        }
       } catch {
         options.logger?.warn?.('health-check: active-preset.json verification failed')
       }
 
-      const base = `Model override set (${scope}): ${agentKey} → ${model} (effort: ${variantInfo.variant ?? 'none'}). Restart OpenCode for the change to take effect.`
+      const activation = options.v2Mode
+        ? 'V2 reads this override during the next agent-config transform on a subsequent OpenCode configuration load; the current session is unchanged.'
+        : 'Restart OpenCode for the change to take effect.'
+      const base = `Model override set (${scope}): ${agentKey} → ${model} (effort: ${variantInfo.variant ?? 'none'}). ${activation}`
       return visionWarning ? `${base}\n${visionWarning}` : base
     } else {
       // reset
@@ -620,7 +716,10 @@ async function updateActivePreset(
       // Clean up empty overrides.agents to keep file tidy, but keep overrides object
       // Remove empty overrides if no agents and no providers etc? Keep minimal.
       await writeActivePresetAtomically(path, shaped, current)
-      return `Model override removed (${scope}): ${agentKey}. Restart OpenCode for the change to take effect.`
+      const activation = options.v2Mode
+        ? 'V2 reads overrides during the next agent-config transform on a subsequent OpenCode configuration load; the current session is unchanged.'
+        : 'Restart OpenCode for the change to take effect.'
+      return `Model override removed (${scope}): ${agentKey}. ${activation}`
     }
   })
 }
@@ -630,6 +729,7 @@ async function updateActivePreset(
 async function resolvePerAgentStatus(options: ModelCommandOptions): Promise<{
   presetName: string | null
   presetSource: string | null
+  legacyPresetMarker: { source: 'env' | 'file' } | null
   agents: AgentStatus[]
   warnings: string[]
 }> {
@@ -637,6 +737,36 @@ async function resolvePerAgentStatus(options: ModelCommandOptions): Promise<{
   const candidates = activePresetCandidatesList(options)
   const warnings: string[] = []
 
+  if (options.v2Mode) {
+    const configuration = readV2ModelConfiguration({ candidates, env })
+    warnings.push(...configuration.warnings)
+    const agents = KNOWN_AGENTS.map((agent): AgentStatus => {
+      const override = configuration.overrides[agent]
+      let vision: boolean | undefined
+      if (override?.model) {
+        try {
+          vision = hasVision(override.model)
+        } catch {
+          vision = undefined
+        }
+      }
+      return {
+        agent,
+        model: override?.model,
+        effort: override?.variant,
+        origin: override ? 'override' : 'none',
+        vision,
+      }
+    })
+    return {
+      presetName: null,
+      presetSource: null,
+      legacyPresetMarker: configuration.legacyPresetMarker,
+      agents,
+      warnings,
+    }
+  }
+
   // Use presets.mjs resolver (sync) for canonical resolution, but capture warnings
   const logger: ModelCommandLogger = {
     warn: (m) => warnings.push(m),
@@ -702,16 +832,37 @@ async function resolvePerAgentStatus(options: ModelCommandOptions): Promise<{
   return {
     presetName: (resolved as { name?: string } | null)?.name ?? null,
     presetSource: (resolved as { source?: string } | null)?.source ?? null,
+    legacyPresetMarker: null,
     agents,
     warnings,
   }
 }
 
 async function renderStatus(options: ModelCommandOptions): Promise<string> {
-  const { presetName, presetSource, agents, warnings } = await resolvePerAgentStatus(options)
+  const { presetName, presetSource, legacyPresetMarker, agents, warnings } =
+    await resolvePerAgentStatus(options)
   const lines: string[] = []
-  lines.push('Pantheon model configuration per-agent (restart OpenCode after changes):')
-  if (presetName) {
+  lines.push(
+    options.v2Mode
+      ? 'Pantheon model configuration per-agent (configured values only; not a readout of the model serving a completion):'
+      : 'Pantheon model configuration per-agent (restart OpenCode after changes):',
+  )
+  if (options.v2Mode) {
+    lines.push('V2 manual override scope: project only; global overrides are not read or applied.')
+    if (legacyPresetMarker) {
+      const markerSource =
+        legacyPresetMarker.source === 'env' ? 'PANTHEON_MODEL_PRESET' : 'active-preset.json'
+      lines.push(
+        `Legacy preset marker present in ${markerSource} — ignored in V2; static presets are retired.`,
+      )
+    } else {
+      lines.push('Legacy preset marker: none (static presets are retired and ignored in V2).')
+    }
+    lines.push('Host default remains unchanged when no manual override is set.')
+    lines.push(
+      'Manual project-scoped per-agent overrides are read by the V2 agent transform on the next OpenCode configuration load; the current session is unchanged.',
+    )
+  } else if (presetName) {
     const originLabel =
       presetSource === 'env' ? 'env' : presetSource === 'file' ? 'preset' : presetSource
     lines.push(`active preset: ${presetName} (${presetSource ?? 'unknown'})`)
@@ -736,7 +887,7 @@ async function renderStatus(options: ModelCommandOptions): Promise<string> {
   return lines.join('\n')
 }
 
-// ─── Wizard (askQuestions) ──────────────────────────────────────────────────
+// ─── Legacy V1 wizard (askQuestions) ────────────────────────────────────────
 
 export function buildWizardQuestions(): unknown[] {
   return [
@@ -875,13 +1026,23 @@ async function runWizard(options: ModelCommandOptions): Promise<string> {
   }
 }
 
-/** Create the deterministic `pantheon_model` tool used by `/pantheon-model`. */
+/** Create the `pantheon_model` tool; the interactive wizard is V1-only. */
 export function createModelCommand(options: ModelCommandOptions = {}): ModelToolset {
+  const args = options.v2Mode
+    ? {
+        ...modelArgs,
+        action: modelArgs.action.describe(
+          'Operation: status/show, set, or reset. V1 no-args invocation runs the legacy wizard.',
+        ),
+      }
+    : modelArgs
+
   return {
     pantheon_model: {
-      description:
-        'Show, set, or reset per-agent model overrides in active-preset.json (project or global). Overrides win over preset; env preset wins over file. Never writes .env or top-level model/small_model.',
-      args: modelArgs,
+      description: options.v2Mode
+        ? 'Show, set, or reset explicit per-agent project-scoped model overrides in active-preset.json. Global overrides are not read or written in V2; future support requires separate explicit authorization. V2 ignores static preset names and PANTHEON_MODEL_PRESET; no wizard or implicit model selection. Status reports project-scoped configured values only and never writes .env or top-level model/small_model.'
+        : 'Show, set, or reset per-agent model overrides in active-preset.json (project or global). Overrides win over preset; env preset wins over file. Never writes .env or top-level model/small_model.',
+      args,
       execute: async (args, _ctx) => {
         try {
           const hasAction = args.action !== undefined
@@ -890,6 +1051,7 @@ export function createModelCommand(options: ModelCommandOptions = {}): ModelTool
 
           // Wizard when invoked with no args at all
           if (!hasAction && !hasAgentModelEffort) {
+            if (options.v2Mode) return await renderStatus(options)
             return await runWizard(options)
           }