@osovv/vv-opencode 0.18.0 → 0.21.0

package/README.md

@@ -5,12 +5,12 @@ Portable OpenCode workflow package with a Bun CLI that installs and maintains Op
 ## What This Package Does
 
 - installs one pinned `@osovv/vv-opencode@<version>` entry into OpenCode
-- that package entry exports four plugins: `GuardianPlugin`, `MemoryPlugin`, `SystemContextInjectionPlugin`, `SecretsRedactionPlugin`
+- that package entry exports five plugins: `GuardianPlugin`, `MemoryPlugin`, `ModelRolesPlugin`, `SystemContextInjectionPlugin`, `SecretsRedactionPlugin`
 - creates and maintains canonical `vvoc` config at `$XDG_CONFIG_HOME/vvoc/vvoc.json`
 - scaffolds managed prompt files under `vvoc/agents/`
 - registers managed OpenCode agents: `enhancer`, `implementer`, `spec-reviewer`, `code-reviewer`, `investitagor`
 - installs plugin-managed agents: `guardian`, `memory-reviewer`
-- ships model-target presets, diagnostics, and shell completion through the `vvoc` CLI
+- ships role presets, diagnostics, and shell completion through the `vvoc` CLI
 
 ## Quick Start
 
@@ -44,10 +44,11 @@ vvoc install --scope project
 - create or refresh canonical `vvoc.json`
 - refresh managed built-in presets: `vv-openai`, `vv-zai`, `vv-minimax`
 
-That package entry exports four plugins:
+That package entry exports five plugins:
 
 - `GuardianPlugin`
 - `MemoryPlugin`
+- `ModelRolesPlugin`
 - `SystemContextInjectionPlugin`
 - `SecretsRedactionPlugin`
 
@@ -77,6 +78,7 @@ Persisted vvoc data lives here:
 
 `vvoc.json` currently contains these top-level sections:
 
+- `roles`
 - `guardian`
 - `memory`
 - `secretsRedaction`
@@ -86,12 +88,12 @@ The current schema is versioned and published with the package:
 
 ```json
 {
-  "$schema": "https://cdn.jsdelivr.net/npm/@osovv/vv-opencode@<installed-version>/schemas/vvoc/v2.json",
-  "version": 2
+  "$schema": "https://cdn.jsdelivr.net/npm/@osovv/vv-opencode@<installed-version>/schemas/vvoc/v3.json",
+  "version": 3
 }
 ```
 
-Schema source of truth lives in this repository at `schemas/vvoc/v2.json`.
+Schema source of truth lives in this repository at `schemas/vvoc/v3.json`.
 
 ## CLI Overview
 
@@ -103,83 +105,81 @@ Schema source of truth lives in this repository at `schemas/vvoc/v2.json`.
 | `vvoc status` | Show current installation state |
 | `vvoc doctor` | Diagnose setup problems and exit non-zero if problems are found |
 | `vvoc config validate` | Validate canonical `vvoc.json` |
-| `vvoc agent list/set/unset` | Manage model target overrides |
+| `vvoc role list/set/unset` | Manage canonical role assignments |
 | `vvoc preset list`, `vvoc preset show <name>`, `vvoc preset <name>` | Inspect or apply named presets |
 | `vvoc guardian config` | Print or write the `guardian` section of `vvoc.json` |
 | `vvoc plugin list` | List plugin entries from OpenCode config |
-| `vvoc patch-provider stepfun-ai|zai` | Patch a global OpenCode config preset |
+| `vvoc patch-provider stepfun-ai|zai|openai` | Patch a global OpenCode config preset |
 | `vvoc completion` | Install shell completions |
 | `vvoc upgrade` | Upgrade the global package and run a follow-up sync |
 | `vvoc version` | Print the installed package version |
 
-## Model Targets And Presets
+## Model Roles And Presets
 
-Inspect current model targets:
+Inspect current role assignments:
 
 ```bash
-vvoc agent list
+vvoc role list
 ```
 
-Set overrides:
+Set role assignments (`provider/model[:variant]`):
 
 ```bash
-vvoc agent set default openai/gpt-5.4
-vvoc agent set small-model openai/gpt-5.4-mini
-vvoc agent set guardian anthropic/claude-sonnet-4-5:high
-vvoc agent set memory-reviewer openai/gpt-5:high
-vvoc agent set explore openai/gpt-5.4-mini
+vvoc role set default openai/gpt-5.4
+vvoc role set smart openai/gpt-5.4:xhigh
+vvoc role set fast openai/gpt-5.4-mini
+vvoc role set team-review anthropic/claude-sonnet-4-5:high
 ```
 
-Remove overrides:
+Remove custom role assignments:
 
 ```bash
-vvoc agent unset default
-vvoc agent unset explore
-vvoc agent unset guardian
+vvoc role unset team-review
 ```
 
-Supported target IDs:
+Built-in role IDs:
 
 - `default`
-- `small-model`
-- `guardian`
-- `memory-reviewer`
-- `general`
-- `explore`
-- `enhancer`
-- `implementer`
-- `spec-reviewer`
-- `code-reviewer`
-- `investitagor`
+- `smart`
+- `fast`
+- `vision`
 
-Model syntax rules:
+Role notes:
 
