@vibecodr/cli 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -2,6 +2,39 @@
 
 Pre-1.0.0 history for the `@vibecodr/cli@0.2.x` and `0.1.x` lines lives at [`docs/legacy/CHANGELOG-mcp-cli.md`](docs/legacy/CHANGELOG-mcp-cli.md). The `@vibecodr/vc-tools@0.1.x` line was the other half of the May 2026 merge; its source history is preserved in the archived [`BradenHartsell/vc-tools`](https://github.com/BradenHartsell/vc-tools) repository.
 
+## 1.0.7
+
+Verbiage and discoverability cleanup driven by user reports on 1.0.6.
+
+**1. Every user-facing string now teaches `vibecodr`, not `vc-tools`.** Through 1.0.6, the dispatcher correctly cross-routed commands like `agent`, `browser`, `retention` from the canonical `vibecodr` / `vibecodr-mcp` bins, but the legacy dispatcher's help text, Usage lines, error nextStep hints, version banner, and Examples block still printed `vc-tools <command>` everywhere. Running `vibecodr agent -h` would show `Usage: vc-tools agent connect`. Running `vibecodr retention` (no subcommand) would error with `Use vc-tools retention show`. ~176 hits in `src/legacy/cli/run.ts` plus 5 docs files, 4 output-baseline fixtures, and assorted test assertions are now aligned. The compatibility-only `vc-tools` bin still ships, but it now teaches `vibecodr <command>` in its own help to nudge users toward the canonical name.
+
+The package name (`@vibecodr/cli`), the `vc-tools` bin entry, the OS keyring service IDs, the legacy `VC_TOOLS_*` env var aliases, the legacy config dir migration paths, the `serverName: "vc-tools"` default for MCP client install entries, and the `.vc-tools.bak` backup-file suffix on legacy MCP upgrades all kept their existing names — those are real identifiers that would break orphan stored credentials / installed agent clients / migration on rename.
+
+- `src/legacy/cli/run.ts`: dispatcher-side user-facing strings flipped from `vc-tools` to `vibecodr`.
+- `src/legacy/cli/install.ts`, `src/legacy/config/store.ts`, `src/legacy/core/api-client.ts`, `src/legacy/core/validators.ts`: error messages and prose aligned.
+- `docs/{commands,API-CONTRACT,RELEASE-CHECKLIST,SECURITY,VALIDATION-MATRIX}.md`: command examples flipped to `vibecodr`.
+- `test/legacy/cli.behavior.test.ts`, `test/cli-dispatch.test.ts`: assertions flipped to the new verbiage.
+- `test/fixtures/output-baseline/vc-tools-{doctor,plans,start,status}.json`: fixture contents updated (filenames stay opaque keys).
+- Default `vibecodr try` output dir flipped from `vc-tools-proof/` to `vibecodr-proof/`.
+
+**2. `vibecodr --help` reorganized.** Through 1.0.6 the help text had a flat `Advanced / diagnostic:` line listing `auth, setup, connect, inspect, jobs, artifacts, grants, retention, scheduled-qa, limits` — most of which are either redundant aliases (`setup`=`start`, `limits`=`usage`, `jobs`=`work`, `artifacts`=`proof`, `connect`=`agent connect`) or genuinely useful product features the user didn't realize were available. The help now:
+- **Hides the redundant aliases and the dev-only `inspect` command** from `--help`. The routing stays — existing scripts that learned `vc-tools jobs list` still work — they're just no longer advertised in the canonical bin's help.
+- **Promotes the real product features into their own `Account policy & monitoring:` section** with inline subcommand hints: `grants`, `retention <show|set>`, `scheduled-qa <list|create|pause|resume|delete>`. These hit real authenticated endpoints (`GET /grants`, `GET /retention`, the `*/scheduled-qa` family) and were buried.
+- **Surfaces `auth` in a dedicated `Automation handoff:` section** with the `<diagnose|status|export-agent-env>` subcommand hint, framed as the CI/automation credential workflow it actually is (rather than as "diagnostic" alongside random aliases).
+- **Adds inline subcommand syntax** to the Hosted Agent Computer section (e.g., `agent <connect|instructions|status>`, `computer <start|status|run|test>`, `browser <render|screenshot|read|markdown|pdf|crawl|snapshot|ask>`, `work <list|show|...>`, `proof <list|show|save|delete>`) so `vibecodr retention` no longer feels like it stranded the user when it asks for a subcommand.
+
+- `src/bin/vibecodr-mcp.ts`: `helpText()` restructured into Hosted Agent Computer / Account & install / Pulses / Account policy & monitoring / Automation handoff / CLI maintenance / Global flags.
+
+**3. `vibecodr tools` output is now scannable.** The MCP gateway returns long-paragraph descriptions for each tool — they're written for AI agents that read the description to decide which tool to call, so they're verbose by design. Through 1.0.6 the CLI dumped them one-tool-per-line as `name: full_paragraph`, which produced a wall of wrapped text. The default human path now:
+- Shows only the **first sentence** of each description, truncated to fit terminal width with `…`.
+- **Column-aligns** tool names against descriptions for scanning.
+- **Groups** tools visually by name prefix (so `get_*` / `list_*` / `publish_*` cluster together).
+- Adds a **header** with tool count and gateway URL, and a **footer** pointing to `vibecodr tools <tool-name>` for the full description, `--search <query>` for filtering, and `--json` for machine-readable output.
+
+The `--json` envelope is byte-identical to 1.0.6 (the existing `test/output-baseline-mcp.test.ts` fixture still passes unchanged); only the human-readable lines changed.
+
+- `src/commands/tools.ts`: `renderToolsList()` helper + first-sentence summarizer + prefix-grouping.
+
 ## 1.0.6
 
 Hardens `vibecodr update` against three issues reported on Windows after the 1.0.4/1.0.5 releases.

package/README.md

@@ -8,7 +8,7 @@ The official Vibecodr CLI. One package, one install command, one coherent surfac
 - Hosted computer tools (run, test, work follow, work submit, proof).
 - Capsule uploads (zip + image) into Pulse and the hosted MCP gateway.
 - Pulse lifecycle (setup, publish, list, get, status, run, archive, restore, create, deploy).
-- Agent-client MCP installation (Codex, Cursor, VS Code, Windsurf, Claude Desktop, Claude Code).
+- Adding Vibecodr to the apps people actually use: Codex, Cursor, VS Code, Windsurf, Claude Desktop, and Claude Code.
 - Direct OAuth login, device-code login, status, doctor, diagnostics.
 
 ## Install
@@ -37,29 +37,49 @@ npm install -g @vibecodr/cli@1.0.0
 
 ## Quick start
 
+If you are not sure what you need yet, start here:
+
 ```bash
-# 1. Authenticate against the hosted Agent Computer (tools.vibecodr.space).
-vibecodr start
+vibecodr status
+vibecodr doctor
+```
+
+The default human experience is intentionally simple: the CLI should tell you
+what is connected, what is missing, and the next command to run. The underlying
+surfaces stay explicit for scripting, debugging, and release verification.
+
+```bash
+# 1. Sign in for publishing, uploads, Pulses, and MCP Gateway tools.
+vibecodr login
 
-# 2. Tell your agent client how to find the hosted MCP gateway (openai.vibecodr.space/mcp).
-vibecodr connect --client codex
+# 2. Add Vibecodr to Codex. Other supported apps: Cursor, VS Code, Windsurf,
+#    Claude Desktop, and Claude Code.
+vibecodr install codex
 
-# 3. Smoke-test the connection.
-vibecodr computer status
+# 3. Set up the hosted Agent Computer when you want browser/computer work.
+vibecodr start
 vibecodr browser screenshot https://example.com --out ./proof
 ```
 
+Power users and automation should prefer the explicit surfaces and stable JSON:
+
+```bash
+vibecodr mcp tools --json --non-interactive
+vibecodr mcp call get_account_capabilities --input-json '{}' --json --non-interactive
+vibecodr status --json --non-interactive
+```
+
 ## Surfaces
 
 The CLI talks to two hosted endpoints. Every command targets exactly one of them:
 
 | Endpoint | Commands |
 |---|---|
-| `tools.vibecodr.space` | `start`, `setup`, `agent`, `connect`, `try`, `browser`, `computer`, `work`, `proof`, `jobs`, `artifacts`, `usage`, `limits`, `grants`, `retention`, `scheduled-qa`, `plans`, `dashboard`, `inspect` |
-| `openai.vibecodr.space/mcp` | `tools`, `call`, `upload`, `pulse`, `pulse-setup`, `pulse-publish` |
-| Both | `login`, `logout`, `status`, `whoami`, `doctor`, `install`, `uninstall`, `config` |
+| `tools.vibecodr.space` | `start`, `setup`, `login agent`, `logout agent`, `agent`, `connect`, `try`, `browser`, `computer`, `work`, `proof`, `jobs`, `artifacts`, `usage`, `limits`, `grants`, `retention`, `scheduled-qa`, `plans`, `dashboard`, `inspect` |
+| `openai.vibecodr.space/mcp` | `login mcp`, `logout mcp`, `mcp tools`, `mcp call`, `tools`, `call`, `feedback`, `upload`, `pulse`, `pulse-setup`, `pulse-publish`, `whoami` |
+| Shared local diagnostics/install | `status`, `doctor`, `install`, `uninstall`, `config` |
 
-CLI auth is independent of the auth your editor (Codex, Cursor, VS Code, Windsurf, Claude Desktop, Claude Code) negotiates with the gateway; each client owns its own session.
+CLI auth is independent of the auth your editor (Codex, Cursor, VS Code, Windsurf, Claude Desktop, Claude Code) negotiates with the gateway; each client owns its own session. `vibecodr login` defaults to the MCP Gateway lane. Use `vibecodr login agent` for the hosted Agent Computer credential lane.
 
 ## Migrating from `@vibecodr/vc-tools@0.1.x` or `@vibecodr/cli@0.2.x`
 

package/dist/app/command-registry.d.ts

@@ -0,0 +1,13 @@
+export type CommandSurface = "shared" | "agent-computer" | "mcp-gateway" | "compatibility";
+export interface CommandDefinition {
+    name: string;
+    surface: CommandSurface;
+    summary: string;
+    preferred?: string | undefined;
+}
+export declare const COMMAND_REGISTRY: readonly CommandDefinition[];
+export declare const AGENT_COMPUTER_COMMANDS: Set<string>;
+export declare const MCP_GATEWAY_COMMANDS: Set<string>;
+export declare function findCommandDefinition(name: string | undefined): CommandDefinition | undefined;
+export declare function commandNamesForSurface(surface: CommandSurface): string[];
+//# sourceMappingURL=command-registry.d.ts.map

package/dist/app/command-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-registry.d.ts","sourceRoot":"","sources":["../../src/app/command-registry.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,gBAAgB,GAAG,aAAa,GAAG,eAAe,CAAC;AAE3F,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED,eAAO,MAAM,gBAAgB,EAAE,SAAS,iBAAiB,EAwCxD,CAAC;AAEF,eAAO,MAAM,uBAAuB,aAGnC,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAGhC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAG7F;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,EAAE,CAIxE"}

package/dist/app/command-registry.js

@@ -0,0 +1,54 @@
+export const COMMAND_REGISTRY = [
+    { name: "login", surface: "shared", summary: "Authorize the CLI against Vibecodr surfaces." },
+    { name: "logout", surface: "shared", summary: "Clear stored Vibecodr CLI credentials." },
+    { name: "status", surface: "shared", summary: "Show MCP Gateway and Agent Computer credential state." },
+    { name: "whoami", surface: "mcp-gateway", summary: "Show the connected Vibecodr account from the MCP Gateway." },
+    { name: "doctor", surface: "shared", summary: "Diagnose gateway, install, and hosted readiness." },
+    { name: "install", surface: "shared", summary: "Install the MCP gateway into an agent client." },
+    { name: "uninstall", surface: "shared", summary: "Remove a managed MCP client install." },
+    { name: "config", surface: "shared", summary: "Manage local CLI profiles and configuration." },
+    { name: "update", surface: "shared", summary: "Check or run CLI package updates." },
+    { name: "feedback", surface: "shared", summary: "Send product feedback straight to the Vibecodr dev." },
+    { name: "start", surface: "agent-computer", summary: "Connect and verify the hosted Agent Computer." },
+    { name: "setup", surface: "agent-computer", summary: "Compatibility alias for start.", preferred: "start" },
+    { name: "try", surface: "agent-computer", summary: "Run a small Agent Computer end-to-end check." },
+    { name: "agent", surface: "agent-computer", summary: "Connect an agent to the hosted computer." },
+    { name: "auth", surface: "agent-computer", summary: "Diagnose or export Agent Computer credentials." },
+    { name: "connect", surface: "agent-computer", summary: "Compatibility alias for agent connect.", preferred: "agent connect" },
+    { name: "computer", surface: "agent-computer", summary: "Run hosted computer commands." },
+    { name: "browser", surface: "agent-computer", summary: "Render, read, screenshot, crawl, or inspect public HTTPS pages." },
+    { name: "work", surface: "agent-computer", summary: "List, follow, show, or cancel hosted work." },
+    { name: "proof", surface: "agent-computer", summary: "List, show, save, or delete hosted artifacts." },
+    { name: "usage", surface: "agent-computer", summary: "Show Agent Computer capacity and quota progress." },
+    { name: "limits", surface: "agent-computer", summary: "Compatibility alias for usage.", preferred: "usage" },
+    { name: "dashboard", surface: "agent-computer", summary: "Print the hosted supervision dashboard URL." },
+    { name: "jobs", surface: "compatibility", summary: "Compatibility alias for work.", preferred: "work" },
+    { name: "artifacts", surface: "compatibility", summary: "Compatibility alias for proof.", preferred: "proof" },
+    { name: "grants", surface: "agent-computer", summary: "Show effective Agent Computer grants." },
+    { name: "retention", surface: "agent-computer", summary: "Show or update hosted retention policy." },
+    { name: "scheduled-qa", surface: "agent-computer", summary: "Manage scheduled browser checks." },
+    { name: "plans", surface: "agent-computer", summary: "Show Agent Computer plan details." },
+    { name: "inspect", surface: "compatibility", summary: "Show legacy goal-coverage inspections." },
+    { name: "mcp", surface: "mcp-gateway", summary: "Use the Vibecodr MCP Gateway namespace." },
+    { name: "tools", surface: "mcp-gateway", summary: "Compatibility alias for mcp tools.", preferred: "mcp tools" },
+    { name: "call", surface: "mcp-gateway", summary: "Compatibility alias for mcp call.", preferred: "mcp call" },
+    { name: "upload", surface: "mcp-gateway", summary: "Upload capsule archives or image assets through the MCP gateway." },
+    { name: "pulse-setup", surface: "mcp-gateway", summary: "Prepare a standalone Pulse descriptor." },
+    { name: "pulse-publish", surface: "mcp-gateway", summary: "Publish a standalone Pulse." },
+    { name: "pulse", surface: "mcp-gateway", summary: "Manage Pulse lifecycle operations." }
+];
+export const AGENT_COMPUTER_COMMANDS = new Set(COMMAND_REGISTRY.filter((command) => command.surface === "agent-computer" || command.surface === "compatibility")
+    .map((command) => command.name));
+export const MCP_GATEWAY_COMMANDS = new Set(COMMAND_REGISTRY.filter((command) => command.surface === "mcp-gateway")
+    .map((command) => command.name));
+export function findCommandDefinition(name) {
+    if (!name)
+        return undefined;
+    return COMMAND_REGISTRY.find((command) => command.name === name);
+}
+export function commandNamesForSurface(surface) {
+    return COMMAND_REGISTRY
+        .filter((command) => command.surface === surface)
+        .map((command) => command.name);
+}
+//# sourceMappingURL=command-registry.js.map

package/dist/app/command-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-registry.js","sourceRoot":"","sources":["../../src/app/command-registry.ts"],"names":[],"mappings":"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"}

package/dist/app/help.d.ts

@@ -0,0 +1,5 @@
+export declare function rootHelpText(): string;
+export declare function mcpHelpText(): string;
+export declare function commandSuggestion(input: string | undefined): string;
+export declare function mcpCommandSuggestion(input: string | undefined): string;
+//# sourceMappingURL=help.d.ts.map

package/dist/app/help.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/app/help.ts"],"names":[],"mappings":"AAmCA,wBAAgB,YAAY,IAAI,MAAM,CA6CrC;AAED,wBAAgB,WAAW,IAAI,MAAM,CAuBpC;AA6CD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAQnE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAMtE"}

package/dist/app/help.js

@@ -0,0 +1,158 @@
+import { COMMAND_REGISTRY, findCommandDefinition } from "./command-registry.js";
+const COMMON_CONFUSIONS = new Map([
+    ["check", "doctor"],
+    ["diagnose", "doctor"],
+    ["health", "doctor"],
+    ["signin", "login"],
+    ["sign-in", "login"],
+    ["sign_in", "login"],
+    ["signout", "logout"],
+    ["sign-out", "logout"],
+    ["sign_out", "logout"],
+    ["profile", "whoami"],
+    ["account", "whoami"],
+    ["feedbacks", "feedback"],
+    ["suggest", "feedback"],
+    ["tool", "mcp tools"],
+    ["mcp-tool", "mcp tools"],
+    ["mcp-tools", "mcp tools"],
+    ["invoke", "mcp call"],
+    ["publish", "pulse-publish"],
+    ["zip", "upload"],
+    ["screenshot", "browser screenshot"],
+    ["read", "browser read"]
+]);
+const MCP_CONFUSIONS = new Map([
+    ["tool", "tools"],
+    ["list", "tools"],
+    ["describe", "tools"],
+    ["schema", "tools"],
+    ["invoke", "call"],
+    ["run", "call"]
+]);
+export function rootHelpText() {
+    return [
+        "Vibecodr CLI",
+        "Usage: vibecodr <command> [options]",
+        "",
+        "Start here:",
+        "  vibecodr status          See what is already connected.",
+        "  vibecodr doctor          Check your local setup and get the next fix.",
+        "  vibecodr login           Sign in for publishing, uploads, Pulses, and MCP tools.",
+        "  vibecodr start           Sign in and verify the hosted Agent Computer.",
+        "  vibecodr install codex   Add Vibecodr to Codex. Also supports Cursor, Claude, VS Code, and Windsurf.",
+        "",
+        "Do useful things:",
+        "  vibecodr browser read https://example.com",
+        "  vibecodr browser screenshot https://example.com --out ./proof",
+        "  vibecodr upload --zip ./project.zip",
+        "  vibecodr pulse list",
+        "  vibecodr feedback \"This part was confusing\"",
+        "",
+        "For scripts and advanced use:",
+        "  vibecodr mcp tools       List MCP Gateway tools.",
+        "  vibecodr mcp call <tool> --input-json '{}'",
+        "  vibecodr usage           Show Agent Computer capacity.",
+        "  vibecodr work list       Show hosted work.",
+        "  vibecodr proof list      Show saved proof.",
+        "",
+        "Compatibility aliases:",
+        "  vibecodr-mcp <command>   Old MCP CLI name.",
+        "  vc-tools <command>       Old Agent Computer CLI name.",
+        "  vibecodr tools           Alias for vibecodr mcp tools.",
+        "  vibecodr call            Alias for vibecodr mcp call.",
+        "",
+        "Global flags:",
+        "  --profile <name>         Use a saved profile.",
+        "  --json                   Stable machine-readable output.",
+        "  --verbose                Include extra diagnostic details.",
+        "  --non-interactive        Fail instead of prompting.",
+        "",
+        "More help:",
+        "  vibecodr help <command>",
+        "  vibecodr mcp --help",
+        "  vibecodr browser --help",
+        "",
+        "If you are not sure what is broken, run: vibecodr doctor"
+    ].join("\n");
+}
+export function mcpHelpText() {
+    return [
+        "Vibecodr MCP Gateway",
+        "",
+        "Use this when you want the tool catalog behind openai.vibecodr.space/mcp.",
+        "Most users should start with `vibecodr status`, `vibecodr login`, or `vibecodr install codex`.",
+        "",
+        "Common commands:",
+        "  vibecodr mcp tools",
+        "      List available MCP tools.",
+        "  vibecodr mcp tools get_account_capabilities --schema",
+        "      Describe one tool and its input shape.",
+        "  vibecodr mcp call get_account_capabilities --input-json '{}'",
+        "      Call one tool with structured input.",
+        "",
+        "Compatibility aliases:",
+        "  vibecodr tools           Equivalent to vibecodr mcp tools.",
+        "  vibecodr call            Equivalent to vibecodr mcp call.",
+        "",
+        "Power flags:",
+        "  --json                   Keep output stable for scripts.",
+        "  --non-interactive        Never open login or prompt."
+    ].join("\n");
+}
+function editDistance(a, b) {
+    if (a === b)
+        return 0;
+    if (a.length === 0)
+        return b.length;
+    if (b.length === 0)
+        return a.length;
+    const previous = Array.from({ length: b.length + 1 }, (_, index) => index);
+    const current = Array.from({ length: b.length + 1 }, () => 0);
+    for (let row = 1; row <= a.length; row += 1) {
+        current[0] = row;
+        for (let column = 1; column <= b.length; column += 1) {
+            const cost = a.charAt(row - 1) === b.charAt(column - 1) ? 0 : 1;
+            current[column] = Math.min((current[column - 1] ?? 0) + 1, (previous[column] ?? 0) + 1, (previous[column - 1] ?? 0) + cost);
+        }
+        previous.splice(0, previous.length, ...current);
+    }
+    return previous[b.length] ?? Number.MAX_SAFE_INTEGER;
+}
+function nearestRegisteredCommand(input) {
+    const normalized = input.toLowerCase();
+    let best;
+    for (const command of COMMAND_REGISTRY) {
+        const name = command.name.toLowerCase();
+        const distance = editDistance(normalized, name);
+        if (!best || distance < best.distance) {
+            best = { name: command.name, distance };
+        }
+    }
+    if (!best)
+        return undefined;
+    const maxDistance = normalized.length <= 4 ? 1 : 2;
+    return best.distance <= maxDistance ? best.name : undefined;
+}
+function preferredCommand(command) {
+    return findCommandDefinition(command)?.preferred ?? command;
+}
+export function commandSuggestion(input) {
+    const normalized = (input ?? "").toLowerCase();
+    const manual = COMMON_CONFUSIONS.get(normalized);
+    const suggestion = manual ?? nearestRegisteredCommand(normalized);
+    if (suggestion) {
+        return `Try \`vibecodr ${preferredCommand(suggestion)}\`. Run \`vibecodr --help\` for the common paths.`;
+    }
+    return "Run `vibecodr --help` for the common paths, or `vibecodr doctor` if setup is failing.";
+}
+export function mcpCommandSuggestion(input) {
+    const normalized = (input ?? "").toLowerCase();
+    const suggestion = MCP_CONFUSIONS.get(normalized) ?? (editDistance(normalized, "tools") <= 1 ? "tools" : undefined);
+    if (suggestion === "tools")
+        return "Try `vibecodr mcp tools`. Run `vibecodr mcp --help` for MCP Gateway examples.";
+    if (suggestion === "call")
+        return "Try `vibecodr mcp call <tool> --input-json '{}'`. Run `vibecodr mcp --help` for examples.";
+    return "Run `vibecodr mcp --help`, `vibecodr mcp tools`, or `vibecodr mcp call <tool> --input-json '{}'`.";
+}
+//# sourceMappingURL=help.js.map

package/dist/app/help.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/app/help.ts"],"names":[],"mappings":"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"}

package/dist/bin/vibecodr-mcp.js

@@ -4,18 +4,23 @@ import { migrateLegacyDirsOnce } from "../storage/migrate.js";
 import { ConfigStore } from "../storage/config-store.js";
 import { SecretStore } from "../storage/secret-store.js";
 import { TokenManager } from "../auth/token-manager.js";
+import { DefaultCredentialBroker } from "../auth/credential-broker.js";
 import { CLIENT_INFO, McpRuntimeClient } from "../core/mcp-client.js";
 import { Output } from "../cli/output.js";
 import { isHelpToken, isVersionToken, parseGlobalOptions } from "../cli/parse.js";
 import { CliError, EXIT_CODES } from "../cli/errors.js";
+import { AGENT_COMPUTER_COMMANDS } from "../app/command-registry.js";
+import { commandSuggestion, rootHelpText } from "../app/help.js";
 import { runLoginCommand } from "../commands/login.js";
 import { runLogoutCommand } from "../commands/logout.js";
 import { runStatusCommand } from "../commands/status.js";
 import { runWhoamiCommand } from "../commands/whoami.js";
 import { runToolsCommand } from "../commands/tools.js";
 import { runCallCommand } from "../commands/call.js";
+import { runMcpCommand } from "../commands/mcp.js";
 import { runDoctorCommand } from "../commands/doctor.js";
 import { runConfigCommand } from "../commands/config.js";
+import { runFeedbackCommand } from "../commands/feedback.js";
 import { runInstallCommand } from "../commands/install.js";
 import { runUninstallCommand } from "../commands/uninstall.js";
 import { runPulseSetupCommand } from "../commands/pulse-setup.js";
@@ -23,65 +28,49 @@ import { runPulsePublishCommand } from "../commands/pulse-publish.js";
 import { runPulseCommand } from "../commands/pulse.js";
 import { runUploadCommand } from "../commands/upload.js";
 import { runUpdateCommand } from "../commands/update.js";
+import { ConfigStore as VcToolsConfigStore } from "../legacy/config/store.js";
 reconcileEnv();
 await migrateLegacyDirsOnce();
-function helpText() {
-    return [
-        "vibecodr <command> [options]",
-        "Compatibility alias: vibecodr-mcp <command> [options]",
-        "",
-        "Hosted Agent Computer:",
-        "  start         Connect and verify the Agent Computer; return agent connection details.",
-        "  try           Run a small browser, computer, proof, and usage check.",
-        "  agent         Connect an agent to the hosted computer or check readiness.",
-        "  computer      Start, check status, or run commands on the hosted Agent Computer.",
-        "  browser       Render, read, screenshot, crawl, or inspect public HTTPS pages.",
-        "  work          List, follow, show, or cancel hosted work.",
-        "  proof         List, show, save, or delete saved outputs and artifacts.",
-        "  usage         Show account-scoped Agent Computer capacity and quota progress.",
-        "  plans         Show plan and entitlement details for the connected account.",
-        "  dashboard     Print the hosted supervision dashboard URL.",
-        "",
-        "Account & install:",
-        "  login         Authorize this CLI against the Vibecodr MCP gateway.",
-        "  logout        Revoke the stored refresh token and clear the local session.",
-        "  status        Show connection, config, and session status.",
-        "  whoami        Show the connected account profile.",
-        "  doctor        Diagnose connection, auth, and runtime readiness.",
-        "  install <client>      Install Vibecodr MCP into a host (codex, cursor, vscode, windsurf, claude-desktop, claude-code).",
-        "  uninstall <client>    Remove a previously-installed MCP host entry.",
-        "  config        Manage profiles and stored configuration.",
-        "  tools [tool]  List or describe MCP tools exposed by the gateway.",
-        "  call <tool>   Invoke a tool by name with structured input.",
-        "  upload        --zip <path>  |  --image <path> [--kind cover_image|avatar_image]",
-        "",
-        "Pulses:",
-        "  pulse-setup [--descriptor-setup-json <json> | --descriptor-setup-file <path>]",
-        "  pulse-publish --name <name> (--code <source> | --code-file <path>) --confirm",
-        "  pulse <list|get|status|run|archive|restore|create|deploy>",
-        "    Publishes a standalone Pulse with private source/metadata visibility by default.",
-        "    The runtime URL is still public HTTP unless the Pulse code rejects callers.",
-        "",
-        "CLI maintenance:",
-        "  update [--check] [--yes] [--via <npm|pnpm|yarn|bun>]",
-        "",
-        "Advanced / diagnostic:",
-        "  auth, setup, connect, inspect, jobs, artifacts, grants, retention, scheduled-qa, limits",
-        "",
-        "Global flags:",
-        "  --profile <name>",
-        "  --json",
-        "  --verbose",
-        "  --non-interactive"
-    ].join("\n");
-}
 function versionText() {
     return String(CLIENT_INFO.version);
 }
+const AGENT_COMPUTER_AUTH_SCOPES = new Set(["agent", "agent-computer", "computer"]);
+const MCP_GATEWAY_AUTH_SCOPES = new Set(["mcp", "mcp-gateway", "gateway"]);
+function legacyArgsWithSharedFlags(command, commandArgs, globalOptions) {
+    const args = [command, ...commandArgs];
+    if (globalOptions.json && !args.includes("--json"))
+        args.push("--json");
+    if (globalOptions.nonInteractive && !args.includes("--no-input"))
+        args.push("--no-input");
+    return args;
+}
+function originalLegacyArgs(rawArgv, globalOptions) {
+    const args = rawArgv.filter((arg) => arg !== "--non-interactive");
+    if (!globalOptions.nonInteractive || args.includes("--no-input"))
+        return args;
+    return [...args, "--no-input"];
+}
+async function runLegacyAgentComputer(args) {
+    const { runCli } = await import("../legacy/cli/run.js");
+    const code = await runCli(args);
+    process.exitCode = code;
+}
 async function main() {
-    const { command, commandArgs, globalOptions } = parseGlobalOptions(process.argv.slice(2));
+    const rawArgv = process.argv.slice(2);
+    let { command, commandArgs, globalOptions } = parseGlobalOptions(rawArgv);
+    let helpRerouted = false;
+    if (command === "help") {
+        if (commandArgs.length === 0) {
+            process.stdout.write(rootHelpText() + "\n");
+            return;
+        }
+        const [helpTarget, ...helpRest] = commandArgs;
+        command = helpTarget;
+        commandArgs = [...helpRest, "--help"];
+        helpRerouted = true;
+    }
     if (!command || isHelpToken(command)) {
-        process.stdout.write(helpText() + "\n");
+        process.stdout.write(rootHelpText() + "\n");
         return;
     }
     if (isVersionToken(command)) {
@@ -93,19 +82,42 @@ async function main() {
     const tokenManager = new TokenManager(configStore, secretStore);
     const runtimeClient = new McpRuntimeClient();
     const output = new Output(globalOptions);
+    const vcToolsStore = VcToolsConfigStore.resolve(process.env);
+    const credentialBroker = new DefaultCredentialBroker({
+        vcToolsStore,
+        mcpSecretStore: secretStore,
+        mcpConfigStore: configStore
+    });
     const context = {
         globalOptions,
         output,
         configStore,
         secretStore,
         tokenManager,
-        runtimeClient
+        runtimeClient,
+        credentialBroker
     };
     switch (command) {
         case "login":
+            if (AGENT_COMPUTER_AUTH_SCOPES.has(commandArgs[0] ?? "")) {
+                await runLegacyAgentComputer(legacyArgsWithSharedFlags(command, commandArgs.slice(1), globalOptions));
+                return;
+            }
+            if (MCP_GATEWAY_AUTH_SCOPES.has(commandArgs[0] ?? "")) {
+                await runLoginCommand(commandArgs.slice(1), context);
+                return;
+            }
             await runLoginCommand(commandArgs, context);
             return;
         case "logout":
+            if (AGENT_COMPUTER_AUTH_SCOPES.has(commandArgs[0] ?? "")) {
+                await runLegacyAgentComputer(legacyArgsWithSharedFlags(command, commandArgs.slice(1), globalOptions));
+                return;
+            }
+            if (MCP_GATEWAY_AUTH_SCOPES.has(commandArgs[0] ?? "")) {
+                await runLogoutCommand(commandArgs.slice(1), context);
+                return;
+            }
             await runLogoutCommand(commandArgs, context);
             return;
         case "status":
@@ -115,11 +127,20 @@ async function main() {
             await runWhoamiCommand(commandArgs, context);
             return;
         case "tools":
+            if (commandArgs[0] === "test") {
+                await runLegacyAgentComputer(helpRerouted
+                    ? legacyArgsWithSharedFlags(command, commandArgs, globalOptions)
+                    : originalLegacyArgs(rawArgv, globalOptions));
+                return;
+            }
             await runToolsCommand(commandArgs, context);
             return;
         case "call":
             await runCallCommand(commandArgs, context);
             return;
+        case "mcp":
+            await runMcpCommand(commandArgs, context);
+            return;
         case "upload":
             await runUploadCommand(commandArgs, context);
             return;
@@ -135,6 +156,9 @@ async function main() {
         case "config":
             await runConfigCommand(commandArgs, context);
             return;
+        case "feedback":
+            await runFeedbackCommand(commandArgs, context);
+            return;
         case "pulse-setup":
             await runPulseSetupCommand(commandArgs, context);
             return;
@@ -148,40 +172,18 @@ async function main() {
             await runUpdateCommand(commandArgs, context);
             return;
         default:
-            if (VC_TOOLS_ONLY_COMMANDS.has(command)) {
+            if (AGENT_COMPUTER_COMMANDS.has(command)) {
                 // Vibecodr v1 surfaces the hosted Agent Computer commands (browser, computer,
                 // work, etc.) through both the vibecodr and vc-tools bin names. The legacy
                 // vc-tools dispatcher owns the byte-equivalent output, so delegate to it.
-                const { runCli } = await import("../legacy/cli/run.js");
-                const code = await runCli(process.argv.slice(2));
-                process.exitCode = code;
+                await runLegacyAgentComputer(helpRerouted
+                    ? legacyArgsWithSharedFlags(command, commandArgs, globalOptions)
+                    : originalLegacyArgs(rawArgv, globalOptions));
                 return;
             }
-            throw new CliError("usage.command", `Unknown command: ${command}`, EXIT_CODES.usage);
+            throw new CliError("usage.command", `Unknown command: ${command}`, EXIT_CODES.usage, { nextStep: commandSuggestion(command) });
     }
 }
-const VC_TOOLS_ONLY_COMMANDS = new Set([
-    "start",
-    "setup",
-    "try",
-    "agent",
-    "auth",
-    "connect",
-    "computer",
-    "browser",
-    "work",
-    "proof",
-    "usage",
-    "limits",
-    "dashboard",
-    "jobs",
-    "artifacts",
-    "grants",
-    "retention",
-    "scheduled-qa",
-    "plans",
-    "inspect"
-]);
 main().catch((error) => {
     const { globalOptions } = parseGlobalOptions(process.argv.slice(2));
     new Output(globalOptions).failure(error);