scoutline 0.1.0 → 0.2.0

package/dist/commands/quota.js

@@ -1,77 +1,133 @@
 /**
- * Quota command — authoritative Z.AI Coding Plan usage from the monitor API.
+ * Quota command — Provider-neutral quota dashboard (P4-03, ADR-0001).
+ *
+ * The command is presentation-only: it receives a dashboard builder
+ * through injected dependencies and wraps the resulting
+ * {@link QuotaDashboard} as base data with a TTY presentation override.
+ * Provider resolution, capability invocation, settled collection, and
+ * failure redaction live in {@link buildQuotaDashboard} so the command
+ * never imports a Provider monitor client or maps a Provider response.
+ *
+ * Default mode (effective Provider) propagates quota failures through
+ * the ordinary error path (thrown → invokeCommand). All-provider mode
+ * (`--all-providers`) uses settled collection, emits successful and
+ * failed entries, and yields exit 1 when any configured Provider fails.
  */
-import { getQuotaLimit, getTimeLimit, getTokensLimit, formatResetTime, } from "../lib/monitor-client.js";
-import { outputSuccess, getOutputMode } from "../lib/output.js";
-import { formatErrorOutput } from "../lib/errors.js";
-import { formatQuotaPretty } from "../lib/tty.js";
-export async function quota(_options = {}) {
-    try {
-        const data = await getQuotaLimit();
-        const timeLimit = getTimeLimit(data);
-        const tokensLimit = getTokensLimit(data);
-        const formatted = {
-            plan: data.level,
-            timeWindow: timeLimit
-                ? {
-                    used: timeLimit.currentValue,
-                    limit: timeLimit.usage,
-                    remaining: timeLimit.remaining,
-                    percentage: timeLimit.percentage,
-                    windowHours: timeLimit.unit,
-                    resetsAt: timeLimit.nextResetTime
-                        ? new Date(timeLimit.nextResetTime).toISOString()
-                        : null,
-                    resetsIn: timeLimit.nextResetTime ? formatResetTime(timeLimit.nextResetTime) : null,
-                    byTool: timeLimit.usageDetails,
-                }
-                : null,
-            tokens: tokensLimit
-                ? {
-                    percentage: tokensLimit.percentage,
-                    resetsAt: tokensLimit.nextResetTime
-                        ? new Date(tokensLimit.nextResetTime).toISOString()
-                        : null,
-                    resetsIn: tokensLimit.nextResetTime ? formatResetTime(tokensLimit.nextResetTime) : null,
-                }
-                : null,
-        };
-        const mode = getOutputMode();
-        if (mode === "tty") {
-            outputSuccess(formatQuotaPretty(formatted));
-        }
-        else {
-            outputSuccess(formatted);
-        }
+import { quotaFailureFromError } from "../capabilities/quota.js";
+import { executeProviderOperation } from "../lib/execution.js";
+import { ConfigurationError, UnsupportedCapabilityError } from "../lib/errors.js";
+import { getProviderDescriptor } from "../providers/selection.js";
+import { redactSecrets, configuredSecrets } from "../lib/redact.js";
+import { formatQuotaDashboard } from "../lib/tty.js";
+/**
+ * Invoke one Provider's quota Capability through shared execution. The
+ * Adapter transport performs a single attempt; the retry policy lives
+ * in `executeProviderOperation("quota", ...)`. Quota never uses the
+ * response cache.
+ */
+async function invokeProviderQuota(descriptor, env, sleep, random) {
+    const adapter = descriptor.create({ env });
+    const capability = adapter.quota;
+    if (!capability) {
+        throw new UnsupportedCapabilityError(descriptor.id, "quota");
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
+    return executeProviderOperation("quota", () => capability.invoke(), { sleep, random });
+}
+/**
+ * Default-mode dashboard. Resolves the effective Provider, requires it
+ * to be configured (ConfigurationError, exit 3, before transport), then
+ * invokes its quota Capability. Failures propagate through the ordinary
+ * error path.
+ */
+async function buildDefaultDashboard(deps) {
+    const descriptor = getProviderDescriptor(deps.effectiveProvider, deps.descriptors);
+    if (!descriptor.isConfigured(deps.env)) {
+        throw new ConfigurationError(`Provider "${deps.effectiveProvider}" is not configured. Set Z_AI_API_KEY or MINIMAX_API_KEY.`);
+    }
+    const success = await invokeProviderQuota(descriptor, deps.env, deps.sleep, deps.random);
+    return {
+        schemaVersion: 1,
+        effectiveProvider: deps.effectiveProvider,
+        providers: [success],
+    };
+}
+/**
+ * All-provider dashboard. Queries every configured Provider in static
+ * registry order using settled collection. No unconfigured Provider is
+ * invoked; the effective Provider is dashboard metadata only. Failures
+ * are normalized and recursively redacted before joining the dashboard.
+ * No configured Provider is a configuration failure, not an empty
+ * success.
+ */
+async function buildAllProvidersDashboard(deps) {
+    const configured = deps.descriptors.filter((d) => d.isConfigured(deps.env));
+    if (configured.length === 0) {
+        throw new ConfigurationError("No provider is configured. Set Z_AI_API_KEY and/or MINIMAX_API_KEY.");
     }
+    const secrets = configuredSecrets(deps.env);
+    const settled = await Promise.allSettled(configured.map((d) => invokeProviderQuota(d, deps.env, deps.sleep, deps.random)));
+    const providers = configured.map((d, i) => {
+        const result = settled[i];
+        if (result.status === "fulfilled") {
+            return result.value;
+        }
+        return redactSecrets(quotaFailureFromError(d.id, result.reason), secrets);
+    });
+    return {
+        schemaVersion: 1,
+        effectiveProvider: deps.effectiveProvider,
+        providers,
+    };
+}
+/**
+ * Build a {@link QuotaDashboard} for the selected mode. The effective
+ * Provider is resolved by the dispatcher (`index.ts`) and passed in as
+ * metadata; config validation happens here.
+ */
+export async function buildQuotaDashboard(deps) {
+    return deps.allProviders ? buildAllProvidersDashboard(deps) : buildDefaultDashboard(deps);
+}
+/**
+ * Run the quota command. Returns the dashboard as base data with a TTY
+ * presentation override. Exit code is 1 when any dashboard entry failed
+ * (all-provider mode); otherwise 0.
+ */
+export async function quota(deps) {
+    const dashboard = await deps.buildDashboard();
+    const hasFailure = dashboard.providers.some((p) => p.status === "error");
+    return {
+        kind: "data",
+        data: dashboard,
+        presentations: { tty: formatQuotaDashboard(dashboard) },
+        exitCode: hasFailure ? 1 : 0,
+    };
 }
 export const QUOTA_HELP = `
-Quota Command - Authoritative Z.AI Coding Plan usage from the monitor API
+Quota Command - Provider-normalized plan usage dashboard
 
 Usage: scoutline quota [options]
 
-Hits GET https://api.z.ai/api/monitor/usage/quota/limit directly (NOT the MCP
-endpoint) to return real-time plan usage, including:
-  - Plan tier (pro / lite / max)
-  - 5-hour rolling window: calls used / limit / remaining / reset time
-  - Per-tool breakdown (search-prime, web-reader, zread)
-  - Token budget percentage + reset time
+Reports plan usage for the effective Provider (or every configured
+Provider with --all-providers) as a normalized, schema-version-1
+dashboard (ADR-0001). Each entry carries named quota categories with
+current and optional weekly windows, counts, remaining percentage, and
+ISO reset time. No Provider-specific field crosses the Interface.
 
 Options:
-  (none yet — future versions may add --history for 24h/7d/30d windows)
+  --all-providers   Query every configured Provider in registry order.
+                    Successful and failed entries both appear; the
+                    command exits 1 when any Provider fails.
 
 Examples:
-  scoutline quota
-  scoutline quota -O pretty    # human-readable with progress bars
-  scoutline quota -O json      # envelope-wrapped for scripts
+  scoutline quota                  # effective Provider usage
+  scoutline quota --all-providers  # every configured Provider
+  scoutline quota -O pretty        # human-readable with progress bars
+  scoutline quota -O json          # envelope-wrapped for scripts
 
 Notes:
-  - This call hits a different endpoint than search/read/repo and is not
-    cached by the local response cache.
-  - Auth: tries raw API key first, falls back to Bearer prefix on 401.
+  - Quota is never cached by the local response cache.
+  - Default-mode failures propagate as ordinary errors (exit 3 for an
+    unconfigured effective Provider).
+  - All-provider mode never invokes an unconfigured Provider.
 `.trim();
 //# sourceMappingURL=quota.js.map

package/dist/commands/quota.js.map

@@ -1 +1 @@
-{"version":3,"file":"quota.js","sourceRoot":"","sources":["../../src/commands/quota.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,aAAa,EACb,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAMlD,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,QAAQ,GAAiB,EAAE;IACrD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAEzC,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,UAAU,EAAE,SAAS;gBACnB,CAAC,CAAC;oBACE,IAAI,EAAE,SAAS,CAAC,YAAY;oBAC5B,KAAK,EAAE,SAAS,CAAC,KAAK;oBACtB,SAAS,EAAE,SAAS,CAAC,SAAS;oBAC9B,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,WAAW,EAAE,SAAS,CAAC,IAAI;oBAC3B,QAAQ,EAAE,SAAS,CAAC,aAAa;wBAC/B,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE;wBACjD,CAAC,CAAC,IAAI;oBACR,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI;oBACnF,MAAM,EAAE,SAAS,CAAC,YAAY;iBAC/B;gBACH,CAAC,CAAC,IAAI;YACR,MAAM,EAAE,WAAW;gBACjB,CAAC,CAAC;oBACE,UAAU,EAAE,WAAW,CAAC,UAAU;oBAClC,QAAQ,EAAE,WAAW,CAAC,aAAa;wBACjC,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE;wBACnD,CAAC,CAAC,IAAI;oBACR,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI;iBACxF;gBACH,CAAC,CAAC,IAAI;SACT,CAAC;QAEF,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;QAC7B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,aAAa,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;CAwBzB,CAAC,IAAI,EAAE,CAAC"}
+{"version":3,"file":"quota.js","sourceRoot":"","sources":["../../src/commands/quota.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAmBrD;;;;;GAKG;AACH,KAAK,UAAU,mBAAmB,CAChC,UAA8B,EAC9B,GAAsB,EACtB,KAAoC,EACpC,MAAoB;IAEpB,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAqB,CAAC;IAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC;IACjC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,0BAA0B,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AACzF,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,qBAAqB,CAAC,IAAgC;IACnE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACnF,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,kBAAkB,CAC1B,aAAa,IAAI,CAAC,iBAAiB,2DAA2D,CAC/F,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzF,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,SAAS,EAAE,CAAC,OAAO,CAAC;KACrB,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,0BAA0B,CACvC,IAAgC;IAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,kBAAkB,CAC1B,qEAAqE,CACtE,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CACjF,CAAC;IACF,MAAM,SAAS,GAAuD,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC5F,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC;QACD,OAAO,aAAa,CAClB,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAC1C,OAAO,CACgB,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAgC;IAEhC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;AAC5F,CAAC;AAmBD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,IAA8B;IAE9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC;IACzE,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,SAAS;QACf,aAAa,EAAE,EAAE,GAAG,EAAE,oBAAoB,CAAC,SAAS,CAAC,EAAE;QACvD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BzB,CAAC,IAAI,EAAE,CAAC"}

package/dist/commands/read.d.ts

@@ -1,7 +1,21 @@
 /**
  * Web reader command using Z.AI WebReader MCP
+ *
+ * P1-05: returns a CommandResult instead of writing directly to
+ * stdout/stderr. Notices (URL rewrite hint, truncation warning, extract
+ * count) flow through the invocation context; errors are thrown and
+ * converted by invokeCommand.
+ *
+ * Behaviour preserved from Phase 0:
+ *   - By default the data is the page content (string).
+ *   - With --full-envelope the data is the structured reader envelope.
+ *   - With -O json/pretty (without --full-envelope) the data is also the
+ *     envelope so consumers always get the structured object in JSON
+ *     modes. The `outputMode` parameter is passed by the dispatcher.
  */
 import { type ExtractMode } from "../lib/extract.js";
+import type { CommandContext, CommandResult } from "../command-invocation.js";
+import type { OutputMode } from "../lib/output.js";
 export interface ReadOptions {
     format?: "markdown" | "text";
     noImages?: boolean;
@@ -15,6 +29,6 @@ export interface ReadOptions {
     fullEnvelope?: boolean;
     extract?: ExtractMode;
 }
-export declare function read(url: string, options?: ReadOptions): Promise<void>;
+export declare function read(url: string, options?: ReadOptions, outputMode?: OutputMode, context?: CommandContext): Promise<CommandResult>;
 export declare const READ_HELP: string;
 //# sourceMappingURL=read.d.ts.map

package/dist/commands/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/commands/read.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,EAA0B,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE7E,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAwDD,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiFhF;AAGD,eAAO,MAAM,SAAS,QAuCd,CAAC"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/commands/read.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAA0B,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAwDD,wBAAsB,IAAI,CACxB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,WAAgB,EACzB,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,CAkExB;AAGD,eAAO,MAAM,SAAS,QAuCd,CAAC"}

package/dist/commands/read.js

@@ -1,10 +1,20 @@
 /**
  * Web reader command using Z.AI WebReader MCP
+ *
+ * P1-05: returns a CommandResult instead of writing directly to
+ * stdout/stderr. Notices (URL rewrite hint, truncation warning, extract
+ * count) flow through the invocation context; errors are thrown and
+ * converted by invokeCommand.
+ *
+ * Behaviour preserved from Phase 0:
+ *   - By default the data is the page content (string).
+ *   - With --full-envelope the data is the structured reader envelope.
+ *   - With -O json/pretty (without --full-envelope) the data is also the
+ *     envelope so consumers always get the structured object in JSON
+ *     modes. The `outputMode` parameter is passed by the dispatcher.
  */
 import { ZaiMcpClient } from "../lib/mcp-client.js";
-import { outputSuccess, getOutputMode } from "../lib/output.js";
-import { formatErrorOutput, ValidationError } from "../lib/errors.js";
-import { silenceConsole, restoreConsole } from "../lib/silence.js";
+import { ValidationError } from "../lib/errors.js";
 import { extract, isExtractMode } from "../lib/extract.js";
 /**
  * Rewrite rendered GitHub gist/file URLs to their raw form so Z.AI's reader
@@ -57,69 +67,58 @@ function truncate(content, max) {
     }
     return { text: content.slice(0, max - 1).trimEnd() + "…", originalLen, truncated: true };
 }
-export async function read(url, options = {}) {
-    // Validate URL first (before silencing)
+export async function read(url, options = {}, outputMode, context) {
+    // Validate URL first (before any client work).
     if (!url.startsWith("http://") && !url.startsWith("https://")) {
-        console.error(formatErrorOutput(new ValidationError("URL must start with http:// or https://")));
-        process.exit(1);
+        throw new ValidationError("URL must start with http:// or https://");
     }
     if (options.extract && !isExtractMode(options.extract)) {
-        console.error(formatErrorOutput(new ValidationError(`Invalid --extract mode: ${options.extract}. Use one of: code, links, tables, headings`)));
-        process.exit(1);
+        throw new ValidationError(`Invalid --extract mode: ${options.extract}. Use one of: code, links, tables, headings`);
     }
     const finalUrl = maybeRewriteToRaw(url);
-    if (finalUrl !== url) {
-        process.stderr.write(`ℹ️  rewrote gist URL to raw form: ${finalUrl}\n`);
+    if (finalUrl !== url && context) {
+        context.notice(`ℹ️  rewrote gist URL to raw form: ${finalUrl}`);
     }
-    silenceConsole();
     const client = new ZaiMcpClient({ enableVision: false, noCache: options.noCache });
     try {
-        try {
-            const response = await client.webRead({
-                url: finalUrl,
-                format: options.format || "markdown",
-                retainImages: !options.noImages,
-                withLinksSummary: options.withLinks,
-                timeout: options.timeout,
-                noCache: options.noCache,
-                noGfm: options.noGfm,
-                keepImgDataUrl: options.keepImgDataUrl,
-                withImagesSummary: options.withImagesSummary,
-            });
-            const { content: rawContent } = extractContent(response);
-            // --extract short-circuits: returns the extracted slice as a JSON array,
-            // bypassing truncation and envelope logic.
-            if (options.extract) {
-                const extracted = extract(rawContent, options.extract);
-                process.stderr.write(`ℹ️  extracted ${extracted.length} ${options.extract}\n`);
-                outputSuccess(extracted);
-                return;
-            }
-            const { text, originalLen, truncated } = truncate(rawContent, options.maxChars);
-            if (truncated) {
-                process.stderr.write(`⚠️  content truncated from ${originalLen.toLocaleString()} to ${text.length.toLocaleString()} chars; use a higher --max-chars or omit it for full content\n`);
-            }
-            // Default: content-only (drops title/metadata/external envelope).
-            // --full-envelope or --output-format json/pretty keeps the structured object.
-            const wantEnvelope = options.fullEnvelope || getOutputMode() === "json" || getOutputMode() === "pretty";
-            if (wantEnvelope) {
-                const envelope = response && typeof response === "object"
-                    ? { ...response, content: text }
-                    : { content: text };
-                outputSuccess(envelope);
-            }
-            else {
-                outputSuccess(text);
+        const response = await client.webRead({
+            url: finalUrl,
+            format: options.format || "markdown",
+            retainImages: !options.noImages,
+            withLinksSummary: options.withLinks,
+            timeout: options.timeout,
+            noCache: options.noCache,
+            noGfm: options.noGfm,
+            keepImgDataUrl: options.keepImgDataUrl,
+            withImagesSummary: options.withImagesSummary,
+        });
+        const { content: rawContent } = extractContent(response);
+        // --extract short-circuits: returns the extracted slice as a JSON array,
+        // bypassing truncation and envelope logic.
+        if (options.extract) {
+            const extracted = extract(rawContent, options.extract);
+            if (context) {
+                context.notice(`ℹ️  extracted ${extracted.length} ${options.extract}`);
             }
+            return { kind: "data", data: extracted };
+        }
+        const { text, originalLen, truncated } = truncate(rawContent, options.maxChars);
+        if (truncated && context) {
+            context.notice(`⚠️  content truncated from ${originalLen.toLocaleString()} to ${text.length.toLocaleString()} chars; use a higher --max-chars or omit it for full content`);
         }
-        finally {
-            await client.close().catch(() => { });
-            restoreConsole();
+        // Default: content-only (drops title/metadata/external envelope).
+        // --full-envelope, json, or pretty keeps the structured object.
+        const wantEnvelope = options.fullEnvelope || outputMode === "json" || outputMode === "pretty";
+        if (wantEnvelope) {
+            const envelope = response && typeof response === "object"
+                ? { ...response, content: text }
+                : { content: text };
+            return { kind: "data", data: envelope };
         }
+        return { kind: "data", data: text };
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
+    finally {
+        await client.close().catch(() => { });
     }
 }
 // Help text

package/dist/commands/read.js.map

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

package/dist/commands/repo.d.ts

@@ -1,6 +1,11 @@
 /**
  * Repo commands for GitHub repository exploration (ZRead)
+ *
+ * P1-05: each command returns a CommandResult instead of writing
+ * directly to stdout/stderr. Validation errors are thrown and converted
+ * by invokeCommand.
  */
+import type { CommandContext, CommandResult } from "../command-invocation.js";
 export interface RepoSearchOptions {
     language?: "en" | "zh";
     maxChars?: number;
@@ -15,8 +20,8 @@ export interface RepoReadOptions {
     maxChars?: number;
     noCache?: boolean;
 }
-export declare function repoSearch(repo: string, query: string, options?: RepoSearchOptions): Promise<void>;
-export declare function repoTree(repo: string, options?: RepoTreeOptions): Promise<void>;
-export declare function repoRead(repo: string, path: string, options?: RepoReadOptions): Promise<void>;
+export declare function repoSearch(repo: string, query: string, options?: RepoSearchOptions, _context?: CommandContext): Promise<CommandResult>;
+export declare function repoTree(repo: string, options?: RepoTreeOptions, _context?: CommandContext): Promise<CommandResult>;
+export declare function repoRead(repo: string, path: string, options?: RepoReadOptions, _context?: CommandContext): Promise<CommandResult>;
 export declare const REPO_HELP: string;
 //# sourceMappingURL=repo.d.ts.map

package/dist/commands/repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../src/commands/repo.ts"],"names":[],"mappings":"AAAA;;GAEG;AAgBH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAiFD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyCzF;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAsBf;AAGD,eAAO,MAAM,SAAS,QA2Cd,CAAC"}
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../src/commands/repo.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAW9E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAiFD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,iBAAsB,EAC/B,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,CAAC,CAcxB;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,eAAoB,EAC7B,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,CAAC,CA+BxB;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,eAAoB,EAC7B,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,CAAC,CAUxB;AAGD,eAAO,MAAM,SAAS,QA2Cd,CAAC"}

package/dist/commands/repo.js

@@ -1,10 +1,12 @@
 /**
  * Repo commands for GitHub repository exploration (ZRead)
+ *
+ * P1-05: each command returns a CommandResult instead of writing
+ * directly to stdout/stderr. Validation errors are thrown and converted
+ * by invokeCommand.
  */
 import { ZReadMcpClient } from "../lib/mcp-client.js";
-import { outputSuccess } from "../lib/output.js";
-import { formatErrorOutput, ValidationError } from "../lib/errors.js";
-import { silenceConsole, restoreConsole } from "../lib/silence.js";
+import { ValidationError } from "../lib/errors.js";
 import path from "node:path";
 function validateRepo(repo) {
     if (!repo.includes("/")) {
@@ -74,101 +76,61 @@ async function collectTreeSnapshots(client, repo, basePath, depth) {
     }
     return snapshots;
 }
-export async function repoSearch(repo, query, options = {}) {
-    try {
-        validateRepo(repo);
-        if (options.language && options.language !== "en" && options.language !== "zh") {
-            throw new ValidationError('Language must be "en" or "zh"');
-        }
+export async function repoSearch(repo, query, options = {}, _context) {
+    validateRepo(repo);
+    if (options.language && options.language !== "en" && options.language !== "zh") {
+        throw new ValidationError('Language must be "en" or "zh"');
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
-    }
-    silenceConsole();
     const client = new ZReadMcpClient({ enableVision: false, noCache: options.noCache });
     try {
-        try {
-            const language = options.language || "en";
-            const results = await client.searchDoc(repo, query, language);
-            outputSuccess(truncateText(results, options.maxChars));
-        }
-        finally {
-            await client.close().catch(() => { });
-            restoreConsole();
-        }
+        const language = options.language || "en";
+        const results = await client.searchDoc(repo, query, language);
+        return { kind: "data", data: truncateText(results, options.maxChars) };
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
+    finally {
+        await client.close().catch(() => { });
     }
 }
-export async function repoTree(repo, options = {}) {
-    try {
-        validateRepo(repo);
-        if (options.depth !== undefined) {
-            const depthValue = Number(options.depth);
-            if (!Number.isFinite(depthValue) || depthValue < 1) {
-                throw new ValidationError("Depth must be a positive integer");
-            }
+export async function repoTree(repo, options = {}, _context) {
+    validateRepo(repo);
+    if (options.depth !== undefined) {
+        const depthValue = Number(options.depth);
+        if (!Number.isFinite(depthValue) || depthValue < 1) {
+            throw new ValidationError("Depth must be a positive integer");
         }
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
-    }
-    silenceConsole();
     const client = new ZReadMcpClient({ enableVision: false, noCache: options.noCache });
     try {
-        try {
-            const depth = Math.max(1, Math.floor(options.depth || 1));
-            const dirPath = normalizeDirPath(options.path);
-            if (depth === 1) {
-                const structure = await client.getRepoStructure(repo, dirPath);
-                outputSuccess(structure);
-                return;
-            }
-            const snapshots = await collectTreeSnapshots(client, repo, dirPath, depth);
-            outputSuccess({
+        const depth = Math.max(1, Math.floor(options.depth || 1));
+        const dirPath = normalizeDirPath(options.path);
+        if (depth === 1) {
+            const structure = await client.getRepoStructure(repo, dirPath);
+            return { kind: "data", data: structure };
+        }
+        const snapshots = await collectTreeSnapshots(client, repo, dirPath, depth);
+        return {
+            kind: "data",
+            data: {
                 repo,
                 depth,
                 basePath: dirPath || "/",
                 snapshots,
-            });
-        }
-        finally {
-            await client.close().catch(() => { });
-            restoreConsole();
-        }
+            },
+        };
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
+    finally {
+        await client.close().catch(() => { });
     }
 }
-export async function repoRead(repo, path, options = {}) {
-    try {
-        validateRepo(repo);
-    }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
-    }
-    silenceConsole();
+export async function repoRead(repo, path, options = {}, _context) {
+    validateRepo(repo);
     const client = new ZReadMcpClient({ enableVision: false, noCache: options.noCache });
     try {
-        try {
-            const content = await client.readFile(repo, path);
-            outputSuccess(truncateText(content, options.maxChars));
-        }
-        finally {
-            await client.close().catch(() => { });
-            restoreConsole();
-        }
+        const content = await client.readFile(repo, path);
+        return { kind: "data", data: truncateText(content, options.maxChars) };
     }
-    catch (error) {
-        console.error(formatErrorOutput(error));
-        process.exit(1);
+    finally {
+        await client.close().catch(() => { });
     }
 }
 // Help text