-- `guardian` and `memory-reviewer` accept `provider/model[:variant]`
-- all other targets use `provider/model`
-- OpenCode-side targets respect `--scope`
-- `guardian` and `memory-reviewer` live in canonical `vvoc.json`, so they remain global even when `--scope project` is passed
+- `vvoc role` mutates only canonical global `vvoc.json` (`roles` map)
+- built-in roles cannot be removed with `vvoc role unset`
+- custom role IDs must use lowercase letters, digits, and hyphens
 
-Presets are stored in canonical `vvoc.json` and are useful when you want to switch several model targets together:
+Presets are stored in canonical `vvoc.json` and are useful when you want to switch several role assignments together:
 
 ```bash
 vvoc preset list
 vvoc preset show vv-openai
 vvoc preset vv-openai
-vvoc preset vv-zai --scope project
+vvoc preset vv-zai
 ```
 
 Preset rules:
 
 - managed built-in presets are `vv-openai`, `vv-zai`, and `vv-minimax`
 - `vvoc install` and `vvoc sync` always refresh those managed `vv-*` presets back to vvoc defaults
+- `vv-openai` uses the vv-managed OpenAI alias model `openai/vv-gpt-5.4-xhigh` as its default target so GPT-5.4 xhigh can be selected as an exact root default model
+- run `vvoc patch-provider openai` before applying `vv-openai` if the alias model is not already present in your global OpenCode config
 - user-defined presets with other names are preserved as-is, including legacy names such as `openai`, `zai`, and `minimax`
 - presets may be partial
-- applying a preset only changes the targets listed in that preset
-- OpenCode-side targets respect `--scope`
-- special targets such as `guardian` and `memory-reviewer` still write to canonical `vvoc.json`
+- applying a preset only changes the roles listed in that preset
+- `vvoc preset list/show/apply` reads the current canonical `vvoc.json` as-is and only bootstraps defaults when the file is missing
+- on existing `vvoc.json`, preset commands do not reseed or refresh managed preset definitions as a side effect
+- preset application updates only canonical global `vvoc.json` role assignments and does not rewrite OpenCode config directly
 
 ## Plugins Included
 
+### ModelRolesPlugin
+
+`ModelRolesPlugin` resolves `vv-role:*` model references at startup for supported OpenCode config fields (`model`, `small_model`, `agent.*.model`, and `command.*.model`).
+
+Agent role assignments that include `:variant` are translated into native `model` plus `variant` fields.
+
 ### GuardianPlugin
 
 `GuardianPlugin` reviews OpenCode permission requests with a constrained `guardian` agent and safe deny behavior.

package/dist/cli.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env bun
 // FILE: src/cli.ts
-// VERSION: 0.2.8
+// VERSION: 0.2.10
 // START_MODULE_CONTRACT
 //   PURPOSE: Assemble and run the vvoc CLI entrypoint.
 //   SCOPE: Package version lookup, top-level command registration, and main command execution.
 //   INPUTS: Process argv plus command metadata from registered subcommands.
 //   OUTPUTS: The executed vvoc command tree.
-//   DEPENDS: [citty, src/commands/install.ts, src/commands/preset.ts, src/commands/sync.ts, src/commands/status.ts, src/commands/doctor.ts, src/commands/guardian.ts, src/commands/patch-provider.ts, src/commands/version.ts, src/lib/package.ts]
+//   DEPENDS: [citty, src/commands/completion.ts, src/commands/config.ts, src/commands/doctor.ts, src/commands/guardian.ts, src/commands/init.ts, src/commands/install.ts, src/commands/patch-provider.ts, src/commands/preset.ts, src/commands/plugin.ts, src/commands/role.ts, src/commands/status.ts, src/commands/sync.ts, src/commands/upgrade.ts, src/commands/version.ts, src/lib/package.ts]
 //   LINKS: [M-CLI-COMMANDS]
 //   ROLE: SCRIPT
 //   MAP_MODE: LOCALS
@@ -18,10 +18,9 @@
 // END_MODULE_MAP
 //
 // START_CHANGE_SUMMARY
-//   LAST_CHANGE: [v0.2.8 - Renamed the OpenCode patch command to patch-provider.]
+//   LAST_CHANGE: [v0.2.10 - Aligned module dependency metadata with the actual imported command tree.]
 // END_CHANGE_SUMMARY
 import { defineCommand, runMain } from "citty";
-import agent from "./commands/agent.js";
 import completion from "./commands/completion.js";
 import config from "./commands/config.js";
 import doctor from "./commands/doctor.js";
@@ -31,6 +30,7 @@ import install from "./commands/install.js";
 import patchProvider from "./commands/patch-provider.js";
 import preset from "./commands/preset.js";
 import plugin from "./commands/plugin.js";
+import role from "./commands/role.js";
 import status from "./commands/status.js";
 import sync from "./commands/sync.js";
 import upgrade from "./commands/upgrade.js";
