@solidnumber/cli 1.9.28 → 1.10.0

package/dist/lib/error-codes.d.ts

@@ -0,0 +1,81 @@
+/**
+ * Structured error classification (Sprint 1 — T1.1).
+ *
+ * Takes the raw pieces of an axios failure (status, body, network code)
+ * and returns a stable {code, hint, scope, ...} envelope that agents can
+ * branch on deterministically instead of regex-matching prose messages.
+ *
+ * This file is deliberately pure — no axios, no commander, no I/O — so
+ * every branch has a unit test in src/__tests__/error-codes.test.ts.
+ * Callers:
+ *   - src/lib/api-client.ts  (handleApiError) — enriches ApiError with code/hint
+ *   - src/lib/command-kit.ts (run catch)      — emits JSON envelope under --json
+ *
+ * The enum is closed so TypeScript can exhaustive-switch on it.
+ */
+/** Fixed vocabulary of error codes the CLI can surface. */
+export type ErrorCode = 'AUTH_REQUIRED' | 'FORBIDDEN' | 'FEATURE_GATED' | 'SCOPE_MISSING' | 'NOT_FOUND' | 'VALIDATION_FAILED' | 'CONFLICT' | 'RATE_LIMITED' | 'SERVER_ERROR' | 'NETWORK_ERROR' | 'TIMEOUT' | 'DRY_RUN_BLOCKED';
+export declare const ERROR_CODES: ErrorCode[];
+/** Extra structured details paired with the code. */
+export interface ClassifiedError {
+    code: ErrorCode;
+    /** Short actionable next step — e.g. "Run: solid auth login". */
+    hint?: string;
+    /** Link into docs where relevant. */
+    docs_url?: string;
+    /** Populated for SCOPE_MISSING. */
+    scope?: string;
+    /** Populated for FEATURE_GATED. */
+    feature?: string;
+    /** Populated for FEATURE_GATED — tier the user must upgrade to. */
+    upgrade_to?: string;
+    /** X-Request-ID echoed back for cross-service correlation. */
+    request_id?: string;
+}
+export interface ClassifyInput {
+    /** HTTP status; 0 when there was no response (network / timeout). */
+    status: number;
+    /** Parsed response body (may be anything). */
+    data?: unknown;
+    /** axios `error.code` — ECONNABORTED, ECONNREFUSED, ETIMEDOUT, etc. */
+    networkErrorCode?: string;
+    /** X-Request-ID pulled off the response headers, if any. */
+    requestId?: string;
+}
+/**
+ * Extract a scope name from the backend's prose 403 message.
+ * Backend shape today: `detail: "Missing scope: agents:read"`.
+ * Returns undefined if the pattern doesn't match.
+ */
+export declare function extractScopeFromDetail(detail: unknown): string | undefined;
+/**
+ * Normalize varied backend error payloads to a single ErrorCode + metadata.
+ * Pure: input → output, no side effects.
+ */
+export declare function classifyError(input: ClassifyInput): ClassifiedError;
+/**
+ * Build the JSON envelope emitted under --json when SOLID_JSON_V2=1.
+ * Separate from ClassifiedError so the exact wire shape is locked in one
+ * place — agent clients depend on this being stable.
+ */
+export interface ErrorEnvelope {
+    error: {
+        code: ErrorCode;
+        status: number;
+        message: string;
+        scope?: string;
+        feature?: string;
+        upgrade_to?: string;
+        hint?: string;
+        docs_url?: string;
+        request_id?: string;
+    };
+}
+export declare function toErrorEnvelope(classified: ClassifiedError, status: number, message: string): ErrorEnvelope;
+/**
+ * True when the caller has opted into structured JSON errors (Sprint 1 T1.7
+ * two-step rollout). Default behavior stays legacy-prose until a later minor
+ * flips this on unconditionally.
+ */
+export declare function jsonErrorEnvelopeEnabled(): boolean;
+//# sourceMappingURL=error-codes.d.ts.map

