argsbarg 4.0.4 → 4.1.1

package/index.d.ts

@@ -1,5 +1,9 @@
 // Generated by dts-bundle-generator v9.5.1
 
+/** Resolved absolute path to the app JSON config file (`~/.local/lib/<key>/config.json`). */
+export declare function resolveAppConfigPath(program: CliProgram): string;
+/** Human-readable config path for error messages (`~/…` when under home). */
+export declare function displayAppConfigPath(program: CliProgram): string;
 export type ResolvedConfig = Record<string, unknown>;
 declare class EmptyAppConfigSnapshot {
 	private readonly program;
@@ -22,7 +26,7 @@ declare class AppConfigSnapshot {
 	require(key: string): unknown;
 	set(key: string, value: unknown): void;
 	read(): ResolvedConfig;
-	/** Resolved absolute path to the app JSON config file (honors `program.appConfig.path` or OS default). */
+	/** Resolved absolute path to the app JSON config file (`~/.local/lib/<key>/config.json`). */
 	get path(): string;
 	/** Resolved absolute directory containing the config file. */
 	get dir(): string;
@@ -194,6 +198,10 @@ export interface CliMcpBundleConfig {
 export interface CliMcpServerConfig {
 	/** When `true`, enables the `mcp` built-in and MCP stdio server. */
 	enabled: boolean;
+	/** When `true`, `mcp bundle` writes `dist/<key>.mcpb` for Claude Desktop. Default false. */
+	mcpd?: boolean;
+	/** When `true`, `mcp bundle` also writes `dist/claude-plugin/<name>.zip`. Default false. */
+	claudePlugin?: boolean;
 	/** Resource URI for schema export (default: `<sanitized root key>://schema`). */
 	schemaResourceUri?: string;
 	/**
@@ -241,21 +249,24 @@ export interface CliMcpToolConfig {
 	 */
 	outputSchema?: Record<string, unknown>;
 }
+/** Context passed to {@link CliAppConfigEntry.resolve} for one config key. */
+export interface CliAppConfigResolveContext {
+	/** Schema key being resolved. */
+	key: string;
+	/** Entry metadata for this key. */
+	entry: CliAppConfigEntry;
+	/** Program root (read-only). */
+	program: CliProgram;
+	/** Raw value from the config file, if any. */
+	fileValue: unknown;
+	/** Non-empty host env string when `entry.env` is set; otherwise `undefined`. */
+	envValue: string | undefined;
+}
 /**
- * Opt-out and defaults for the `install` built-in (program root only).
+ * Optional fallback resolver for one config key (e.g. `gh auth token` when `GH_TOKEN` is unset).
+ * Return `undefined` to continue resolution (env, then default).
  */
-export interface CliUpdateArtifact {
-	/** Path to an executable binary to copy into the install location. */
-	path: string;
-	/** Release version of `path` (used for already-current checks and success messages). */
-	version?: string;
-	/** Called after reinstall completes (e.g. remove a temp download directory). */
-	cleanup?: () => void | Promise<void>;
-}
-/** Fetches the latest release binary for `install --update`. */
-export type CliUpdateGetLatest = (ctx: {
-	version: string;
-}) => Promise<CliUpdateArtifact>;
+export type CliAppConfigResolveFn = (ctx: CliAppConfigResolveContext) => unknown;
 /**
  * Metadata overlay for one key in {@link CliAppConfig.entries}.
  * Types and validation come from {@link CliAppConfig.jsonSchema} when set; otherwise all values are strings.
@@ -276,13 +287,16 @@ export interface CliAppConfigEntry {
 	sensitive?: boolean;
 	/** When set: non-empty `process.env[env]` overrides file; value exported after resolve. */
 	env?: string;
+	/**
+	 * Optional fallback after file when env is empty.
+	 * Return `undefined` to fall back to `env` (if set) and schema defaults.
+	 */
+	resolve?: CliAppConfigResolveFn;
 }
 /**
  * App configuration block on the program root ({@link CliProgram.appConfig}).
  */
 export interface CliAppConfig {
-	/** Default: `~/.config/<sanitized-key>/config` (or `%APPDATA%/<key>/config` on Windows). */
-	path?: string;
 	/** Built-in `config get` / `config set`. Default: enabled when `appConfig` is set. */
 	commands?: boolean | {
 		enabled?: boolean;
@@ -296,13 +310,59 @@ export interface CliAppConfig {
 export interface CliInstallConfig {
 	/** When `false`, hide/disable `install` (default: enabled). */
 	enabled?: boolean;
-	/** Default bin directory (default: `~/.local/bin`). Overridden by `INSTALL_PREFIX` env and `--prefix`. */
-	prefix?: string;
 	/**
-	 * When set, enables `install --update` on the program root.
-	 * Should download or locate the latest release binary and return its path.
+	 * Default agent integration for full install (`install --all`).
+	 * - `'mcp'` when `mcpServer.enabled` (default): MCP targets in `--all`; paired skills excluded.
+	 * - `'skill'` when MCP is off (default): skill targets in `--all`; paired MCP excluded.
+	 * - `'both'`: install MCP and skill for the same host when both are available.
 	 */
-	updateGetLatest?: CliUpdateGetLatest;
+	agentIntegration?: InstallAgentIntegration;
+	/** Per-artifact gates for full install/uninstall. See {@link resolveEffectiveInstallTargets}. */
+	targets?: CliInstallTargets;
+}
+/** Agent integration mode for install — MCP vs shell skill per host. */
+export type InstallAgentIntegration = "mcp" | "skill" | "both";
+/** Boolean or structured gate for one install artifact. */
+export type InstallTargetSpec = boolean | {
+	/** When false, artifact is never installed (even with scoped CLI flags). Default true. */
+	enabled?: boolean;
+	/** When true, included in bare `install` / `install --all`. Default varies by key. */
+	includedInAll?: boolean;
+};
+export interface ResolvedInstallTarget {
+	enabled: boolean;
+	includedInAll: boolean;
+}
+/** Per-artifact gates for full install/uninstall. See {@link resolveEffectiveInstallTargets}. */
+export interface CliInstallTargets {
+	/** App binary status only (Homebrew PATH); no self-install. */
+	app?: InstallTargetSpec;
+	/** ChatGPT desktop MCP. Default false. */
+	chatgptMcp?: InstallTargetSpec;
+	/** Claude Code MCP (`~/.claude.json`). Default false. */
+	claudeCodeMcp?: InstallTargetSpec;
+	/** Claude Desktop MCP. Default false. */
+	claudeDesktopMcp?: InstallTargetSpec;
+	/** Claude Code skill. Default false. */
+	claudeSkill?: InstallTargetSpec;
+	/** Codex MCP (`codex mcp add`). Default false. */
+	codexMcp?: InstallTargetSpec;
+	/** Codex skill. Default false. */
+	codexSkill?: InstallTargetSpec;
+	/** App config: wizard via install --configure only. Default not in --all. */
+	configure?: InstallTargetSpec;
+	/** Cursor MCP. Default false. */
+	cursorMcp?: InstallTargetSpec;
+	/** Cursor skill. Default false. */
+	cursorSkill?: InstallTargetSpec;
+	/** OpenClaw MCP. Default false. */
+	openclawMcp?: InstallTargetSpec;
+	/** OpenClaw skill. Default false. */
+	openclawSkill?: InstallTargetSpec;
+	/** OpenCode MCP. Default false. */
+	opencodeMcp?: InstallTargetSpec;
+	/** OpenCode skill. Default false. */
+	opencodeSkill?: InstallTargetSpec;
 }
 /**
  * One bundled documentation topic for the `docs` built-in (program root only).
@@ -410,7 +470,6 @@ export interface CliCapabilities {
 	mcp: boolean;
 	install: boolean;
 	docs: boolean;
-	update: boolean;
 	configCommands: boolean;
 }
 /** JSON-safe command node (no handlers). */
@@ -492,49 +551,6 @@ export declare function shouldRunHeadlessWithYes(ctx: HeadlessContext, opts: {
 export declare function requireYesInNonTty(yes: boolean, hint: string, dryRun?: boolean, interactive?: boolean): void;
 /** Prefixes a success message when running in dry-run mode. */
 export declare function formatDryRunMessage(message: string, dryRun: boolean): string;
-/** Config for {@link ghReleaseUpdateGetLatest}. */
-export interface GhReleaseUpdateConfig {
-	/** GitHub `owner/repo` slug. */
-	repo: string;
-	/** Release asset filename (e.g. `myapp`). */
-	asset: string;
-	/** Temp directory name prefix for downloads. */
-	tempPrefix: string;
-	/** Path to the on-disk version-check cache JSON file. */
-	cachePath: string;
-	/** Optional hint when `gh auth` fails or no releases exist. */
-	repoEnvHint?: string;
-}
-/** Config for {@link createGhVersionCheck}. */
-export interface GhVersionCheckConfig {
-	/** Installed semver string. */
-	currentVersion: string;
-	/** CLI command name for update notices (e.g. `qa`). */
-	commandName: string;
-	/** Path to the on-disk version-check cache JSON file. */
-	cachePath: string;
-	/** Cache TTL in milliseconds (default 24h). */
-	ttlMs?: number;
-	/** When true, skip background refresh (e.g. test subprocess). */
-	skipRefresh?: () => boolean;
-	/** When true, skip refresh because `gh` is unavailable. */
-	ghAvailable?: () => boolean;
-	/** Fetches latest release version via `gh`. */
-	fetchLatest: () => Promise<string>;
-}
-/** Returns whether the installed version matches the latest release. */
-export declare function isAlreadyCurrent(current: string, latest: string): boolean;
-/** Strips a leading `v` from a release tag. */
-export declare function parseReleaseTag(tag: string): string;
-/** Builds a `CliUpdateGetLatest` hook that downloads a release via `gh`. */
-export declare function ghReleaseUpdateGetLatest(config: GhReleaseUpdateConfig): CliUpdateGetLatest;
-/** Version-check cache helpers for summary notices and background refresh. */
-export declare function createGhVersionCheck(config: GhVersionCheckConfig): {
-	getUpdateNotice: () => string | null;
-	refreshIfStale: () => void;
-};
-/** Shared `gh release view` fetcher for hooks and version-check refresh. */
-export declare function createGhFetchLatest(config: Pick<GhReleaseUpdateConfig, "repo" | "repoEnvHint">): () => Promise<string>;
 /** Resolved paths for `mcp bundle`. */
 export interface McpBundlePaths {
 	binaryPath: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argsbarg",
-  "version": "4.0.4",
+  "version": "4.1.1",
   "type": "module",
   "engines": {
     "bun": ">=1.3"
@@ -12,7 +12,7 @@
   "module": "./src/index.ts",
   "types": "./index.d.ts",
   "bin": {
-    "argsbarg": "src/index.ts"
+    "argsbarg": "src/cli-tool/main.ts"
   },
   "exports": {
     ".": {

package/src/builtins/builtins.test.ts

@@ -1,10 +1,12 @@
 import { describe, expect, test } from "bun:test";
+import { ParseKind, parse, postParseValidate } from "../parse.ts";
 import type { CliProgram } from "../types.ts";
 import { exportPresentationBuiltins } from "./export.ts";
 import { completionBashScript, completionFishScript, completionZshScript } from "./index.ts";
 import { cliBuiltinInstallCommand, installBuiltinOptions } from "./install.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
-import { cliPresentationRoot } from "./presentation.ts";
+import { cliParseRoot, cliPresentationRoot } from "./presentation.ts";
+import { cliBuiltinUninstallCommand, uninstallBuiltinOptions } from "./uninstall.ts";
 
 const fixture: CliProgram = {
   key: "myapp",
@@ -21,14 +23,39 @@ const fixture: CliProgram = {
 };
 
 describe("builtins help copy", () => {
-  test("install command includes description and option text", () => {
+  test("install command includes Homebrew-oriented description", () => {
     const install = cliBuiltinInstallCommand(fixture);
-    expect(install.description).toContain("Install the binary");
-    expect(install.notes).toContain("install --all");
+    expect(install.description).toContain("agent skills");
+    expect(install.notes).toContain("brew install");
     const names = installBuiltinOptions(fixture).map((o) => o.name);
     expect(names).toContain("all");
     expect(names).toContain("mcp");
-    expect(names).toContain("prefix");
+    expect(names).not.toContain("app");
+    expect(names).not.toContain("completions");
+    expect(names).not.toContain("update");
+    expect(names.indexOf("all")).toBeLessThan(names.indexOf("mcp"));
+    expect(names.indexOf("mcp")).toBeLessThan(names.indexOf("status"));
+    expect(names).not.toContain("uninstall");
+    const yesOpt = installBuiltinOptions(fixture).find((o) => o.name === "yes");
+    expect(yesOpt?.shortName).toBe("y");
+  });
+
+  test("uninstall command includes removal guidance", () => {
+    const uninstall = cliBuiltinUninstallCommand(fixture);
+    expect(uninstall.notes).toContain("brew uninstall");
+    const names = uninstallBuiltinOptions(fixture).map((o) => o.name);
+    expect(names).toContain("all");
+    expect(names).not.toContain("status");
+    expect(names).not.toContain("reinstall");
+  });
+
+  test("install -y parses as --yes", () => {
+    const root = cliParseRoot(fixture);
+    const pr = postParseValidate(root, parse(root, ["install", "-y"]));
+    expect(pr.kind).toBe(ParseKind.Ok);
+    if (pr.kind === ParseKind.Ok) {
+      expect(pr.opts.yes).toBe("1");
+    }
   });
 
   test("install omits --mcp option when mcpServer unset", () => {
@@ -37,23 +64,10 @@ describe("builtins help copy", () => {
     expect(names).not.toContain("mcp");
   });
 
-  test("install omits --update when updateGetLatest unset", () => {
+  test("install notes mention brew upgrade", () => {
     const install = cliBuiltinInstallCommand(fixture);
-    expect(installBuiltinOptions(fixture).map((o) => o.name)).not.toContain("update");
-    expect(install.notes).not.toContain("Upgrade to latest release");
-    expect(install.notes).toContain("Refresh after upgrading");
-  });
-
-  test("install notes include upgrade section when updateGetLatest is set", () => {
-    const withUpdate: CliProgram = {
-      ...fixture,
-      install: { updateGetLatest: async () => ({ path: process.execPath }) },
-    };
-    const install = cliBuiltinInstallCommand(withUpdate);
-    const notes = install.notes ?? "";
-    expect(installBuiltinOptions(withUpdate).map((o) => o.name)).toContain("update");
-    expect(notes).toContain("Upgrade to latest release");
-    expect(notes.indexOf("install --reinstall")).toBeLessThan(notes.indexOf("install --update"));
+    expect(install.notes).toContain("brew upgrade");
+    expect(install.notes).toContain("install --configure");
   });
 
   test("mcp builtin description is user-facing", () => {
@@ -74,6 +88,7 @@ describe("presentation root", () => {
     const keys = root.commands?.map((c) => c.key) ?? [];
     expect(keys).toContain("mcp");
     expect(keys).toContain("install");
+    expect(keys).toContain("uninstall");
   });
 
   test("omits install when install.enabled is false", () => {
@@ -143,6 +158,6 @@ describe("schema export builtins", () => {
   test("exportPresentationBuiltins includes install options", () => {
     const builtins = exportPresentationBuiltins(fixture);
     const install = builtins.find((b) => b.key === "install");
-    expect(install?.options?.find((o) => o.name === "all")?.description).toContain("binary");
+    expect(install?.options?.find((o) => o.name === "all")?.description).toContain("agent");
   });
 });

package/src/builtins/completion-group.ts

@@ -1,13 +1,12 @@
 import { resolveCapabilities } from "../capabilities.ts";
-import type { CliProgram, CliRouter } from "../types.ts";
+import type { CliProgram } from "../types.ts";
 
 /**
  * Builds the static `completion` / `bash` / `zsh` / `fish` command subtree (merged into the program root at runtime).
  */
-export function cliBuiltinCompletionGroup(program: CliProgram): CliRouter {
+export function cliBuiltinCompletionGroup(program: CliProgram): import("../types.ts").CliRouter {
   const appName = program.key;
-  const caps = resolveCapabilities(program);
-  const router: CliRouter = {
+  const router: import("../types.ts").CliRouter = {
     key: "completion",
     description: "Generate the autocompletion script for shells.",
     commands: [
@@ -15,9 +14,9 @@ export function cliBuiltinCompletionGroup(program: CliProgram): CliRouter {
         key: "bash",
         description: "Print a bash tab-completion script.",
         notes:
-          "Manual install:\n\n" +
-          `  ${appName} completion bash > ~/.bash_completion.d/${appName}\n` +
-          `  echo 'source ~/.bash_completion.d/${appName}' >> ~/.bashrc\n\n` +
+          "Homebrew installs completions during `brew install` via generate_completions_from_executable.\n\n" +
+          "Ensure your shell loads Homebrew completions:\n" +
+          "  https://docs.brew.sh/Shell-Completion\n\n" +
           "Try this session only:\n\n" +
           `  source <(${appName} completion bash)`,
         handler: () => {},
@@ -26,9 +25,9 @@ export function cliBuiltinCompletionGroup(program: CliProgram): CliRouter {
         key: "zsh",
         description: "Print a zsh tab-completion script.",
         notes:
-          "Manual install:\n\n" +
-          `  ${appName} completion zsh > ~/.zsh/completions/_${appName}\n\n` +
-          "Ensure ~/.zsh/completions is on your fpath, then restart zsh.\n\n" +
+          "Homebrew installs completions to $(brew --prefix)/share/zsh/site-functions.\n\n" +
+          "Ensure brew shellenv + compinit are configured:\n" +
+          "  https://docs.brew.sh/Shell-Completion\n\n" +
           "Try this session only:\n\n" +
           `  eval "$(${appName} completion zsh)"`,
         handler: () => {},
@@ -37,15 +36,18 @@ export function cliBuiltinCompletionGroup(program: CliProgram): CliRouter {
         key: "fish",
         description: "Print a fish tab-completion script.",
         notes:
-          "Manual install:\n\n" +
-          `  ${appName} completion fish > ~/.config/fish/completions/${appName}.fish\n\n` +
-          "Fish loads completions from that directory automatically.",
+          "Homebrew installs completions to $(brew --prefix)/share/fish/vendor_completions.d.\n\n" +
+          "See: https://docs.brew.sh/Shell-Completion\n\n" +
+          "Try this session only:\n\n" +
+          `  ${appName} completion fish | source`,
         handler: () => {},
       },
     ],
   };
-  if (caps.install) {
-    router.notes = `Install for all shells:\n\n  ${appName} install --completions --yes`;
+  if (resolveCapabilities(program).install) {
+    router.notes =
+      "Completions are installed by Homebrew during formula install.\n\n" +
+      "See: https://docs.brew.sh/Shell-Completion";
   }
   return router;
 }

package/src/builtins/config.test.ts

@@ -1,16 +1,16 @@
 import { describe, expect, test } from "bun:test";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
+import { resolveAppConfigPath, writeAppConfigFile } from "../config/file.ts";
 import { Cli, type CliProgram } from "../index.ts";
 
-function configFixture(configPath: string): CliProgram {
+function configFixture(): CliProgram {
   return {
     key: "cfg-app",
     version: "1.0.0",
     description: "Config builtin test.",
     appConfig: {
-      path: configPath,
       entries: {
         apiToken: { description: "Token.", env: "API_TOKEN", sensitive: true },
         port: { description: "Port.", required: false },
@@ -23,15 +23,21 @@ function configFixture(configPath: string): CliProgram {
 describe("builtins/config", () => {
   test("config get redacts sensitive values", async () => {
     const dir = mkdtempSync(join(tmpdir(), "cfg-builtin-"));
-    const configPath = join(dir, "config");
-    writeFileSync(configPath, `${JSON.stringify({ apiToken: "secret" })}\n`);
+    const prevHome = process.env.HOME;
+    process.env.HOME = dir;
     const prev = process.env.API_TOKEN;
     delete process.env.API_TOKEN;
     try {
-      const result = await new Cli(configFixture(configPath)).invoke(["config", "get", "apiToken"]);
+      const program = configFixture();
+      const configPath = resolveAppConfigPath(program);
+      mkdirSync(dirname(configPath), { recursive: true });
+      writeFileSync(configPath, `${JSON.stringify({ apiToken: "secret" })}\n`);
+      const result = await new Cli(program).invoke(["config", "get", "apiToken"]);
       expect(result.exitCode).toBe(0);
       expect(result.stdout.trim()).toBe("REDACTED");
     } finally {
+      if (prevHome === undefined) delete process.env.HOME;
+      else process.env.HOME = prevHome;
       if (prev !== undefined) process.env.API_TOKEN = prev;
       rmSync(dir, { recursive: true, force: true });
     }
@@ -39,20 +45,21 @@ describe("builtins/config", () => {
 
   test("config get --json redacts sensitive as { set: true }", async () => {
     const dir = mkdtempSync(join(tmpdir(), "cfg-builtin-"));
-    const configPath = join(dir, "config");
-    writeFileSync(configPath, `${JSON.stringify({ apiToken: "secret" })}\n`);
+    const prevHome = process.env.HOME;
+    process.env.HOME = dir;
     const prev = process.env.API_TOKEN;
     delete process.env.API_TOKEN;
     try {
-      const result = await new Cli(configFixture(configPath)).invoke([
-        "config",
-        "get",
-        "apiToken",
-        "--json",
-      ]);
+      const program = configFixture();
+      const configPath = resolveAppConfigPath(program);
+      mkdirSync(dirname(configPath), { recursive: true });
+      writeFileSync(configPath, `${JSON.stringify({ apiToken: "secret" })}\n`);
+      const result = await new Cli(program).invoke(["config", "get", "apiToken", "--json"]);
       expect(result.exitCode).toBe(0);
-      expect(JSON.parse(result.stdout.trim())).toEqual({ set: true });
+      expect(JSON.parse(result.stdout)).toEqual({ set: true });
     } finally {
+      if (prevHome === undefined) delete process.env.HOME;
+      else process.env.HOME = prevHome;
       if (prev !== undefined) process.env.API_TOKEN = prev;
       rmSync(dir, { recursive: true, force: true });
     }
@@ -60,21 +67,20 @@ describe("builtins/config", () => {
 
   test("config set writes and resolves without required exit", async () => {
     const dir = mkdtempSync(join(tmpdir(), "cfg-builtin-"));
-    const configPath = join(dir, "config");
-    writeFileSync(configPath, `${JSON.stringify({ apiToken: "present" })}\n`);
+    const prevHome = process.env.HOME;
+    process.env.HOME = dir;
     const prev = process.env.API_TOKEN;
     delete process.env.API_TOKEN;
     try {
-      const result = await new Cli(configFixture(configPath)).invoke([
-        "config",
-        "set",
-        "port",
-        "9090",
-      ]);
+      const program = configFixture();
+      writeAppConfigFile(program, { apiToken: "seed" });
+      const result = await new Cli(program).invoke(["config", "set", "port", "9090"]);
       expect(result.exitCode).toBe(0);
-      const get = await new Cli(configFixture(configPath)).invoke(["config", "get", "port"]);
+      const get = await new Cli(program).invoke(["config", "get", "port"]);
       expect(get.stdout.trim()).toBe("9090");
     } finally {
+      if (prevHome === undefined) delete process.env.HOME;
+      else process.env.HOME = prevHome;
       if (prev !== undefined) process.env.API_TOKEN = prev;
       rmSync(dir, { recursive: true, force: true });
     }

package/src/builtins/config.ts

@@ -5,7 +5,7 @@ Built-in `config get` / `config set` commands.
 import { bootstrapAppConfig } from "../config/bootstrap.ts";
 import { configEntrySensitive, defaultConfigEntryTitle } from "../config/entry.ts";
 import { writeAppConfigFile } from "../config/file.ts";
-import { exportConfigToEnv, resolveAppConfig } from "../config/resolve.ts";
+import { captureMappedHostEnv, exportConfigToEnv, resolveAppConfig } from "../config/resolve.ts";
 import { configPropertySchema, effectiveJsonSchema } from "../config/schema.ts";
 import { parseConfigSetValue } from "../config/validate.ts";
 import type { CliLeaf, CliOption, CliProgram, CliRouter } from "../types.ts";
@@ -128,11 +128,12 @@ function configSetRun(program: CliProgram, key: string, rawValue: string, useJso
     process.exit(1);
   }
 
+  const hostEnv = captureMappedHostEnv(program);
   const { fileData } = bootstrapAppConfig(program, { validateFile: true });
   const next = { ...fileData, [key]: parsed };
   writeAppConfigFile(program, next);
-  const resolved = resolveAppConfig(program, next);
-  exportConfigToEnv(program, resolved);
+  const resolved = resolveAppConfig(program, next, hostEnv);
+  exportConfigToEnv(program, resolved, hostEnv);
 }
 
 function configGetLeaf(program: CliProgram): CliLeaf {

package/src/builtins/dispatch.ts

@@ -1,7 +1,7 @@
 import { capabilityDeniedMessage, resolveCapabilities } from "../capabilities.ts";
 import { Cli } from "../cli.ts";
 import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
-import { cliInstall } from "../install/index.ts";
+import { cliInstall, cliUninstall } from "../install/index.ts";
 import { runMcpBundle } from "../mcp/bundle.ts";
 import type { ParseResult } from "../parse.ts";
 import { ParseKind } from "../parse.ts";
@@ -15,6 +15,7 @@ import { cliBuiltinConfigGroupIfEnabled } from "./config.ts";
 import { cliBuiltinInstallCommand } from "./install.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
 import { cliPresentationRoot } from "./presentation.ts";
+import { cliBuiltinUninstallCommand } from "./uninstall.ts";
 import { cliBuiltinVersionCommand } from "./version.ts";
 
 export interface DispatchBuiltinOpts {
@@ -103,6 +104,18 @@ export async function dispatchBuiltin(
     }
     await cliInstall(program, pr.opts);
   }
+
+  if (pr.path[0] === "uninstall") {
+    if (!caps.install) {
+      process.stderr.write(capabilityDeniedMessage("install"));
+      process.exit(1);
+    }
+    if (pr.path.length !== 1) {
+      process.stderr.write(`Unknown subcommand: uninstall ${pr.path.slice(1).join(" ")}\n`);
+      process.exit(1);
+    }
+    await cliUninstall(program, pr.opts);
+  }
 }
 
 /** Built-in intercept roots for leaf programs. */
@@ -139,6 +152,17 @@ export function builtinInterceptRoot(
     };
   }
 
+  if (first === "uninstall" && caps.install) {
+    return {
+      parseRoot: {
+        key: program.key,
+        description: program.description,
+        commands: [cliBuiltinUninstallCommand(program)],
+      },
+      isLeafCompletionIntercept: false,
+    };
+  }
+
   if (first === "mcp" && caps.mcp) {
     return {
       parseRoot: {