argsbarg 6.1.2 → 6.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argsbarg",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "dependencies": {
@@ -17,18 +17,35 @@
       "types": "./index.d.ts",
       "default": "./src/index.ts"
     },
+    "./cli": {
+      "types": "./src/exports/cli.ts",
+      "default": "./src/exports/cli.ts"
+    },
+    "./headless": {
+      "types": "./src/exports/headless.ts",
+      "default": "./src/exports/headless.ts"
+    },
+    "./http": {
+      "types": "./src/exports/http.ts",
+      "default": "./src/exports/http.ts"
+    },
+    "./mcp": {
+      "types": "./src/exports/mcp.ts",
+      "default": "./src/exports/mcp.ts"
+    },
     "./schemagen": {
       "types": "./src/cli-tool/schemagen/index.ts",
       "default": "./src/cli-tool/schemagen/index.ts"
     }
   },
   "bin": {
-    "argsbarg": "src/cli-tool/main.ts"
+    "argsbarg": "bin/argsbarg"
   },
   "engines": {
     "bun": ">=1.3"
   },
   "files": [
+    "bin",
     "src",
     "index.d.ts",
     "docs",

package/src/builtins/builtins.test.ts

@@ -3,14 +3,14 @@ Tests for builtins/builtins module behavior.
 */
 
 import { describe, expect, test } from "bun:test";
-import { resolveCapabilities } from "../capabilities.ts";
-import { cliBuiltinDocsGroup } from "../docs/builtin.ts";
-import { ParseKind, parse, postParseValidate } from "../parse.ts";
-import type { CliProgram } from "../types.ts";
+import { ParseKind, parse, postParseValidate } from "~/core/parse.ts";
+import type { CliProgram } from "~/core/types.ts";
+import { cliBuiltinDocsGroup } from "~/docs/builtin.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
+import { completionBashScript, completionFishScript, completionZshScript } from ".";
 import { cliBuiltinConfigureCommand, configureBuiltinOptions } from "./configure.ts";
 import { configureCommandDescription, configureSyncOptionDescription } from "./configure-copy.ts";
 import { exportPresentationBuiltins } from "./export.ts";
-import { completionBashScript, completionFishScript, completionZshScript } from "./index.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
 import { cliParseRoot, cliPresentationRoot } from "./presentation.ts";
 
@@ -88,7 +88,7 @@ describe("builtins help copy", () => {
   test("mcp builtin description is user-facing", () => {
     const withDocs: CliProgram = {
       ...fixture,
-      docs: { enabled: true, topics: { readme: { text: "# r\n" } } },
+      docs: { topics: { readme: { text: "# r\n" } } },
     };
     const mcp = cliBuiltinMcpCommand(withDocs);
     expect(mcp.description).toContain("MCP server");
@@ -185,7 +185,7 @@ describe("docs skill topic copy", () => {
   test("mentions configure when configure is enabled", () => {
     const withDocs: CliProgram = {
       ...noMcp,
-      docs: { enabled: true, topics: { readme: { text: "# r\n" } } },
+      docs: { topics: { readme: { text: "# r\n" } } },
     };
     const skill = cliBuiltinDocsGroup(withDocs).commands.find((c) => c.key === "skill");
     expect(skill?.description).toContain("configure");

package/src/builtins/completion-bash.ts

@@ -1,4 +1,4 @@
-import { CliOptionKind, type CliRouter } from "../types.ts";
+import { CliOptionKind, type CliRouter } from "~/core/types.ts";
 import { emitConsumeLong, emitConsumeShort, emitMatchChild } from "./completion-simulate-shared.ts";
 import { collectScopes, type ScopeRec } from "./scopes.ts";
 import { escShellSingleQuoted, identToken, kHelpLong, kHelpShort, mainName } from "./shell-helpers.ts";

package/src/builtins/completion-fish.ts

@@ -1,4 +1,4 @@
-import { CliOptionKind, type CliRouter } from "../types.ts";
+import { CliOptionKind, type CliRouter } from "~/core/types.ts";
 import { collectScopes } from "./scopes.ts";
 import { escFishSingleQuoted, identToken } from "./shell-helpers.ts";
 

package/src/builtins/completion-group.ts

@@ -1,13 +1,13 @@
-import type { CliProgram } from "../types.ts";
+import type { CliProgram } from "~/core/types.ts";
 
 /**
  * Builds the static `completion` / `bash` / `zsh` / `fish` command subtree (merged into the program root at runtime).
  */
-export function cliBuiltinCompletionGroup(program: CliProgram): import("../types.ts").CliRouter {
+export function cliBuiltinCompletionGroup(program: CliProgram): import("~/core/types.ts").CliRouter {
   const appName = program.key;
-  const router: import("../types.ts").CliRouter = {
+  const router: import("~/core/types.ts").CliRouter = {
     key: "completion",
-    hidden: true,
+    cli: { hidden: true },
     description: "Generate the autocompletion script for shells.",
     commands: [
       {

package/src/builtins/completion-simulate-shared.ts

@@ -98,10 +98,19 @@ export function emitMatchChild(ident: string, scopes: ScopeRec[], pathIndex: Rec
     o += `    ${sid})\n`;
     o += "      case $w in\n";
     for (const ch of sc.kids) {
+      if (ch.key.startsWith(":")) {
+        continue;
+      }
       const childPath = sc.path === "" ? ch.key : `${sc.path}/${ch.key}`;
       const cid = pathIndex[childPath] ?? 0;
       o += `        ${ch.key}) echo ${cid}; return 0 ;;\n`;
     }
+    const paramChild = sc.kids.find((ch) => ch.key.startsWith(":"));
+    if (paramChild) {
+      const childPath = sc.path === "" ? paramChild.key : `${sc.path}/${paramChild.key}`;
+      const cid = pathIndex[childPath] ?? 0;
+      o += `        *) echo ${cid}; return 0 ;;\n`;
+    }
     o += "      esac\n";
     o += "      ;;\n";
   }

package/src/builtins/completion-zsh.ts

@@ -1,4 +1,4 @@
-import { CliOptionKind, type CliRouter } from "../types.ts";
+import { CliOptionKind, type CliRouter } from "~/core/types.ts";
 import { emitConsumeLong, emitConsumeShort, emitMatchChild } from "./completion-simulate-shared.ts";
 import { collectScopes, type ScopeRec } from "./scopes.ts";
 import { escShellSingleQuoted, identToken, kHelpLong, kHelpShort, mainName } from "./shell-helpers.ts";

package/src/builtins/config.test.ts

@@ -6,9 +6,9 @@ import { describe, expect, test } from "bun:test";
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
-import { readBindings } from "../config/bindings.ts";
-import { resolveAppConfigPath, writeAppConfigFile } from "../config/file.ts";
-import { Cli, type CliProgram } from "../index.ts";
+import { readBindings } from "~/config/bindings.ts";
+import { resolveAppConfigPath, writeAppConfigFile } from "~/config/file.ts";
+import { Cli, type CliProgram } from "~/index";
 
 function configFixture(): CliProgram {
   return {

package/src/builtins/config.ts

@@ -2,20 +2,20 @@
 Built-in `configure get` / `configure set` subcommands.
 */
 
-import { clearFileValue, setBinding } from "../config/bindings.ts";
-import { bootstrapAppConfig } from "../config/bootstrap.ts";
+import { clearFileValue, setBinding } from "~/config/bindings.ts";
+import { bootstrapAppConfig } from "~/config/bootstrap.ts";
 import {
   configCommandsEnabled,
   configEntrySensitive,
   configMcpSetEnabled,
   defaultConfigEntryTitle,
-} from "../config/entry.ts";
-import { writeAppConfigFile } from "../config/file.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 } from "../types.ts";
-import { CliOptionKind } from "../types.ts";
+} from "~/config/entry.ts";
+import { writeAppConfigFile } from "~/config/file.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 } from "~/core/types.ts";
+import { CliOptionKind } from "~/core/types.ts";
 
 const JSON_OPTION: CliOption = {
   name: "json",

package/src/builtins/configure-copy.ts

@@ -1,7 +1,7 @@
 /** Capability-aware labels for configure builtin and docs copy. */
 
-import type { CliCapabilities } from "../capabilities.ts";
-import type { CliProgram } from "../types.ts";
+import type { CliProgram } from "~/core/types.ts";
+import type { CliCapabilities } from "~/runtime/capabilities.ts";
 
 type Kind = "skills" | "mcp" | "config";
 

package/src/builtins/configure.ts

@@ -1,5 +1,4 @@
-import { resolveCapabilities } from "../capabilities.ts";
-import { configCommandsEnabled, configMcpSetEnabled } from "../config/entry.ts";
+import { configCommandsEnabled, configMcpSetEnabled } from "~/config/entry.ts";
 import {
   CliFallbackMode,
   type CliLeaf,
@@ -7,7 +6,8 @@ import {
   CliOptionKind,
   type CliProgram,
   type CliRouter,
-} from "../types.ts";
+} from "~/core/types.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
 import { configureConfigSubcommands } from "./config.ts";
 import {
   configureCommandDescription,
@@ -79,7 +79,7 @@ export function cliBuiltinConfigureCommand(root: CliProgram): CliRouter {
   const caps = resolveCapabilities(root);
   const run: CliLeaf = {
     key: CONFIGURE_RUN_KEY,
-    hidden: true,
+    cli: { hidden: true },
     description: "Interactive or flag-driven configure (skills, MCP, app config).",
     handler: () => {},
   };

package/src/builtins/dispatch.ts

@@ -1,18 +1,19 @@
-import { capabilityDeniedMessage, resolveCapabilities } from "../capabilities.ts";
-import { Cli } from "../cli.ts";
-import { cliConfigure } from "../configure/index.ts";
-import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
-import { runMcpBundle } from "../mcp/bundle.ts";
-import type { ParseResult } from "../parse.ts";
-import { ParseKind } from "../parse.ts";
-import type { CliNode, CliProgram, CliRouter } from "../types.ts";
-import { isCliLeaf } from "../types.ts";
-import { cliBuiltinApiCommand } from "./api.ts";
+import { cliConfigure } from "~/configure";
+import type { ParseResult } from "~/core/parse.ts";
+import { ParseKind } from "~/core/parse.ts";
+import type { CliNode, CliProgram, CliRouter } from "~/core/types.ts";
+import { isCliLeaf } from "~/core/types.ts";
+import { cliBuiltinDocsGroupIfEnabled } from "~/docs/builtin.ts";
+import { runMcpBundle } from "~/mcp/bundle.ts";
+import { capabilityDeniedMessage, resolveCapabilities } from "~/runtime/capabilities.ts";
+import { Cli } from "~/runtime/cli.ts";
+import { serveOverridesFromOpts } from "~/server/overrides.ts";
 import { completionBashScript } from "./completion-bash.ts";
 import { completionFishScript } from "./completion-fish.ts";
 import { cliBuiltinCompletionGroup as completionGroup } from "./completion-group.ts";
 import { completionZshScript } from "./completion-zsh.ts";
 import { CONFIGURE_RUN_KEY, cliBuiltinConfigureCommand, isConfigureConfigPath } from "./configure.ts";
+import { cliBuiltinHttpCommand } from "./http.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
 import { cliPresentationRoot } from "./presentation.ts";
 import { cliBuiltinVersionCommand } from "./version.ts";
@@ -69,17 +70,17 @@ export async function dispatchBuiltin(program: CliProgram, pr: ParseResult, opts
     process.exit(0);
   }
 
-  if (pr.path[0] === "api") {
-    if (!caps.api) {
-      process.stderr.write(capabilityDeniedMessage("api"));
+  if (pr.path[0] === "http") {
+    if (!caps.http) {
+      process.stderr.write(capabilityDeniedMessage("http"));
       process.exit(1);
     }
     const sub = pr.path[1];
     if (pr.path.length === 1 || sub === "serve") {
-      await new Cli(program).serveApi();
+      await new Cli(program).serveHttp(serveOverridesFromOpts(pr.opts, "http"));
       process.exit(0);
     }
-    process.stderr.write(`Unknown subcommand: api ${pr.path.slice(1).join(" ")}\n`);
+    process.stderr.write(`Unknown subcommand: http ${pr.path.slice(1).join(" ")}\n`);
     process.exit(1);
   }
 
@@ -90,7 +91,7 @@ export async function dispatchBuiltin(program: CliProgram, pr: ParseResult, opts
     }
     const sub = pr.path[1];
     if (pr.path.length === 1 || sub === "serve") {
-      await new Cli(program).serveMcp();
+      await new Cli(program).serveMcp(serveOverridesFromOpts(pr.opts, "mcp"));
       process.exit(0);
     }
     if (pr.path.length === 2 && sub === "bundle") {
@@ -157,12 +158,12 @@ export function builtinInterceptRoot(
     };
   }
 
-  if (first === "api" && caps.api) {
+  if (first === "http" && caps.http) {
     return {
       parseRoot: {
         key: program.key,
         description: program.description,
-        commands: [cliBuiltinApiCommand(program)],
+        commands: [cliBuiltinHttpCommand(program)],
       },
       isLeafCompletionIntercept: false,
     };

package/src/builtins/export.ts

@@ -1,7 +1,7 @@
-import { resolveCapabilities } from "../capabilities.ts";
-import { visibleOptions } from "../hidden.ts";
-import type { CliFallbackMode, CliNode, CliOption, CliPositional, CliProgram } from "../types.ts";
-import { isCliRouter } from "../types.ts";
+import type { CliFallbackMode, CliNode, CliOption, CliPositional, CliProgram } from "~/core/types.ts";
+import { isCliRouter } from "~/core/types.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
+import { isCliSchemaHidden, visibleOptions } from "~/runtime/exposure.ts";
 import { resolveBuiltins } from "./registry.ts";
 
 /** JSON-safe command node (no handlers). */
@@ -11,6 +11,8 @@ export interface CliSchemaExport {
   notes?: string;
   /** JSON Schema for structured stdout when set on the leaf. */
   outputSchema?: Record<string, unknown>;
+  /** Default success Content-Type when `outputSchema` is omitted but `http.successContentType` is set. */
+  outputContentType?: string;
   options?: CliOption[];
   fallbackCommand?: string;
   fallbackMode?: CliFallbackMode;
@@ -19,7 +21,7 @@ export interface CliSchemaExport {
 }
 
 function exportBuiltinNode(cmd: CliNode): CliSchemaExport | null {
-  if (cmd.hidden) {
+  if (isCliSchemaHidden(cmd)) {
     return null;
   }
 

package/src/builtins/http.ts

@@ -0,0 +1,68 @@
+import {
+  CliFallbackMode,
+  type CliLeaf,
+  type CliOption,
+  CliOptionKind,
+  type CliProgram,
+  type CliRouter,
+} from "~/core/types.ts";
+import { docsEnabled } from "~/docs/resolve.ts";
+import { resolveHttpListenAddress } from "~/http/server.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
+
+const HTTP_SERVE_OPTIONS: CliOption[] = [
+  { name: "host", description: "Listen host.", kind: CliOptionKind.String },
+  { name: "port", description: "Listen port.", kind: CliOptionKind.Number },
+  { name: "trust-proxy", description: "Honor X-Forwarded-For for client IP.", kind: CliOptionKind.Presence },
+  { name: "obscure-errors", description: "Hide unexpected errors from clients.", kind: CliOptionKind.Presence },
+  {
+    name: "log-format",
+    description: "Log format: json (ECS) or text.",
+    kind: CliOptionKind.Enum,
+    choices: ["json", "text"],
+  },
+  {
+    name: "log-file",
+    description: "Append logs to this file (relative → app config dir).",
+    kind: CliOptionKind.String,
+  },
+  { name: "no-access-log", description: "Disable HTTP access logs.", kind: CliOptionKind.Presence },
+  { name: "dev", description: "Print full stacks to stderr on errors.", kind: CliOptionKind.Presence },
+];
+
+/** Built-in `http` router: bare `myapp http` runs the HTTP server (via hidden `serve` fallback). */
+export function cliBuiltinHttpCommand(program: CliProgram): CliRouter {
+  const caps = resolveCapabilities(program);
+  const { hostname, port } = resolveHttpListenAddress(program);
+  const lines = [
+    `HTTP tool server on http://${hostname}:${port}.`,
+    "",
+    "Endpoints: GET /health, GET /health/ready, GET /openapi.json, GET /openapi-browser, /api/*",
+    "",
+  ];
+  if (caps.configure) {
+    lines.push("Configure app settings:", "", "  {argsbarg:program} configure", "");
+  }
+  if (docsEnabled(program)) {
+    lines.push("Full setup guide: {argsbarg:program} docs http");
+  }
+
+  const serve: CliLeaf = {
+    key: "serve",
+    cli: { hidden: true },
+    description: "Run as an HTTP API server for tools.",
+    handler: () => {},
+  };
+
+  return {
+    key: "http",
+    description: "HTTP API server for tools.",
+    notes: lines.join("\n"),
+    options: [...HTTP_SERVE_OPTIONS],
+    fallbackCommand: "serve",
+    fallbackMode: CliFallbackMode.MissingOnly,
+    commands: [serve],
+  };
+}
+
+export { HTTP_SERVE_OPTIONS };

package/src/builtins/mcp.ts

@@ -1,6 +1,29 @@
-import { resolveCapabilities } from "../capabilities.ts";
-import { docsEnabled } from "../docs/resolve.ts";
-import { CliFallbackMode, type CliLeaf, type CliProgram, type CliRouter } from "../types.ts";
+import {
+  CliFallbackMode,
+  type CliLeaf,
+  type CliOption,
+  CliOptionKind,
+  type CliProgram,
+  type CliRouter,
+} from "~/core/types.ts";
+import { docsEnabled } from "~/docs/resolve.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
+
+const MCP_SERVE_OPTIONS: CliOption[] = [
+  { name: "obscure-errors", description: "Hide unexpected errors from clients.", kind: CliOptionKind.Presence },
+  {
+    name: "log-format",
+    description: "Log format: json (ECS) or text.",
+    kind: CliOptionKind.Enum,
+    choices: ["json", "text"],
+  },
+  {
+    name: "log-file",
+    description: "Append logs to this file (relative → app config dir).",
+    kind: CliOptionKind.String,
+  },
+  { name: "dev", description: "Print full stacks to stderr on errors.", kind: CliOptionKind.Presence },
+];
 
 /** Built-in `mcp` router: bare `myapp mcp` runs stdio (via hidden `serve` fallback); `mcp bundle` packs `.mcpb`. */
 export function cliBuiltinMcpCommand(program: CliProgram): CliRouter {
@@ -21,7 +44,7 @@ export function cliBuiltinMcpCommand(program: CliProgram): CliRouter {
 
   const serve: CliLeaf = {
     key: "serve",
-    hidden: true,
+    cli: { hidden: true },
     description: "Run as an MCP server over stdio for AI agents.",
     handler: () => {},
   };
@@ -36,6 +59,7 @@ export function cliBuiltinMcpCommand(program: CliProgram): CliRouter {
     key: "mcp",
     description: "MCP server and bundle tools.",
     notes: lines.join("\n"),
+    options: [...MCP_SERVE_OPTIONS],
     fallbackCommand: "serve",
     fallbackMode: CliFallbackMode.MissingOnly,
     commands: [serve, bundle],

package/src/builtins/presentation.ts

@@ -1,8 +1,8 @@
-import type { CliCapabilities } from "../capabilities.ts";
-import { resolveCapabilities } from "../capabilities.ts";
-import { presentationNode, visibleOptions } from "../hidden.ts";
-import type { CliLeaf, CliNode, CliProgram, CliRouter } from "../types.ts";
-import { isCliLeaf } from "../types.ts";
+import type { CliLeaf, CliNode, CliProgram, CliRouter } from "~/core/types.ts";
+import { isCliLeaf } from "~/core/types.ts";
+import type { CliCapabilities } from "~/runtime/capabilities.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
+import { isCliHidden, presentationNode, visibleOptions } from "~/runtime/exposure.ts";
 import { resolveBuiltins } from "./registry.ts";
 
 /** All built-in command nodes for argv parsing (includes hidden builtins). */
@@ -12,7 +12,7 @@ export function parseBuiltins(program: CliProgram, caps: CliCapabilities): CliNo
 
 /** Built-in subtrees visible in help, schema, and completions (hidden builtins omitted). */
 export function presentationBuiltins(program: CliProgram, caps: CliCapabilities): CliNode[] {
-  return parseBuiltins(program, caps).filter((b) => !b.hidden);
+  return parseBuiltins(program, caps).filter((b) => !isCliHidden(b));
 }
 
 /**

package/src/builtins/registry.ts

@@ -1,9 +1,9 @@
-import type { CliCapabilities } from "../capabilities.ts";
-import { cliBuiltinDocsGroupIfEnabled } from "../docs/builtin.ts";
-import type { CliNode, CliProgram } from "../types.ts";
-import { cliBuiltinApiCommand } from "./api.ts";
+import type { CliNode, CliProgram } from "~/core/types.ts";
+import { cliBuiltinDocsGroupIfEnabled } from "~/docs/builtin.ts";
+import type { CliCapabilities } from "~/runtime/capabilities.ts";
 import { cliBuiltinCompletionGroup } from "./completion-group.ts";
 import { cliBuiltinConfigureCommand } from "./configure.ts";
+import { cliBuiltinHttpCommand } from "./http.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
 import { cliBuiltinVersionCommand } from "./version.ts";
 
@@ -33,8 +33,8 @@ export function resolveBuiltins(program: CliProgram, caps: CliCapabilities): Cli
   if (caps.mcp) {
     pushBuiltin(builtins, program, (p) => cliBuiltinMcpCommand(p));
   }
-  if (caps.api) {
-    pushBuiltin(builtins, program, (p) => cliBuiltinApiCommand(p));
+  if (caps.http) {
+    pushBuiltin(builtins, program, (p) => cliBuiltinHttpCommand(p));
   }
   return builtins;
 }

package/src/builtins/scopes.ts

@@ -2,12 +2,12 @@
 Shared completion scope walk used by bash, zsh, and fish emitters.
 */
 
-import { type CliNode, type CliRouter, isCliLeaf, isCliRouter } from "../types.ts";
+import { type CliNode, type CliRouter, isCliLeaf, isCliRouter } from "~/core/types.ts";
 
 /** One tab-completion scope: child commands, options, and path key for the schema walk. */
 export interface ScopeRec {
   kids: CliNode[];
-  opts: import("../types.ts").CliOption[];
+  opts: import("~/core/types.ts").CliOption[];
   path: string;
   wantsFiles: boolean;
 }

package/src/builtins/version.ts

@@ -1,4 +1,4 @@
-import type { CliLeaf } from "../types.ts";
+import type { CliLeaf } from "~/core/types.ts";
 
 /** Top-level `version` built-in (leaf). */
 export function cliBuiltinVersionCommand(): CliLeaf {

package/src/cli-tool/full-example-capabilities.test.ts

@@ -5,8 +5,8 @@ Tests for cli-tool/full-example-capabilities module behavior.
 import { describe, expect, test } from "bun:test";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
-import { resolveCapabilities } from "../capabilities.ts";
-import { CliOptionKind, type CliProgram } from "../types.ts";
+import { CliOptionKind, type CliProgram } from "~/core/types.ts";
+import { resolveCapabilities } from "~/runtime/capabilities.ts";
 
 const exampleRoot = join(import.meta.dir, "../../examples/full-example");
 const programSource = readFileSync(join(exampleRoot, "src/program.ts"), "utf8");
@@ -16,17 +16,11 @@ const sinkProgram = {
   key: "full-example",
   version: "1.0.0",
   description: "Full example reference.",
-  appConfig: {
-    entries: {
-      apiToken: { description: "Token.", env: "FULL_EXAMPLE_API_TOKEN" },
-    },
-  },
   docs: {
-    enabled: true,
     topics: { readme: { text: "# readme\n" } },
   },
   mcpServer: { enabled: true },
-  apiServer: { enabled: true },
+  httpServer: { enabled: true },
   configure: {},
   commands: [
     {
@@ -55,26 +49,27 @@ describe("full-example template", () => {
   /** Tests that program source enables every builtin flag. */
   test("program source enables every builtin flag", () => {
     expect(programSource).toContain("mcpServer: {");
-    expect(programSource).toContain("apiServer: {");
-    expect(programSource).toContain("enabled: true");
+    expect(programSource).toContain("httpServer: {");
     expect(programSource).toContain("docs:");
-    expect(programSource).toContain("appConfig:");
+    expect(programSource).not.toMatch(/docs:\s*\{[^}]*enabled:\s*true/s);
+    expect(programSource).not.toContain("appConfig:");
   });
 
   test("status command defines outputSchema", () => {
     const statusSource = readFileSync(join(exampleRoot, "src/commands/status/command.ts"), "utf8");
     expect(statusSource).toMatch(/outputSchema[,:]/);
-    expect(statusSource).toContain('from "./__generated__/index.ts"');
+    expect(statusSource).toContain("StatusJsonOutputSchema");
+    expect(statusSource).toContain('from "./__generated__"');
   });
 
   test("resolveCapabilities matches full sink shape", () => {
     expect(resolveCapabilities(sinkProgram)).toEqual({
-      api: true,
+      http: true,
       completion: true,
       mcp: true,
       configure: true,
       docs: true,
-      configCommands: true,
+      configCommands: false,
     });
   });
 });

package/src/cli-tool/main.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 /** Argsbarg package CLI (`bunx argsbarg`) — bootstrap and tooling; library API is `import from "argsbarg"`. */
 
-import { Cli } from "../index.ts";
+import { Cli } from "~/index";
 import { program } from "./program.ts";
 
 const cli = new Cli(program);

package/src/cli-tool/program.ts

@@ -2,8 +2,8 @@
 Argsbarg developer tools — bootstrap consumer CLIs via `create`.
 */
 
+import { CliOptionKind, type CliProgram } from "~/index";
 import pkg from "../../package.json" with { type: "json" };
-import { CliOptionKind, type CliProgram } from "../index.ts";
 import { runCreate } from "./run-create.ts";
 import { runSchemagenCli } from "./run-schemagen.ts";
 
@@ -13,6 +13,7 @@ export const program = {
   description: "Argsbarg developer tools — bootstrap CLIs from the full-example template.",
   completion: { enabled: false },
   configure: { enabled: false },
+  docs: { enabled: false },
   commands: [
     {
       key: "create",
@@ -96,7 +97,7 @@ export const program = {
     {
       key: "schemagen",
       description:
-        "Generate JSON Schema artifacts from src/**/types.ts role exports into colocated __generated__/ directories.",
+        "Generate JSON Schema artifacts from @sg markers in src/**/*.ts into colocated __generated__/ directories.",
       options: [
         {
           name: "root",

package/src/cli-tool/prompt.ts

@@ -1,6 +1,6 @@
 /** Interactive prompts for `argsbarg create`. */
 
-import { readPromptLine as readStdinLine } from "../prompt.ts";
+import { readPromptLine as readStdinLine } from "~/prompt.ts";
 
 export function readPromptLine(prompt: string): string {
   process.stderr.write(prompt);

package/src/cli-tool/run-schemagen.ts

@@ -17,7 +17,5 @@ export function runSchemagenCli(options: RunSchemagenCliOptions = {}): void {
     srcDir: options.srcDir,
     tsconfig: options.tsconfig,
   });
-  console.log(
-    `config roots: ${counts.configRoots}, input roots: ${counts.inputRoots}, output roots: ${counts.outputRoots}`,
-  );
+  console.log(`schemas: ${counts.schemas}`);
 }