package/dist/lib/error-codes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error-codes.d.ts","sourceRoot":"","sources":["../../src/lib/error-codes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,2DAA2D;AAC3D,MAAM,MAAM,SAAS,GACjB,eAAe,GACf,WAAW,GACX,eAAe,GACf,eAAe,GACf,WAAW,GACX,mBAAmB,GACnB,UAAU,GACV,cAAc,GACd,cAAc,GACd,eAAe,GACf,SAAS,GACT,iBAAiB,CAAC;AAEtB,eAAO,MAAM,WAAW,EAAE,SAAS,EAalC,CAAC;AAEF,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,iEAAiE;IACjE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,qEAAqE;IACrE,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAWD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAI1E;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe,CAkGnE;AAoBD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE;QACL,IAAI,EAAE,SAAS,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAgB,eAAe,CAC7B,UAAU,EAAE,eAAe,EAC3B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,aAAa,CAaf;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAGlD"}

package/dist/lib/error-codes.js

@@ -0,0 +1,166 @@
+"use strict";
+/**
+ * Structured error classification (Sprint 1 — T1.1).
+ *
+ * Takes the raw pieces of an axios failure (status, body, network code)
+ * and returns a stable {code, hint, scope, ...} envelope that agents can
+ * branch on deterministically instead of regex-matching prose messages.
+ *
+ * This file is deliberately pure — no axios, no commander, no I/O — so
+ * every branch has a unit test in src/__tests__/error-codes.test.ts.
+ * Callers:
+ *   - src/lib/api-client.ts  (handleApiError) — enriches ApiError with code/hint
+ *   - src/lib/command-kit.ts (run catch)      — emits JSON envelope under --json
+ *
+ * The enum is closed so TypeScript can exhaustive-switch on it.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ERROR_CODES = void 0;
+exports.extractScopeFromDetail = extractScopeFromDetail;
+exports.classifyError = classifyError;
+exports.toErrorEnvelope = toErrorEnvelope;
+exports.jsonErrorEnvelopeEnabled = jsonErrorEnvelopeEnabled;
+exports.ERROR_CODES = [
+    'AUTH_REQUIRED',
+    'FORBIDDEN',
+    'FEATURE_GATED',
+    'SCOPE_MISSING',
+    'NOT_FOUND',
+    'VALIDATION_FAILED',
+    'CONFLICT',
+    'RATE_LIMITED',
+    'SERVER_ERROR',
+    'NETWORK_ERROR',
+    'TIMEOUT',
+    'DRY_RUN_BLOCKED',
+];
+function asRecord(v) {
+    return v && typeof v === 'object' ? v : {};
+}
+function pickString(obj, key) {
+    const v = obj[key];
+    return typeof v === 'string' && v.length > 0 ? v : undefined;
+}
+/**
+ * Extract a scope name from the backend's prose 403 message.
+ * Backend shape today: `detail: "Missing scope: agents:read"`.
+ * Returns undefined if the pattern doesn't match.
+ */
+function extractScopeFromDetail(detail) {
+    if (typeof detail !== 'string')
+        return undefined;
+    const m = detail.match(/Missing scope[:\s]+([a-z0-9_:\-*]+)/i);
+    return m ? m[1] : undefined;
+}
+/**
+ * Normalize varied backend error payloads to a single ErrorCode + metadata.
+ * Pure: input → output, no side effects.
+ */
+function classifyError(input) {
+    const { status, data, networkErrorCode, requestId } = input;
+    const body = asRecord(data);
+    const serverCode = pickString(body, 'code');
+    const serverError = asRecord(body.error);
+    const errEnvCode = pickString(serverError, 'code');
+    // Prefer the server's own `error.code` when it matches our vocabulary
+    // (backend middleware like MCPRateLimitMiddleware uses RATE_LIMITED).
+    const preferred = (errEnvCode || serverCode);
+    if (preferred && exports.ERROR_CODES.includes(preferred)) {
+        return withRequestId({ code: preferred, ...extractEnvelopeExtras(serverError, body) }, requestId);
+    }
+    // No HTTP response → network layer
+    if (!status || status === 0) {
+        if (networkErrorCode === 'ECONNABORTED' || networkErrorCode === 'ETIMEDOUT') {
+            return withRequestId({ code: 'TIMEOUT', hint: 'Try --timeout=60, or run: solid health' }, requestId);
+        }
+        return withRequestId({ code: 'NETWORK_ERROR', hint: 'Check network, or run: solid health' }, requestId);
+    }
+    switch (true) {
+        case status === 401:
+            return withRequestId({ code: 'AUTH_REQUIRED', hint: 'Run: solid auth login (or set SOLID_TOKEN)' }, requestId);
+        case status === 403: {
+            // FEATURE_GATED signal comes as `data.code === 'FEATURE_GATED'` at the
+            // top level today.
+            if (serverCode === 'FEATURE_GATED') {
+                return withRequestId({
+                    code: 'FEATURE_GATED',
+                    feature: pickString(body, 'feature'),
+                    upgrade_to: pickString(body, 'upgrade_to'),
+                    hint: 'Run: solid whoami --features  ·  Upgrade: solid upgrade',
+                }, requestId);
+            }
+            // Scope-missing: extract from prose `detail: "Missing scope: X"`.
+            const detailStr = pickString(body, 'detail') ?? pickString(body, 'message');
+            const scope = extractScopeFromDetail(detailStr);
+            if (scope) {
+                return withRequestId({
+                    code: 'SCOPE_MISSING',
+                    scope,
+                    hint: `Rotate your key with scope ${scope}: solid keys rotate --add-scope ${scope}`,
+                }, requestId);
+            }
+            return withRequestId({
+                code: 'FORBIDDEN',
+                hint: 'Check your tier: solid whoami --features',
+            }, requestId);
+        }
+        case status === 404:
+            return withRequestId({ code: 'NOT_FOUND' }, requestId);
+        case status === 409:
+            return withRequestId({ code: 'CONFLICT' }, requestId);
+        case status === 422:
+            return withRequestId({ code: 'VALIDATION_FAILED', hint: 'Run with --help to see required flags' }, requestId);
+        case status === 429:
+            return withRequestId({ code: 'RATE_LIMITED', hint: 'Slow down or run with --timeout=60' }, requestId);
+        case status >= 500 && status < 600:
+            return withRequestId({ code: 'SERVER_ERROR', hint: 'Try again, or run: solid health' }, requestId);
+        default:
+            return withRequestId({ code: 'SERVER_ERROR' }, requestId);
+    }
+}
+function extractEnvelopeExtras(serverError, body) {
+    const out = {};
+    const scope = pickString(serverError, 'scope') ?? pickString(body, 'scope');
+    if (scope)
+        out.scope = scope;
+    const feature = pickString(serverError, 'feature') ?? pickString(body, 'feature');
+    if (feature)
+        out.feature = feature;
+    const upgrade = pickString(serverError, 'upgrade_to') ?? pickString(body, 'upgrade_to');
+    if (upgrade)
+        out.upgrade_to = upgrade;
+    return out;
+}
+function withRequestId(c, requestId) {
+    return requestId ? { ...c, request_id: requestId } : c;
+}
+function toErrorEnvelope(classified, status, message) {
+    const envelope = {
+        code: classified.code,
+        status: Number(status) || 0,
+        message,
+    };
+    if (classified.scope)
+        envelope.scope = classified.scope;
+    if (classified.feature)
+        envelope.feature = classified.feature;
+    if (classified.upgrade_to)
+        envelope.upgrade_to = classified.upgrade_to;
+    if (classified.hint)
+        envelope.hint = classified.hint;
+    if (classified.docs_url)
+        envelope.docs_url = classified.docs_url;
+    if (classified.request_id)
+        envelope.request_id = classified.request_id;
+    return { error: envelope };
+}
+/**
+ * True when the caller has opted into structured JSON errors (Sprint 1 T1.7
+ * two-step rollout). Default behavior stays legacy-prose until a later minor
+ * flips this on unconditionally.
+ */
+function jsonErrorEnvelopeEnabled() {
+    const v = process.env.SOLID_JSON_V2;
+    return typeof v === 'string' && /^(1|true|yes|on)$/i.test(v);
+}
+//# sourceMappingURL=error-codes.js.map