@@ -45,7 +45,6 @@ const main = defineCommand({
         description: "Install and sync vv-opencode plugins for OpenCode.",
     },
     subCommands: {
-        agent,
         completion,
         config,
         doctor,
@@ -55,6 +54,7 @@ const main = defineCommand({
         "patch-provider": patchProvider,
         preset,
         plugin,
+        role,
         status,
         sync,
         upgrade,

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,mBAAmB;AACnB,iBAAiB;AACjB,wBAAwB;AACxB,uDAAuD;AACvD,+FAA+F;AAC/F,4EAA4E;AAC5E,6CAA6C;AAC7C,mPAAmP;AACnP,4BAA4B;AAC5B,iBAAiB;AACjB,qBAAqB;AACrB,sBAAsB;AACtB,EAAE;AACF,mBAAmB;AACnB,oEAAoE;AACpE,wCAAwC;AACxC,iBAAiB;AACjB,EAAE;AACF,uBAAuB;AACvB,kFAAkF;AAClF,qBAAqB;AAErB,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,iCAAiC;AACjC,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAC;AAEjD,MAAM,IAAI,GAAG,aAAa,CAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,cAAc;QACvB,WAAW,EAAE,oDAAoD;KAClE;IACD,WAAW,EAAE;QACX,KAAK;QACL,UAAU;QACV,MAAM;QACN,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,OAAO;QACP,gBAAgB,EAAE,aAAa;QAC/B,MAAM;QACN,MAAM;QACN,MAAM;QACN,IAAI;QACJ,OAAO;QACP,OAAO;KACR;CACF,CAAC,CAAC;AACH,+BAA+B;AAE/B,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,mBAAmB;AACnB,kBAAkB;AAClB,wBAAwB;AACxB,uDAAuD;AACvD,+FAA+F;AAC/F,4EAA4E;AAC5E,6CAA6C;AAC7C,oYAAoY;AACpY,4BAA4B;AAC5B,iBAAiB;AACjB,qBAAqB;AACrB,sBAAsB;AACtB,EAAE;AACF,mBAAmB;AACnB,oEAAoE;AACpE,wCAAwC;AACxC,iBAAiB;AACjB,EAAE;AACF,uBAAuB;AACvB,uGAAuG;AACvG,qBAAqB;AAErB,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,iCAAiC;AACjC,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAC;AAEjD,MAAM,IAAI,GAAG,aAAa,CAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,cAAc;QACvB,WAAW,EAAE,oDAAoD;KAClE;IACD,WAAW,EAAE;QACX,UAAU;QACV,MAAM;QACN,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,OAAO;QACP,gBAAgB,EAAE,aAAa;QAC/B,MAAM;QACN,MAAM;QACN,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,OAAO;QACP,OAAO;KACR;CACF,CAAC,CAAC;AACH,+BAA+B;AAE/B,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/commands/agent.js

@@ -1,213 +1,29 @@
 // FILE: src/commands/agent.ts
-// VERSION: 0.8.0
+// VERSION: 1.0.0
 // START_MODULE_CONTRACT
-//   PURPOSE: Manage model overrides for vvoc-owned agents plus selected OpenCode model targets.
-//   SCOPE: Guardian and memory-reviewer section writes within vvoc.json plus built-in, managed, and top-level OpenCode model set/unset/list operations via the vvoc agent command tree.
-//   DEPENDS: [citty, src/lib/agent-models.ts, src/lib/managed-agents.ts, src/lib/opencode.ts, src/lib/vvoc-config.ts]
+//   PURPOSE: Keep a legacy vvoc agent command shim for backwards compatibility messaging.
+//   SCOPE: Emit a clear migration error directing users to vvoc role.
+//   DEPENDS: [citty]
 //   LINKS: [M-CLI-COMMANDS]
 //   ROLE: RUNTIME
 //   MAP_MODE: EXPORTS
 // END_MODULE_CONTRACT
 //
 // START_MODULE_MAP
-//   default - Agent command group.
+//   default - Legacy command shim for vvoc agent.
 // END_MODULE_MAP
 //
 // START_CHANGE_SUMMARY
-//   LAST_CHANGE: [v0.8.0 - Added OpenCode default and small-model targets to the vvoc agent command tree.]
+//   LAST_CHANGE: [v1.0.0 - Retired vvoc agent behavior and replaced it with a migration message to vvoc role.]
 // END_CHANGE_SUMMARY
 import { defineCommand } from "citty";
-import { CONFIGURABLE_OPENCODE_SUBAGENTS, isConfigurableOpenCodeSubagentName, isOpenCodeDefaultModelTargetName, MODEL_TARGET_NAME_CHOICES, parseModelTargetName, parseGuardianStyleModelArg, parseOpenCodeModelArg, formatAgentModel, } from "../lib/agent-models.js";
-import { MANAGED_OPENCODE_AGENTS } from "../lib/managed-agents.js";
-import { describeWriteResult, installManagedAgentPrompts, readOpenCodeDefaultModel, readOpenCodeAgentModel, readManagedAgentModels, readVvocConfig, resolvePaths, writeGuardianConfig, writeOpenCodeDefaultModel, writeManagedAgentModel, writeMemoryConfig, writeOpenCodeAgentModel, } from "../lib/opencode.js";
-import { createGuardianConfig, createMemoryConfig } from "../lib/vvoc-config.js";
-const scopeArg = {
-    type: "enum",
-    options: ["global", "project"],
-    default: "global",
-    description: "Write global or project config.",
-};
-const configDirArg = {
-    type: "string",
-    description: "Override the global config home.",
-};
-const agentArg = {
-    type: "positional",
-    required: true,
-    description: `Model target ID (${MODEL_TARGET_NAME_CHOICES}).`,
-};
-const modelArg = {
-    type: "positional",
-    required: true,
-    description: "Model in provider/model-id format. Guardian and memory-reviewer also accept provider/model-id[:variant].",
-};
-const agentSet = defineCommand({
-    meta: {
-        name: "set",
-        description: "Set a model target override.",
-    },
-    args: {
-        agent: agentArg,
-        model: modelArg,
-        scope: scopeArg,
-        "config-dir": configDirArg,
-    },
-    async run({ args }) {
-        const agentName = parseModelTargetName(args.agent, "set");
-        const paths = await resolveCommandPaths(args);
-        if (agentName === "guardian") {
-            await setGuardianModelOverride(paths, args.model);
-            return;
-        }
-        if (agentName === "memory-reviewer") {
-            await setMemoryReviewerModelOverride(paths, args.model);
-            return;
-        }
-        if (isOpenCodeDefaultModelTargetName(agentName)) {
-            const model = parseOpenCodeModelArg(args.model, "set");
-            const result = await writeOpenCodeDefaultModel(paths, resolveDefaultModelKey(agentName), {
-                model,
-                ensureEntry: true,
-            });
-            console.log(describeWriteResult(result));
-            return;
-        }
-        const model = parseOpenCodeModelArg(args.model, "set");
-        if (isConfigurableOpenCodeSubagentName(agentName)) {
-            const result = await writeOpenCodeAgentModel(paths, agentName, {
-                model,
-                ensureEntry: true,
-            });
-            console.log(describeWriteResult(result));
-            return;
-        }
-        await installManagedAgentPrompts(paths, { force: false });
-        const result = await writeManagedAgentModel(paths, agentName, {
-            model,
-            ensureEntry: true,
-        });
-        console.log(describeWriteResult(result));
-    },
-});
-const agentUnset = defineCommand({
-    meta: {
-        name: "unset",
-        description: "Remove a model target override.",
-    },
-    args: {
-        agent: agentArg,
-        scope: scopeArg,
-        "config-dir": configDirArg,
-    },
-    async run({ args }) {
-        const agentName = parseModelTargetName(args.agent, "unset");
-        const paths = await resolveCommandPaths(args);
-        if (agentName === "guardian") {
-            await unsetGuardianModelOverride(paths);
-            return;
-        }
-        if (agentName === "memory-reviewer") {
-            await unsetMemoryReviewerModelOverride(paths);
-            return;
-        }
-        if (isOpenCodeDefaultModelTargetName(agentName)) {
-            const result = await writeOpenCodeDefaultModel(paths, resolveDefaultModelKey(agentName), {
-                ensureEntry: false,
-            });
-            console.log(describeWriteResult(result));
-            return;
-        }
-        if (isConfigurableOpenCodeSubagentName(agentName)) {
-            const result = await writeOpenCodeAgentModel(paths, agentName, {
-                ensureEntry: false,
-            });
-            console.log(describeWriteResult(result));
-            return;
-        }
-        const result = await writeManagedAgentModel(paths, agentName, {
-            ensureEntry: false,
-        });
-        console.log(describeWriteResult(result));
-    },
-});
-const agentList = defineCommand({
-    meta: {
-        name: "list",
-        description: "List configured model targets.",
-    },
-    args: {
-        scope: {
-            ...scopeArg,
-            description: "Show global or project config.",
-        },
-        "config-dir": configDirArg,
-    },
-    async run({ args }) {
-        const scope = resolveScope(args.scope);
-        const paths = await resolveCommandPaths(args);
-        const vvocConfig = await readVvocConfig(paths);
-        const guardianConfig = vvocConfig?.guardian;
-        const memoryConfig = vvocConfig?.memory;
-        const managedModels = await readManagedAgentModels(paths);
-        console.log(`Model targets (${scope}):`);
-        console.log(`  default: ${formatAgentModel(await readOpenCodeDefaultModel(paths, "model"))}`);
-        console.log(`  small-model: ${formatAgentModel(await readOpenCodeDefaultModel(paths, "small_model"))}`);
-        console.log(`  guardian: ${formatAgentModel(guardianConfig?.model, guardianConfig?.variant)}`);
-        console.log(`  memory-reviewer: ${formatAgentModel(memoryConfig?.reviewerModel, memoryConfig?.reviewerVariant)}`);
-        for (const agentName of CONFIGURABLE_OPENCODE_SUBAGENTS) {
-            const model = await readOpenCodeAgentModel(paths, agentName);
-            console.log(`  ${agentName}: ${formatAgentModel(model)}`);
-        }
-        for (const definition of MANAGED_OPENCODE_AGENTS) {
-            console.log(`  ${definition.name}: ${formatAgentModel(managedModels[definition.name])}`);
-        }
-    },
-});
 export default defineCommand({
     meta: {
         name: "agent",
-        description: "Manage model target overrides.",
+        description: "Legacy alias removed in favor of vvoc role.",
     },
-    subCommands: {
-        set: agentSet,
-        unset: agentUnset,
-        list: agentList,
+    async run() {
+        throw new Error("`vvoc agent` has been removed. Use `vvoc role` instead.");
     },
 });
-async function setGuardianModelOverride(paths, value) {
-    const { model, variant } = parseGuardianStyleModelArg(value, "set");
-    const result = await writeGuardianConfig(paths, { model, variant }, { merge: true });
-    console.log(describeWriteResult(result));
-}
-async function unsetGuardianModelOverride(paths) {
-    const currentGuardian = (await readVvocConfig(paths))?.guardian ?? createGuardianConfig();
-    const { model: _model, variant: _variant, ...rest } = currentGuardian;
-    const result = await writeGuardianConfig(paths, rest);
-    console.log(describeWriteResult(result));
-}
-async function setMemoryReviewerModelOverride(paths, value) {
-    const { model, variant } = parseGuardianStyleModelArg(value, "set");
-    const result = await writeMemoryConfig(paths, { reviewerModel: model, reviewerVariant: variant }, { merge: true });
-    console.log(describeWriteResult(result));
-}
-async function unsetMemoryReviewerModelOverride(paths) {
-    const currentMemory = (await readVvocConfig(paths))?.memory ?? createMemoryConfig();
-    const { reviewerModel: _reviewerModel, reviewerVariant: _reviewerVariant, ...rest } = currentMemory;
-    const result = await writeMemoryConfig(paths, rest);
-    console.log(describeWriteResult(result));
-}
-function resolveScope(value) {
-    return value === "project" ? "project" : "global";
-}
-function resolveDefaultModelKey(targetName) {
-    return targetName === "default" ? "model" : "small_model";
-}
-async function resolveCommandPaths(args) {
-    const configDir = typeof args["config-dir"] === "string" ? args["config-dir"] : undefined;
-    return resolvePaths({
-        scope: resolveScope(args.scope),
-        cwd: process.cwd(),
-        configDir,
-    });
-}
 //# sourceMappingURL=agent.js.map

package/dist/commands/agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,iBAAiB;AACjB,wBAAwB;AACxB,gGAAgG;AAChG,wLAAwL;AACxL,sHAAsH;AACtH,4BAA4B;AAC5B,kBAAkB;AAClB,sBAAsB;AACtB,sBAAsB;AACtB,EAAE;AACF,mBAAmB;AACnB,mCAAmC;AACnC,iBAAiB;AACjB,EAAE;AACF,uBAAuB;AACvB,2GAA2G;AAC3G,qBAAqB;AAErB,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACL,+BAA+B,EAC/B,kCAAkC,EAClC,gCAAgC,EAChC,yBAAyB,EACzB,oBAAoB,EACpB,0BAA0B,EAC1B,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,EACxB,sBAAsB,EACtB,sBAAsB,EACtB,cAAc,EACd,YAAY,EAGZ,mBAAmB,EACnB,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEjF,MAAM,QAAQ,GAAG;IACf,IAAI,EAAE,MAAe;IACrB,OAAO,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC9B,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,iCAAiC;CAC/C,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,IAAI,EAAE,QAAiB;IACvB,WAAW,EAAE,kCAAkC;CAChD,CAAC;AAEF,MAAM,QAAQ,GAAG;IACf,IAAI,EAAE,YAAqB;IAC3B,QAAQ,EAAE,IAAI;IACd,WAAW,EAAE,oBAAoB,yBAAyB,IAAI;CAC/D,CAAC;AAEF,MAAM,QAAQ,GAAG;IACf,IAAI,EAAE,YAAqB;IAC3B,QAAQ,EAAE,IAAI;IACd,WAAW,EACT,0GAA0G;CAC7G,CAAC;AAEF,MAAM,QAAQ,GAAG,aAAa,CAAC;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK;QACX,WAAW,EAAE,8BAA8B;KAC5C;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,QAAQ;QACf,YAAY,EAAE,YAAY;KAC3B;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE9C,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC7B,MAAM,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QAED,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;YACpC,MAAM,8BAA8B,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO;QACT,CAAC;QAED,IAAI,gCAAgC,CAAC,SAAS,CAAC,EAAE,CAAC;YAChD,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,KAAK,EAAE,sBAAsB,CAAC,SAAS,CAAC,EAAE;gBACvF,KAAK;gBACL,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAEvD,IAAI,kCAAkC,CAAC,SAAS,CAAC,EAAE,CAAC;YAClD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE;gBAC7D,KAAK;gBACL,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QAED,MAAM,0BAA0B,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE;YAC5D,KAAK;YACL,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,aAAa,CAAC;IAC/B,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,iCAAiC;KAC/C;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,QAAQ;QACf,YAAY,EAAE,YAAY;KAC3B;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE9C,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC7B,MAAM,0BAA0B,CAAC,KAAK,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QAED,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;YACpC,MAAM,gCAAgC,CAAC,KAAK,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,IAAI,gCAAgC,CAAC,SAAS,CAAC,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,KAAK,EAAE,sBAAsB,CAAC,SAAS,CAAC,EAAE;gBACvF,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QAED,IAAI,kCAAkC,CAAC,SAAS,CAAC,EAAE,CAAC;YAClD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE;gBAC7D,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE;YAC5D,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,aAAa,CAAC;IAC9B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,gCAAgC;KAC9C;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,GAAG,QAAQ;YACX,WAAW,EAAE,gCAAgC;SAC9C;QACD,YAAY,EAAE,YAAY;KAC3B;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE9C,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,cAAc,GAAG,UAAU,EAAE,QAAQ,CAAC;QAC5C,MAAM,YAAY,GAAG,UAAU,EAAE,MAAM,CAAC;QACxC,MAAM,aAAa,GAAG,MAAM,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAE1D,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,IAAI,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,cAAc,gBAAgB,CAAC,MAAM,wBAAwB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9F,OAAO,CAAC,GAAG,CACT,kBAAkB,gBAAgB,CAAC,MAAM,wBAAwB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,EAAE,CAC3F,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,eAAe,gBAAgB,CAAC,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/F,OAAO,CAAC,GAAG,CACT,sBAAsB,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,CAAC,EAAE,CACrG,CAAC;QAEF,KAAK,MAAM,SAAS,IAAI,+BAA+B,EAAE,CAAC;YACxD,MAAM,KAAK,GAAG,MAAM,sBAAsB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,KAAK,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,uBAAuB,EAAE,CAAC;YACjD,OAAO,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,IAAI,KAAK,gBAAgB,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,gCAAgC;KAC9C;IACD,WAAW,EAAE;QACX,GAAG,EAAE,QAAQ;QACb,KAAK,EAAE,UAAU;QACjB,IAAI,EAAE,SAAS;KAChB;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,wBAAwB,CACrC,KAAsD,EACtD,KAAc;IAEd,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,0BAA0B,CAAC,KAAsD;IAC9F,MAAM,eAAe,GAAG,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,IAAI,oBAAoB,EAAE,CAAC;IAC1F,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,8BAA8B,CAC3C,KAAsD,EACtD,KAAc;IAEd,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,KAAK,EACL,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,EAClD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,gCAAgC,CAC7C,KAAsD;IAEtD,MAAM,aAAa,GAAG,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACpF,MAAM,EACJ,aAAa,EAAE,cAAc,EAC7B,eAAe,EAAE,gBAAgB,EACjC,GAAG,IAAI,EACR,GAAG,aAAa,CAAC;IAClB,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;AACpD,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAqC;IACnE,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;AAC5D,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,IAA6B;IAC9D,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1F,OAAO,YAAY,CAAC;QAClB,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;QAC/B,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,iBAAiB;AACjB,wBAAwB;AACxB,0FAA0F;AAC1F,sEAAsE;AACtE,qBAAqB;AACrB,4BAA4B;AAC5B,kBAAkB;AAClB,sBAAsB;AACtB,sBAAsB;AACtB,EAAE;AACF,mBAAmB;AACnB,kDAAkD;AAClD,iBAAiB;AACjB,EAAE;AACF,uBAAuB;AACvB,+GAA+G;AAC/G,qBAAqB;AAErB,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,eAAe,aAAa,CAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,6CAA6C;KAC3D;IACD,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;CACF,CAAC,CAAC"}

package/dist/commands/completion.js

@@ -1,11 +1,11 @@
 // FILE: src/commands/completion.ts
-// VERSION: 0.5.9
+// VERSION: 0.5.14
 // START_MODULE_CONTRACT
 //   PURPOSE: Auto-detect shell and install vvoc completions idempotently.
-//   SCOPE: Shell detection, completion file writing, nested command and preset completion generation for config/plugin/patch-provider/preset and the `agent set|unset <target-id>` flow, and rc file patching.
+//   SCOPE: Shell detection, completion file writing, nested command and preset completion generation for config/plugin/patch-provider/preset and the `role set|unset` flow, and rc file patching.
 //   INPUTS: Current shell environment plus built-in vvoc command and preset names.
 //   OUTPUTS: Shell-specific completion scripts and idempotent rc/config patches.
-//   DEPENDS: [citty, node:fs/promises, node:path, node:os]
+//   DEPENDS: [citty, node:fs/promises, node:path, node:os, src/lib/model-roles.ts]
 //   LINKS: [M-CLI-COMPLETION, M-CLI-COMMANDS]
 //   ROLE: RUNTIME
 //   MAP_MODE: EXPORTS
@@ -14,21 +14,20 @@
 // START_MODULE_MAP
 //   default - Completion install command definition for vvoc.
 //   detectShell - Detect current shell from SHELL env or process.
-//   installBashCompletion - Install bash completions.
-//   installZshCompletion - Install zsh completions.
-//   installFishCompletion - Install fish completions.
+//   generateBashCompletion - Build the bash completion script.
+//   generateZshCompletion - Build the zsh completion script.
+//   generateFishCompletion - Build the fish completion script.
 // END_MODULE_MAP
 //
 // START_CHANGE_SUMMARY
-//   LAST_CHANGE: [v0.5.9 - Renamed the patch command completions and added the zai patch preset.]
+//   LAST_CHANGE: [v0.5.14 - Restricted unset-role completions so shell suggestions no longer imply built-in roles are unsettable.]
 // END_CHANGE_SUMMARY
 import { defineCommand } from "citty";
 import { appendFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { resolve } from "node:path";
-import { SUPPORTED_MODEL_TARGET_NAMES } from "../lib/agent-models.js";
+import { BUILTIN_ROLE_NAMES } from "../lib/model-roles.js";
 const VVOC_TOP_LEVEL_COMMANDS = [
-    "agent",
     "completion",
     "config",
     "doctor",
@@ -38,18 +37,19 @@ const VVOC_TOP_LEVEL_COMMANDS = [
     "patch-provider",
     "preset",
     "plugin",
+    "role",
     "status",
     "sync",
     "upgrade",
     "version",
 ];
 const VVOC_CONFIG_COMMANDS = ["validate"];
-const VVOC_PATCH_PROVIDER_PRESETS = ["stepfun-ai", "zai"];
+const VVOC_PATCH_PROVIDER_PRESETS = ["stepfun-ai", "zai", "openai"];
 const VVOC_PRESET_COMMANDS = ["list", "show"];
-const VVOC_PRESET_NAMES = ["openai", "zai", "minimax"];
+const VVOC_PRESET_NAMES = ["vv-openai", "vv-zai", "vv-minimax"];
 const VVOC_PLUGIN_COMMANDS = ["list"];
-const VVOC_AGENT_COMMANDS = ["set", "unset", "list"];
-const VVOC_AGENT_TARGETS = [...SUPPORTED_MODEL_TARGET_NAMES];
+const VVOC_ROLE_COMMANDS = ["set", "unset", "list"];
+const VVOC_ROLE_IDS = [...BUILTIN_ROLE_NAMES];
 export default defineCommand({
     meta: {
         name: "completion",
@@ -151,8 +151,8 @@ export function generateBashCompletion() {
     const presetCommands = [...VVOC_PRESET_COMMANDS, ...VVOC_PRESET_NAMES].join(" ");
     const presetNames = VVOC_PRESET_NAMES.join(" ");
     const pluginCommands = VVOC_PLUGIN_COMMANDS.join(" ");
-    const agentCommands = VVOC_AGENT_COMMANDS.join(" ");
-    const agentTargets = VVOC_AGENT_TARGETS.join(" ");
+    const roleCommands = VVOC_ROLE_COMMANDS.join(" ");
+    const roleIds = VVOC_ROLE_IDS.join(" ");
     return ("# bash completion for vvoc\n" +
         "_vvoc() {\n" +
         "  local cur prev words cword\n" +
@@ -164,8 +164,8 @@ export function generateBashCompletion() {
         "      ;;\n" +
         "    2)\n" +
         '      case "${words[1]}" in\n' +
-        "        agent)\n" +
-        "          _vvoc_agent_commands\n" +
+        "        role)\n" +
+        "          _vvoc_role_commands\n" +
         "          ;;\n" +
         "        config)\n" +
         "          _vvoc_config_commands\n" +
@@ -183,8 +183,8 @@ export function generateBashCompletion() {
         "      ;;\n" +
         "    3)\n" +
         '      case "${words[1]}:${words[2]}" in\n' +
-        "        agent:set|agent:unset)\n" +
-        "          _vvoc_agent_target_commands\n" +
+        "        role:set)\n" +
+        "          _vvoc_role_ids\n" +
         "          ;;\n" +
         "        preset:show)\n" +
         "          _vvoc_preset_names\n" +
@@ -229,16 +229,16 @@ export function generateBashCompletion() {
         '  COMPREPLY=($(compgen -W "$commands" -- "$cur"))\n' +
         "}\n" +
         "\n" +
-        "_vvoc_agent_commands() {\n" +
+        "_vvoc_role_commands() {\n" +
         '  local commands="' +
-        agentCommands +
+        roleCommands +
         '"\n' +
         '  COMPREPLY=($(compgen -W "$commands" -- "$cur"))\n' +
         "}\n" +
         "\n" +
-        "_vvoc_agent_target_commands() {\n" +
+        "_vvoc_role_ids() {\n" +
         '  local commands="' +
-        agentTargets +
+        roleIds +
         '"\n' +
         '  COMPREPLY=($(compgen -W "$commands" -- "$cur"))\n' +
         "}\n" +
@@ -264,15 +264,18 @@ export function generateZshCompletion() {
     for (const cmd of VVOC_TOP_LEVEL_COMMANDS) {
         lines.push('    "' + cmd + '"');
     }
-    lines.push("  )", "", '  _arguments -C "1: :(' + VVOC_TOP_LEVEL_COMMANDS.join(" ") + ')" "*::arg:->args"', "", "  case $line[1] in", "    agent)", "      _vvoc_agent_cmds", "      ;;", "    config)", "      _vvoc_config_cmds", "      ;;", "    patch-provider)", "      _vvoc_patch_provider_cmds", "      ;;", "    preset)", "      _vvoc_preset_cmds", "      ;;", "    plugin)", "      _vvoc_plugin_cmds", "      ;;", "  esac", "}", "", "_vvoc_config_cmds() {", "  local -a config_commands", "  config_commands=(" + VVOC_CONFIG_COMMANDS.join(" ") + ")", '  _arguments "1: :(' + VVOC_CONFIG_COMMANDS.join(" ") + ')"', "}", "", "_vvoc_patch_provider_cmds() {", '  _arguments "1: :(' + VVOC_PATCH_PROVIDER_PRESETS.join(" ") + ')"', "}", "", "_vvoc_preset_cmds() {", "  case $words[2] in", "    show)", '      _arguments "1: :(' + VVOC_PRESET_NAMES.join(" ") + ')"', "      ;;", "    *)", '      _arguments "1: :(' + [...VVOC_PRESET_COMMANDS, ...VVOC_PRESET_NAMES].join(" ") + ')"', "      ;;", "  esac", "}", "", "_vvoc_agent_cmds() {", "  case $words[2] in", "    set|unset)", '      _arguments "1: :(' + VVOC_AGENT_TARGETS.join(" ") + ')"', "      ;;", "    *)", '      _arguments "1: :(' + VVOC_AGENT_COMMANDS.join(" ") + ')"', "      ;;", "  esac", "}", "", "_vvoc_plugin_cmds() {", "  local -a plugin_commands", "  plugin_commands=(" + VVOC_PLUGIN_COMMANDS.join(" ") + ")", '  _arguments "1: :(' + VVOC_PLUGIN_COMMANDS.join(" ") + ')"', "}", "", "compdef _vvoc vvoc");
+    lines.push("  )", "", '  _arguments -C "1: :(' + VVOC_TOP_LEVEL_COMMANDS.join(" ") + ')" "*::arg:->args"', "", "  case $line[1] in", "    role)", "      _vvoc_role_cmds", "      ;;", "    config)", "      _vvoc_config_cmds", "      ;;", "    patch-provider)", "      _vvoc_patch_provider_cmds", "      ;;", "    preset)", "      _vvoc_preset_cmds", "      ;;", "    plugin)", "      _vvoc_plugin_cmds", "      ;;", "  esac", "}", "", "_vvoc_config_cmds() {", "  local -a config_commands", "  config_commands=(" + VVOC_CONFIG_COMMANDS.join(" ") + ")", '  _arguments "1: :(' + VVOC_CONFIG_COMMANDS.join(" ") + ')"', "}", "", "_vvoc_patch_provider_cmds() {", '  _arguments "1: :(' + VVOC_PATCH_PROVIDER_PRESETS.join(" ") + ')"', "}", "", "_vvoc_preset_cmds() {", "  case $words[2] in", "    show)", '      _arguments "1: :(' + VVOC_PRESET_NAMES.join(" ") + ')"', "      ;;", "    *)", '      _arguments "1: :(' + [...VVOC_PRESET_COMMANDS, ...VVOC_PRESET_NAMES].join(" ") + ')"', "      ;;", "  esac", "}", "", "_vvoc_role_cmds() {", "  case $words[2] in", "    set)", '      _arguments "1: :(' + VVOC_ROLE_IDS.join(" ") + ')"', "      ;;", "    unset)", '      _arguments "1: :<custom-role-id>"', "      ;;", "    *)", '      _arguments "1: :(' + VVOC_ROLE_COMMANDS.join(" ") + ')"', "      ;;", "  esac", "}", "", "_vvoc_plugin_cmds() {", "  local -a plugin_commands", "  plugin_commands=(" + VVOC_PLUGIN_COMMANDS.join(" ") + ")", '  _arguments "1: :(' + VVOC_PLUGIN_COMMANDS.join(" ") + ')"', "}", "", "compdef _vvoc vvoc");
     return lines.join("\n") + "\n";
 }
 export function generateFishCompletion() {
+    const presetCommands = [...VVOC_PRESET_COMMANDS, ...VVOC_PRESET_NAMES].join(" ");
     const lines = ["# fish completion for vvoc", "", "function __vvoc_commands"];
     for (const cmd of VVOC_TOP_LEVEL_COMMANDS) {
         lines.push("  echo " + cmd);
     }
-    lines.push("end", "", "function __vvoc_config_cmds", "  echo " + VVOC_CONFIG_COMMANDS.join(" "), "end", "", "function __vvoc_patch_provider_cmds", "  echo " + VVOC_PATCH_PROVIDER_PRESETS.join(" "), "end", "", "function __vvoc_preset_cmds", "  echo " + [...VVOC_PRESET_COMMANDS, ...VVOC_PRESET_NAMES].join(" "), "end", "", "function __vvoc_preset_names", "  echo " + VVOC_PRESET_NAMES.join(" "), "end", "", "function __vvoc_agent_cmds", "  echo " + VVOC_AGENT_COMMANDS.join(" "), "end", "", "function __vvoc_agent_target_cmds", "  echo " + VVOC_AGENT_TARGETS.join(" "), "end", "", "function __vvoc_plugin_cmds", "  echo " + VVOC_PLUGIN_COMMANDS.join(" "), "end", "", 'complete -c vvoc -f -a "(__vvoc_commands)"', 'complete -c vvoc -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from set unset list" -f -a "(__vvoc_agent_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from agent; and __fish_seen_subcommand_from set unset" -f -a "(__vvoc_agent_target_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from config" -f -a "(__vvoc_config_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from patch-provider" -f -a "(__vvoc_patch_provider_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from preset; and not __fish_seen_subcommand_from list show openai zai" -f -a "(__vvoc_preset_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from preset; and __fish_seen_subcommand_from show" -f -a "(__vvoc_preset_names)"', 'complete -c vvoc -n "__fish_seen_subcommand_from plugin" -f -a "(__vvoc_plugin_cmds)"');
+    lines.push("end", "", "function __vvoc_config_cmds", "  echo " + VVOC_CONFIG_COMMANDS.join(" "), "end", "", "function __vvoc_patch_provider_cmds", "  echo " + VVOC_PATCH_PROVIDER_PRESETS.join(" "), "end", "", "function __vvoc_preset_cmds", "  echo " + presetCommands, "end", "", "function __vvoc_preset_names", "  echo " + VVOC_PRESET_NAMES.join(" "), "end", "", "function __vvoc_role_cmds", "  echo " + VVOC_ROLE_COMMANDS.join(" "), "end", "", "function __vvoc_role_ids", "  echo " + VVOC_ROLE_IDS.join(" "), "end", "", "function __vvoc_plugin_cmds", "  echo " + VVOC_PLUGIN_COMMANDS.join(" "), "end", "", 'complete -c vvoc -f -a "(__vvoc_commands)"', 'complete -c vvoc -n "__fish_seen_subcommand_from role; and not __fish_seen_subcommand_from set unset list" -f -a "(__vvoc_role_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from role; and __fish_seen_subcommand_from set" -f -a "(__vvoc_role_ids)"', 'complete -c vvoc -n "__fish_seen_subcommand_from config" -f -a "(__vvoc_config_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from patch-provider" -f -a "(__vvoc_patch_provider_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from preset; and not __fish_seen_subcommand_from ' +
+        presetCommands +
+        '" -f -a "(__vvoc_preset_cmds)"', 'complete -c vvoc -n "__fish_seen_subcommand_from preset; and __fish_seen_subcommand_from show" -f -a "(__vvoc_preset_names)"', 'complete -c vvoc -n "__fish_seen_subcommand_from plugin" -f -a "(__vvoc_plugin_cmds)"');
     return lines.join("\n") + "\n";
 }
 //# sourceMappingURL=completion.js.map