package/dist/lib/error-codes.js.map

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

package/dist/lib/list-envelope.d.ts

@@ -0,0 +1,67 @@
+/**
+ * List-envelope normalization (Sprint 1 T1.4).
+ *
+ * Backend list endpoints return an inconsistent bag of keys:
+ *   { pages: [...], total: N }
+ *   { results: [...] }
+ *   { logs: [...], has_more: true }
+ *   { agents: [...] }
+ *   { api_keys: [...] }
+ *   { items: [...] }
+ *   ...
+ *
+ * That's fine for humans but forces agents to write `d.pages || d.items
+ * || d.results || d.logs || ...` fallbacks before they can loop. This
+ * module adds a stable `.items` alias + `total / page / has_more`
+ * siblings on every response whose body looks like a list envelope.
+ * Original keys are preserved so existing callers never break.
+ *
+ * Pure — no HTTP, no axios. Wired into the response interceptor in
+ * api-client.ts; unit-tested with synthetic inputs.
+ *
+ * Opt-out: `SOLID_LEGACY_LIST_SHAPES=1` disables normalization for one
+ * minor release while consumers migrate (per T1.7 two-step rollout).
+ */
+/**
+ * Keys backend responses use to expose a list of rows, in preference
+ * order. The FIRST key found on the response body whose value is an
+ * array is promoted to `.items`. Order matters: when multiple keys
+ * coexist (rare), the earlier one wins.
+ */
+export declare const KNOWN_LIST_KEYS: readonly string[];
+export interface NormalizedEnvelope {
+    items: unknown[];
+    total: number | null;
+    page: number | string | null;
+    has_more: boolean | null;
+    /** Which source key the alias came from ("items" when already canonical). */
+    _source_key: string | null;
+}
+/** Truthy values for the SOLID_LEGACY_LIST_SHAPES opt-out. */
+export declare function legacyListShapesEnabled(env?: NodeJS.ProcessEnv): boolean;
+/**
+ * Detect which known list key (if any) holds the array payload.
+ * Returns null when the body is not shaped like a list response.
+ * Pure.
+ */
+export declare function detectListKey(body: unknown, knownKeys?: readonly string[]): string | null;
+/**
+ * Produce a canonical {items, total, page, has_more} view of a list
+ * response. Returns null when the body isn't a list envelope, so callers
+ * can short-circuit without mutating.
+ */
+export declare function normalizeListEnvelope(body: unknown): NormalizedEnvelope | null;
+/**
+ * Apply the normalization in-place on a response body, adding the
+ * aliased keys without removing existing ones. Returns the body back
+ * for easy chaining in the axios response interceptor.
+ *
+ * No-op when:
+ *  - body is not a list envelope
+ *  - body already has `items` (then we just ensure `total` is present)
+ *  - SOLID_LEGACY_LIST_SHAPES is truthy
+ *
+ * Pure wrt env: caller can pass its own env map for tests.
+ */
+export declare function applyListEnvelope<T>(body: T, env?: NodeJS.ProcessEnv): T;
+//# sourceMappingURL=list-envelope.d.ts.map

package/dist/lib/list-envelope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-envelope.d.ts","sourceRoot":"","sources":["../../src/lib/list-envelope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;GAKG;AACH,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EA4B5C,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,6EAA6E;IAC7E,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,8DAA8D;AAC9D,wBAAgB,uBAAuB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAGxE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,SAAS,MAAM,EAAoB,GAC7C,MAAM,GAAG,IAAI,CAOf;AAsBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,kBAAkB,GAAG,IAAI,CAuB9E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,IAAI,EAAE,CAAC,EACP,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,CAAC,CAoBH"}

package/dist/lib/list-envelope.js

@@ -0,0 +1,170 @@
+"use strict";
+/**
+ * List-envelope normalization (Sprint 1 T1.4).
+ *
+ * Backend list endpoints return an inconsistent bag of keys:
+ *   { pages: [...], total: N }
+ *   { results: [...] }
+ *   { logs: [...], has_more: true }
+ *   { agents: [...] }
+ *   { api_keys: [...] }
+ *   { items: [...] }
+ *   ...
+ *
+ * That's fine for humans but forces agents to write `d.pages || d.items
+ * || d.results || d.logs || ...` fallbacks before they can loop. This
+ * module adds a stable `.items` alias + `total / page / has_more`
+ * siblings on every response whose body looks like a list envelope.
+ * Original keys are preserved so existing callers never break.
+ *
+ * Pure — no HTTP, no axios. Wired into the response interceptor in
+ * api-client.ts; unit-tested with synthetic inputs.
+ *
+ * Opt-out: `SOLID_LEGACY_LIST_SHAPES=1` disables normalization for one
+ * minor release while consumers migrate (per T1.7 two-step rollout).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KNOWN_LIST_KEYS = void 0;
+exports.legacyListShapesEnabled = legacyListShapesEnabled;
+exports.detectListKey = detectListKey;
+exports.normalizeListEnvelope = normalizeListEnvelope;
+exports.applyListEnvelope = applyListEnvelope;
+/**
+ * Keys backend responses use to expose a list of rows, in preference
+ * order. The FIRST key found on the response body whose value is an
+ * array is promoted to `.items`. Order matters: when multiple keys
+ * coexist (rare), the earlier one wins.
+ */
+exports.KNOWN_LIST_KEYS = [
+    // Already canonical — nothing to alias.
+    'items',
+    // CMS / CRM / commerce
+    'pages',
+    'results',
+    'leads',
+    'agents',
+    'templates',
+    'companies',
+    'sites',
+    'api_keys',
+    'logs',
+    'rows',
+    'records',
+    'entries',
+    'products',
+    'services',
+    'contacts',
+    'customers',
+    'orders',
+    'invoices',
+    'transactions',
+    'webhooks',
+    'chains',
+    'flows',
+    'modules',
+    'domains',
+];
+/** Truthy values for the SOLID_LEGACY_LIST_SHAPES opt-out. */
+function legacyListShapesEnabled(env) {
+    const v = (env ?? process.env).SOLID_LEGACY_LIST_SHAPES;
+    return typeof v === 'string' && /^(1|true|yes|on)$/i.test(v);
+}
+/**
+ * Detect which known list key (if any) holds the array payload.
+ * Returns null when the body is not shaped like a list response.
+ * Pure.
+ */
+function detectListKey(body, knownKeys = exports.KNOWN_LIST_KEYS) {
+    if (!body || typeof body !== 'object' || Array.isArray(body))
+        return null;
+    const record = body;
+    for (const k of knownKeys) {
+        if (Array.isArray(record[k]))
+            return k;
+    }
+    return null;
+}
+function safeNumber(v) {
+    if (typeof v === 'number' && Number.isFinite(v))
+        return v;
+    if (typeof v === 'string' && v.trim() !== '' && !Number.isNaN(Number(v))) {
+        return Number(v);
+    }
+    return null;
+}
+function safePage(v) {
+    if (v == null)
+        return null;
+    if (typeof v === 'number' && Number.isFinite(v))
+        return v;
+    if (typeof v === 'string' && v.trim() !== '')
+        return v;
+    return null;
+}
+function safeBool(v) {
+    if (typeof v === 'boolean')
+        return v;
+    return null;
+}
+/**
+ * Produce a canonical {items, total, page, has_more} view of a list
+ * response. Returns null when the body isn't a list envelope, so callers
+ * can short-circuit without mutating.
+ */
+function normalizeListEnvelope(body) {
+    const key = detectListKey(body);
+    if (!key)
+        return null;
+    const record = body;
+    const items = record[key] ?? [];
+    const total = safeNumber(record.total) ??
+        safeNumber(record.count) ??
+        items.length;
+    const page = safePage(record.page) ??
+        safePage(record.cursor) ??
+        safePage(record.next_cursor) ??
+        null;
+    const has_more = safeBool(record.has_more) ?? safeBool(record.hasMore) ?? null;
+    return {
+        items,
+        total,
+        page,
+        has_more,
+        _source_key: key,
+    };
+}
+/**
+ * Apply the normalization in-place on a response body, adding the
+ * aliased keys without removing existing ones. Returns the body back
+ * for easy chaining in the axios response interceptor.
+ *
+ * No-op when:
+ *  - body is not a list envelope
+ *  - body already has `items` (then we just ensure `total` is present)
+ *  - SOLID_LEGACY_LIST_SHAPES is truthy
+ *
+ * Pure wrt env: caller can pass its own env map for tests.
+ */
+function applyListEnvelope(body, env) {
+    if (legacyListShapesEnabled(env))
+        return body;
+    const normalized = normalizeListEnvelope(body);
+    if (!normalized)
+        return body;
+    const record = body;
+    // Only fill in what's missing; never clobber a caller-supplied field.
+    if (!('items' in record) || record.items === undefined) {
+        record.items = normalized.items;
+    }
+    if (!('total' in record) || record.total === undefined || record.total === null) {
+        record.total = normalized.total;
+    }
+    if (!('page' in record) || record.page === undefined) {
+        record.page = normalized.page;
+    }
+    if (!('has_more' in record) || record.has_more === undefined) {
+        record.has_more = normalized.has_more;
+    }
+    return body;
+}
+//# sourceMappingURL=list-envelope.js.map

package/dist/lib/list-envelope.js.map

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

package/dist/lib/mcp-client-config.d.ts

@@ -0,0 +1,57 @@
+export type McpClient = 'claude' | 'cursor' | 'windsurf';
+export declare const SUPPORTED_CLIENTS: McpClient[];
+/** Returns true if the string is a known supported client. */
+export declare function isSupportedClient(value: string | undefined | null): value is McpClient;
+export interface ServerEntry {
+    command: string;
+    args: string[];
+    env?: Record<string, string>;
+}
+export interface McpConfigFile {
+    mcpServers?: Record<string, ServerEntry>;
+    [k: string]: unknown;
+}
+/**
+ * Per-OS default path for each supported client. Returns the path
+ * relative to `homeDir` so callers can pass their own for testing.
+ */
+export declare function configPathForClient(client: McpClient, opts?: {
+    platform?: NodeJS.Platform;
+    homeDir?: string;
+}): string;
+export interface BuildEntryInput {
+    /** API key or token the MCP server will use to call the backend. */
+    apiKey?: string;
+    /** Base URL for the backend. Defaults to api.solidnumber.com. */
+    apiUrl?: string;
+    /** Npm package to invoke via npx. Defaults to @solidnumber/mcp. */
+    packageName?: string;
+    /** Optional extra env vars (merged in). */
+    extraEnv?: Record<string, string>;
+    /** Company-id pin (adds X-Company-Id via SOLID_COMPANY_ID env). */
+    companyId?: number | string;
+}
+/** Default package that ships the stdio MCP server. */
+export declare const DEFAULT_MCP_PACKAGE = "@solidnumber/mcp";
+/**
+ * Build the `mcpServers.solid` entry. Pure — no I/O, no env reads.
+ */
+export declare function buildServerEntry(input?: BuildEntryInput): ServerEntry;
+/**
+ * Merge a new `solid` server entry into an existing config file.
+ * Preserves any other mcpServers keys and any top-level keys we don't
+ * recognize. Returns a NEW object — input is not mutated.
+ */
+export declare function mergeIntoConfig(existing: McpConfigFile | null | undefined, entry: ServerEntry, serverKey?: string): McpConfigFile;
+/**
+ * Remove the `solid` entry from a config, preserving other keys.
+ * Returns the NEW config (unmutated input). When only `solid` existed
+ * in mcpServers, keeps an empty `mcpServers: {}` to be explicit.
+ */
+export declare function removeFromConfig(existing: McpConfigFile | null | undefined, serverKey?: string): McpConfigFile;
+/**
+ * Pretty-print a config with stable key order + 2-space indent. Writes
+ * this string is the caller's responsibility.
+ */
+export declare function serializeConfig(cfg: McpConfigFile): string;
+//# sourceMappingURL=mcp-client-config.d.ts.map

package/dist/lib/mcp-client-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-client-config.d.ts","sourceRoot":"","sources":["../../src/lib/mcp-client-config.ts"],"names":[],"mappings":"AAwBA,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEzD,eAAO,MAAM,iBAAiB,EAAE,SAAS,EAAqC,CAAC;AAE/E,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK,IAAI,SAAS,CAEtF;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAEzC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1D,MAAM,CAiCR;AAED,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,mEAAmE;IACnE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAED,uDAAuD;AACvD,eAAO,MAAM,mBAAmB,qBAAqB,CAAC;AAEtD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,GAAE,eAAoB,GAAG,WAAW,CAkBzE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,EAC1C,KAAK,EAAE,WAAW,EAClB,SAAS,GAAE,MAAgB,GAC1B,aAAa,CAMf;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,EAC1C,SAAS,GAAE,MAAgB,GAC1B,aAAa,CAOf;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAE1D"}