@x-code-cli/core 0.1.7 → 0.1.9

package/dist/knowledge/session-usage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-usage.js","sourceRoot":"","sources":["../../src/knowledge/session-usage.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAC1D,EAAE;AACF,6EAA6E;AAC7E,4EAA4E;AAC5E,6EAA6E;AAC7E,kEAAkE;AAClE,EAAE;AACF,+EAA+E;AAC/E,yEAAyE;AACzE,4CAA4C;AAC5C,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAI5B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAWvC,MAAM,YAAY,GAAG,GAAG,SAAS,WAAW,CAAA;AAE5C,SAAS,cAAc;IACrB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAA;AAC/C,CAAC;AAED,SAAS,YAAY,CAAC,SAAiB;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,GAAG,SAAS,aAAa,CAAC,CAAA;AAC/D,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,mBAAmB,CAAC,CAAA;AACzD,CAAC;AAED;;mCAEmC;AACnC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,KAAgB,EAAE,OAAe;IAC1E,MAAM,QAAQ,GAAyB;QACrC,EAAE,EAAE,KAAK,CAAC,SAAS;QACnB,OAAO;QACP,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE;KAC/B,CAAA;IACD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAC9C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC;YAC1D,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC;SAClD,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,uEAAuE;IACzE,CAAC;AACH,CAAC;AAED;;8DAE8D;AAC9D,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC3C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAA;QAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED;;;uEAGuE;AACvE,MAAM,CAAC,KAAK,UAAU,yBAAyB;IAC7C,IAAI,OAAiB,CAAA;IACrB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,mBAAmB,CAAC,CAAA;IAChG,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACzB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAA;QAChD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IACD,OAAO,SAAS;SACb,MAAM,CAAC,CAAC,CAAC,EAA6B,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;SACpD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;AAC3D,CAAC"}

package/dist/providers/cache-control.d.ts

@@ -0,0 +1,29 @@
+import type { ModelMessage } from 'ai';
+export interface CacheControlArgs {
+    /** System prompt string. May be wrapped into a system-role message if the
+     *  provider needs cache_control attached to it. */
+    system: string;
+    /** Conversation messages to send. */
+    messages: ModelMessage[];
+    /** provider:model id used to select the caching strategy. */
+    modelId: string;
+    /** Stable per-session key. Used by OpenAI's `promptCacheKey` to pin
+     *  identical prefixes to the same cache shard. */
+    sessionId: string;
+}
+export interface CacheControlResult {
+    /** Possibly-undefined: for Anthropic we fold the system prompt into the
+     *  messages array to attach cache_control; in that case streamText must be
+     *  called without a separate `system` param. */
+    system?: string;
+    messages: ModelMessage[];
+    /** Top-level providerOptions to pass through to streamText. */
+    providerOptions?: Record<string, unknown>;
+}
+/**
+ * Return the request shape enriched with provider-specific caching hints.
+ * The input `messages` array is not mutated — new message objects are
+ * returned for any message that needs extra providerOptions.
+ */
+export declare function applyCacheControl(args: CacheControlArgs): CacheControlResult;
+//# sourceMappingURL=cache-control.d.ts.map

package/dist/providers/cache-control.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-control.d.ts","sourceRoot":"","sources":["../../src/providers/cache-control.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AAWtC,MAAM,WAAW,gBAAgB;IAC/B;uDACmD;IACnD,MAAM,EAAE,MAAM,CAAA;IACd,qCAAqC;IACrC,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAA;IACf;sDACkD;IAClD,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC;;oDAEgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB,+DAA+D;IAC/D,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC1C;AA6BD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,kBAAkB,CAkC5E"}

package/dist/providers/cache-control.js

@@ -0,0 +1,93 @@
+// @x-code-cli/core — Per-provider prompt caching
+//
+// Prompt caching is the single biggest lever on per-session cost. All current
+// providers offer it, but the activation protocol differs:
+//
+//   Anthropic   — set `cacheControl: { type: 'ephemeral' }` on the SYSTEM
+//                 message and the LAST two non-system messages (three
+//                 breakpoints total, under the API's limit of four). The
+//                 content at each breakpoint is cached server-side with a
+//                 5-minute TTL; subsequent requests that share the exact
+//                 prefix hit the cache and only pay for the uncached tail.
+//
+//   OpenAI      — automatic prefix caching, but setting `promptCacheKey`
+//                 (routes identical keys to the same cache shard) and `store`
+//                 (retains the call for later fetching) improves hit rates.
+//                 We send the sessionId as the key so every turn in a
+//                 conversation maps to the same shard.
+//
+//   OpenAI-     — the DeepSeek / Moonshot / Alibaba / Zhipu / xAI / custom
+//   compatible    providers all offer automatic prefix caching with NO
+//                 explicit flags required. The only prerequisite is a
+//                 byte-stable prefix across turns: if the system prompt
+//                 rebuilds with a fresh timestamp every turn, every request
+//                 misses the cache. We therefore cache the system prompt
+//                 once per session in LoopState (see loop-state.ts) and use
+//                 the same string on every subsequent turn.
+//
+//   Google      — Gemini uses implicit caching; no per-request flags we can
+//                 usefully set from the SDK. Left as a no-op.
+import { providerOf } from './capabilities.js';
+/** Max messages we attach an Anthropic cache breakpoint to. Anthropic allows
+ *  up to 4 `cache_control` blocks per request; we spend one on the system
+ *  prompt, leaving three for the message tail. Two is the sweet spot from
+ *  opencode's testing — a third breakpoint costs a cache-write against a
+ *  region (the just-before-last message) that's about to be evicted anyway. */
+const MESSAGE_CACHE_BREAKPOINTS = 2;
+/** Attach the given providerOptions entry to a message non-destructively. */
+function tagMessage(msg, provider, entry) {
+    const existing = msg.providerOptions ?? {};
+    return {
+        ...msg,
+        providerOptions: {
+            ...existing,
+            [provider]: { ...(existing[provider] ?? {}), ...entry },
+        },
+    };
+}
+/** Build a system-role message with Anthropic cache_control attached. */
+function anthropicSystemMessage(system) {
+    return {
+        role: 'system',
+        content: system,
+        providerOptions: {
+            anthropic: { cacheControl: { type: 'ephemeral' } },
+        },
+    };
+}
+/**
+ * Return the request shape enriched with provider-specific caching hints.
+ * The input `messages` array is not mutated — new message objects are
+ * returned for any message that needs extra providerOptions.
+ */
+export function applyCacheControl(args) {
+    const provider = providerOf(args.modelId);
+    if (provider === 'anthropic') {
+        // Fold system into messages so we can attach cache_control to it, then
+        // mark the last N non-system messages as additional breakpoints.
+        const nonSystemTail = args.messages.slice(-MESSAGE_CACHE_BREAKPOINTS);
+        const tailSet = new Set(nonSystemTail);
+        const tagged = args.messages.map((m) => tailSet.has(m) ? tagMessage(m, 'anthropic', { cacheControl: { type: 'ephemeral' } }) : m);
+        return {
+            system: undefined,
+            messages: [anthropicSystemMessage(args.system), ...tagged],
+        };
+    }
+    if (provider === 'openai') {
+        // store:false — we don't need the stored-call bookkeeping (retrieval via
+        // API), but the promptCacheKey still routes identical prefixes to the
+        // same cache shard which is the actual cost win.
+        return {
+            system: args.system,
+            messages: args.messages,
+            providerOptions: {
+                openai: { promptCacheKey: args.sessionId, store: false },
+            },
+        };
+    }
+    // OpenAI-compatible & Gemini: no explicit flags, just rely on stable prefix.
+    // Callers must ensure buildSystemPrompt is cached in LoopState so the same
+    // system string is re-sent every turn.
+    return { system: args.system, messages: args.messages };
+}
+//# sourceMappingURL=cache-control.js.map

package/dist/providers/cache-control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-control.js","sourceRoot":"","sources":["../../src/providers/cache-control.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,EAAE;AACF,8EAA8E;AAC9E,2DAA2D;AAC3D,EAAE;AACF,0EAA0E;AAC1E,sEAAsE;AACtE,yEAAyE;AACzE,0EAA0E;AAC1E,yEAAyE;AACzE,2EAA2E;AAC3E,EAAE;AACF,yEAAyE;AACzE,8EAA8E;AAC9E,4EAA4E;AAC5E,sEAAsE;AACtE,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,uEAAuE;AACvE,sEAAsE;AACtE,wEAAwE;AACxE,4EAA4E;AAC5E,yEAAyE;AACzE,4EAA4E;AAC5E,4DAA4D;AAC5D,EAAE;AACF,4EAA4E;AAC5E,8DAA8D;AAI9D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C;;;;+EAI+E;AAC/E,MAAM,yBAAyB,GAAG,CAAC,CAAA;AAyBnC,6EAA6E;AAC7E,SAAS,UAAU,CACjB,GAAiB,EACjB,QAAgB,EAChB,KAA8B;IAE9B,MAAM,QAAQ,GAAI,GAAqE,CAAC,eAAe,IAAI,EAAE,CAAA;IAC7G,OAAO;QACL,GAAG,GAAG;QACN,eAAe,EAAE;YACf,GAAG,QAAQ;YACX,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE;SACxD;KACc,CAAA;AACnB,CAAC;AAED,yEAAyE;AACzE,SAAS,sBAAsB,CAAC,MAAc;IAC5C,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,MAAM;QACf,eAAe,EAAE;YACf,SAAS,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE;SACnD;KACyB,CAAA;AAC9B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAsB;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEzC,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC7B,uEAAuE;QACvE,iEAAiE;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,yBAAyB,CAAC,CAAA;QACrE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CACzF,CAAA;QACD,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC;SAC3D,CAAA;IACH,CAAC;IAED,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,yEAAyE;QACzE,sEAAsE;QACtE,iDAAiD;QACjD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,eAAe,EAAE;gBACf,MAAM,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE;aACzD;SACF,CAAA;IACH,CAAC;IAED,6EAA6E;IAC7E,2EAA2E;IAC3E,uCAAuC;IACvC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAA;AACzD,CAAC"}

package/dist/providers/capabilities.d.ts

@@ -0,0 +1,15 @@
+export interface ProviderCapabilities {
+    /** Provider can receive inline image parts (base64 or URL) in user messages. */
+    image: boolean;
+    /** Provider can receive inline PDF file parts. */
+    pdf: boolean;
+    /** Provider has a dedicated /files upload endpoint (file_id references). */
+    filesApi: boolean;
+}
+/** Extract `provider` from a `provider:model` id. Returns `unknown` if the
+ *  separator is missing (defensive — shouldn't happen with resolved ids). */
+export declare function providerOf(modelId: string): string;
+/** Look up capabilities for a model id. Unknown providers default to text-only
+ *  — safer than assuming vision support. */
+export declare function capabilitiesOf(modelId: string): ProviderCapabilities;
+//# sourceMappingURL=capabilities.d.ts.map

package/dist/providers/capabilities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../src/providers/capabilities.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,oBAAoB;IACnC,gFAAgF;IAChF,KAAK,EAAE,OAAO,CAAA;IACd,kDAAkD;IAClD,GAAG,EAAE,OAAO,CAAA;IACZ,4EAA4E;IAC5E,QAAQ,EAAE,OAAO,CAAA;CAClB;AAiBD;6EAC6E;AAC7E,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED;4CAC4C;AAC5C,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAEpE"}

package/dist/providers/capabilities.js

@@ -0,0 +1,38 @@
+// @x-code-cli/core — Provider multi-modal capability table
+//
+// Declares whether each provider's API can natively accept image / pdf
+// content parts in user messages and tool results. Used by the file-ingest
+// pipeline (to decide inline-vs-OCR) and provider-compat (to strip binary
+// parts before sending to providers that would reject them).
+//
+// Provider-level, not model-level. Some providers (alibaba, zhipu) have
+// separate vision-only model ids — users who pick a text-only Qwen/GLM
+// variant and paste an image will still get API errors. That's a deliberate
+// simplification: model-level capability tracking would require per-id
+// tables that go stale quickly.
+const CAPS = {
+    anthropic: { image: true, pdf: true, filesApi: true },
+    openai: { image: true, pdf: true, filesApi: true },
+    google: { image: true, pdf: true, filesApi: true },
+    xai: { image: true, pdf: true, filesApi: true },
+    moonshotai: { image: true, pdf: true, filesApi: true },
+    alibaba: { image: true, pdf: true, filesApi: true },
+    zhipu: { image: true, pdf: true, filesApi: true },
+    deepseek: { image: false, pdf: false, filesApi: false },
+    // Custom OpenAI-compatible endpoints are conservative-by-default —
+    // users who know their endpoint supports vision can override via env
+    // (X_CODE_CUSTOM_SUPPORTS_IMAGE=1) if we ever add that.
+    custom: { image: false, pdf: false, filesApi: false },
+};
+/** Extract `provider` from a `provider:model` id. Returns `unknown` if the
+ *  separator is missing (defensive — shouldn't happen with resolved ids). */
+export function providerOf(modelId) {
+    const idx = modelId.indexOf(':');
+    return idx > 0 ? modelId.slice(0, idx) : 'unknown';
+}
+/** Look up capabilities for a model id. Unknown providers default to text-only
+ *  — safer than assuming vision support. */
+export function capabilitiesOf(modelId) {
+    return CAPS[providerOf(modelId)] ?? { image: false, pdf: false, filesApi: false };
+}
+//# sourceMappingURL=capabilities.js.map

package/dist/providers/capabilities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../src/providers/capabilities.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,EAAE;AACF,uEAAuE;AACvE,2EAA2E;AAC3E,0EAA0E;AAC1E,6DAA6D;AAC7D,EAAE;AACF,wEAAwE;AACxE,uEAAuE;AACvE,4EAA4E;AAC5E,uEAAuE;AACvE,gCAAgC;AAWhC,MAAM,IAAI,GAAyC;IACjD,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IACrD,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IAClD,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IAClD,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC/C,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtD,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IACnD,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IACjD,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;IACvD,mEAAmE;IACnE,qEAAqE;IACrE,wDAAwD;IACxD,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;CACtD,CAAA;AAED;6EAC6E;AAC7E,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAChC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACpD,CAAC;AAED;4CAC4C;AAC5C,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;AACnF,CAAC"}

package/dist/tools/index.d.ts

@@ -14,7 +14,35 @@ export declare const toolRegistry: {
         filePath: string;
         offset?: number | undefined;
         limit?: number | undefined;
-    }, string>;
+    }, string | {
+        type: string;
+        value: ({
+            type: string;
+            text: string;
+            data?: undefined;
+            mediaType?: undefined;
+        } | {
+            type: string;
+            data: string;
+            mediaType: string;
+            text?: undefined;
+        })[];
+    } | {
+        type: string;
+        value: ({
+            type: string;
+            text: string;
+            data?: undefined;
+            mediaType?: undefined;
+            filename?: undefined;
+        } | {
+            type: string;
+            data: string;
+            mediaType: string;
+            filename: string;
+            text?: undefined;
+        })[];
+    }>;
     writeFile: import("ai").Tool<{
         filePath: string;
         content: string;
@@ -66,8 +94,6 @@ export declare const toolRegistry: {
     }, string>;
 };
 export { readFile, writeFile, edit, shell, glob, grep, listDir, webSearch, webFetch, askUser, saveKnowledge, };
-/** Max characters for tool results before truncation */
-export declare const MAX_TOOL_RESULT_CHARS = 30000;
-/** Truncate tool result, keeping head and tail */
-export declare function truncateToolResult(result: string): string;
+export { MAX_TOOL_RESULT_LINES, MAX_TOOL_RESULT_BYTES, MAX_AGGREGATE_TOOL_RESULT_BYTES, truncateToolResult, } from './truncate.js';
+export type { TruncateOptions } from './truncate.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/tools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAYxB,CAAA;AAED,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,OAAO,EACP,aAAa,GACd,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,qBAAqB,QAAQ,CAAA;AAE1C,kDAAkD;AAClD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKzD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAYxB,CAAA;AAED,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,OAAO,EACP,aAAa,GACd,CAAA;AAED,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,+BAA+B,EAC/B,kBAAkB,GACnB,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA"}

package/dist/tools/index.js

@@ -24,14 +24,5 @@ export const toolRegistry = {
     saveKnowledge,
 };
 export { readFile, writeFile, edit, shell, glob, grep, listDir, webSearch, webFetch, askUser, saveKnowledge, };
-/** Max characters for tool results before truncation */
-export const MAX_TOOL_RESULT_CHARS = 30000;
-/** Truncate tool result, keeping head and tail */
-export function truncateToolResult(result) {
-    if (result.length <= MAX_TOOL_RESULT_CHARS)
-        return result;
-    const half = Math.floor(MAX_TOOL_RESULT_CHARS / 2);
-    const truncatedChars = result.length - MAX_TOOL_RESULT_CHARS;
-    return result.slice(0, half) + `\n\n... [truncated ${truncatedChars} characters] ...\n\n` + result.slice(-half);
-}
+export { MAX_TOOL_RESULT_LINES, MAX_TOOL_RESULT_BYTES, MAX_AGGREGATE_TOOL_RESULT_BYTES, truncateToolResult, } from './truncate.js';
 //# sourceMappingURL=index.js.map

package/dist/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ;IACR,SAAS;IACT,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,IAAI;IACJ,OAAO;IACP,SAAS;IACT,QAAQ;IACR,OAAO;IACP,aAAa;CACd,CAAA;AAED,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,OAAO,EACP,aAAa,GACd,CAAA;AAED,wDAAwD;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAA;AAE1C,kDAAkD;AAClD,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,IAAI,MAAM,CAAC,MAAM,IAAI,qBAAqB;QAAE,OAAO,MAAM,CAAA;IACzD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAA;IAClD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,GAAG,qBAAqB,CAAA;IAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,sBAAsB,cAAc,sBAAsB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAA;AACjH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ;IACR,SAAS;IACT,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,IAAI;IACJ,OAAO;IACP,SAAS;IACT,QAAQ;IACR,OAAO;IACP,aAAa;CACd,CAAA;AAED,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,OAAO,EACP,aAAa,GACd,CAAA;AAED,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,+BAA+B,EAC/B,kBAAkB,GACnB,MAAM,eAAe,CAAA"}

package/dist/tools/read-file.d.ts

@@ -2,5 +2,33 @@ export declare const readFile: import("ai").Tool<{
     filePath: string;
     offset?: number | undefined;
     limit?: number | undefined;
-}, string>;
+}, string | {
+    type: string;
+    value: ({
+        type: string;
+        text: string;
+        data?: undefined;
+        mediaType?: undefined;
+    } | {
+        type: string;
+        data: string;
+        mediaType: string;
+        text?: undefined;
+    })[];
+} | {
+    type: string;
+    value: ({
+        type: string;
+        text: string;
+        data?: undefined;
+        mediaType?: undefined;
+        filename?: undefined;
+    } | {
+        type: string;
+        data: string;
+        mediaType: string;
+        filename: string;
+        text?: undefined;
+    })[];
+}>;
 //# sourceMappingURL=read-file.d.ts.map

package/dist/tools/read-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,QAAQ;;;;UAsBnB,CAAA"}
+{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAoEA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6DnB,CAAA"}

package/dist/tools/read-file.js

@@ -1,25 +1,118 @@
 // @x-code-cli/core — readFile tool
+//
+// Text files are returned as numbered-line strings (the format agents have
+// been trained against). Binary files (images, PDFs) are returned as an
+// AI-SDK `content` tool result so providers that accept inline media
+// receive proper `image-data` / `file-data` parts instead of a base64 blob
+// stuffed inside a text string.
+//
+// The tool itself does NOT branch on provider capability — that would
+// couple the tool layer to the currently-active model. Instead, every
+// binary result goes out as content parts and the provider-compat layer
+// strips them (falling back to OCR'd text) before they reach a provider
+// that can't handle them.
 import fs from 'node:fs/promises';
+import path from 'node:path';
 import { tool } from 'ai';
 import { z } from 'zod';
+import { classifyFile } from '../agent/file-ingest.js';
 import { reportProgress } from './progress.js';
+function mediaTypeFor(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    if (ext === '.jpg' || ext === '.jpeg')
+        return 'image/jpeg';
+    if (ext === '.png')
+        return 'image/png';
+    if (ext === '.webp')
+        return 'image/webp';
+    if (ext === '.gif')
+        return 'image/gif';
+    if (ext === '.bmp')
+        return 'image/bmp';
+    return 'image/png';
+}
+/** Threshold above which a no-args readFile call returns a partial head plus a
+ *  hint to re-read specific ranges. Picked empirically: 500 lines of code is
+ *  a realistic ceiling for "skim the whole thing", and anything bigger is
+ *  almost always used with grep first. */
+const LARGE_FILE_LINE_THRESHOLD = 500;
+async function readTextResult(filePath, offset, limit) {
+    const content = await fs.readFile(filePath, 'utf-8');
+    const lines = content.split('\n');
+    const totalLines = lines.length;
+    // When the caller passes neither offset nor limit and the file is large,
+    // return only the head and tell the model how to request the rest. Without
+    // this guard, models happily read 2000-line files "just to see what's in
+    // there" and the full content rides along on every subsequent turn. The
+    // downstream truncator (tool-result-sanitize) would eventually clip this,
+    // but doing it at the tool level preserves intent — the model sees
+    // explicitly that the file was large and that it should narrow the range.
+    const userSpecifiedRange = offset != null || limit != null;
+    if (!userSpecifiedRange && totalLines > LARGE_FILE_LINE_THRESHOLD) {
+        const head = lines.slice(0, LARGE_FILE_LINE_THRESHOLD);
+        const body = head.map((line, i) => `${i + 1}\t${line}`).join('\n');
+        return (body +
+            `\n\n[readFile: showing first ${LARGE_FILE_LINE_THRESHOLD}/${totalLines} lines. ` +
+            `Call readFile again with offset/limit to view other ranges, or use grep to find specific symbols.]`);
+    }
+    const start = (offset ?? 1) - 1;
+    const end = limit ? start + limit : lines.length;
+    const sliced = lines.slice(start, end);
+    return sliced.map((line, i) => `${start + i + 1}\t${line}`).join('\n');
+}
 export const readFile = tool({
-    description: 'Read the contents of a file at the given path. Returns the file content with line numbers.',
+    description: 'Read the contents of a file at the given path. Returns line-numbered text for code/docs, and inline media for images/PDFs so the model can inspect them directly.',
     inputSchema: z.object({
         filePath: z.string().describe('Absolute path to the file'),
-        offset: z.number().optional().describe('Start line (1-based)'),
-        limit: z.number().optional().describe('Max lines to read'),
+        offset: z.number().optional().describe('Start line (1-based, text files only)'),
+        limit: z.number().optional().describe('Max lines to read (text files only)'),
     }),
     execute: async ({ filePath, offset, limit }, { toolCallId }) => {
         try {
             reportProgress(toolCallId, `Reading ${filePath}`);
-            const content = await fs.readFile(filePath, 'utf-8');
-            const lines = content.split('\n');
-            const start = (offset ?? 1) - 1;
-            const end = limit ? start + limit : lines.length;
-            const sliced = lines.slice(start, end);
-            const numbered = sliced.map((line, i) => `${start + i + 1}\t${line}`);
-            return numbered.join('\n');
+            const kind = await classifyFile(filePath).catch(() => 'text');
+            if (kind === 'image') {
+                const buffer = await fs.readFile(filePath);
+                // Content tool result: the provider-compat sanitizer decides whether
+                // this image survives to the model (multimodal) or gets replaced
+                // with an OCR text block (DeepSeek etc.). We attach both an
+                // `image-data` part (for providers that can see it) and a trailing
+                // text part with the file path (so the model always has a textual
+                // anchor to reference).
+                return {
+                    type: 'content',
+                    value: [
+                        { type: 'text', text: `Loaded image: ${filePath}` },
+                        {
+                            type: 'image-data',
+                            data: buffer.toString('base64'),
+                            mediaType: mediaTypeFor(filePath),
+                        },
+                    ],
+                };
+            }
+            if (kind === 'pdf') {
+                const buffer = await fs.readFile(filePath);
+                return {
+                    type: 'content',
+                    value: [
+                        { type: 'text', text: `Loaded PDF: ${filePath}` },
+                        {
+                            type: 'file-data',
+                            data: buffer.toString('base64'),
+                            mediaType: 'application/pdf',
+                            filename: path.basename(filePath),
+                        },
+                    ],
+                };
+            }
+            // Text / Office / unknown → read as text.
+            // (Office files are handled up-front by buildUserContent when the user
+            // attaches them via @path; if a model calls readFile on a .docx anyway,
+            // we fall through to a UTF-8 read which returns gibberish — a follow-up
+            // could route Office here too, but it's a rare path worth keeping
+            // simple for now.)
+            return await readTextResult(filePath, offset, limit);
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);

package/dist/tools/read-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,mCAAmC;AACnC,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAEjC,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAEzB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,4FAA4F;IACzG,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC;QAC1D,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;QAC9D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;KAC3D,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;QAC7D,IAAI,CAAC;YACH,cAAc,CAAC,UAAU,EAAE,WAAW,QAAQ,EAAE,CAAC,CAAA;YACjD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACpD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACjC,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;YAC/B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;YAChD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;YACrE,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC5D,OAAO,uBAAuB,GAAG,EAAE,CAAA;QACrC,CAAC;IACH,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"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"}

package/dist/tools/shell-provider.d.ts

@@ -0,0 +1,13 @@
+import { type ResultPromise } from 'execa';
+export type ShellType = 'bash' | 'zsh' | 'powershell';
+export interface ShellSpawnOptions {
+    timeout: number;
+    env?: NodeJS.ProcessEnv;
+    cwd?: string;
+}
+export interface ShellProvider {
+    type: ShellType;
+    spawn(command: string, opts: ShellSpawnOptions): ResultPromise;
+}
+export declare function getShellProvider(): ShellProvider;
+//# sourceMappingURL=shell-provider.d.ts.map

package/dist/tools/shell-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-provider.d.ts","sourceRoot":"","sources":["../../src/tools/shell-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAS,KAAK,aAAa,EAAE,MAAM,OAAO,CAAA;AAGjD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,YAAY,CAAA;AAErD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,SAAS,CAAA;IACf,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,aAAa,CAAA;CAC/D;AA6DD,wBAAgB,gBAAgB,IAAI,aAAa,CAYhD"}

package/dist/tools/shell-provider.js

@@ -0,0 +1,74 @@
+// @x-code-cli/core — Cross-platform shell provider abstraction.
+//
+// Each shell (bash/zsh, PowerShell) spawns its own child process with its own
+// quoting/encoding quirks. Keeping those quirks behind a provider interface
+// means the tool-execution layer does not need platform branches and does not
+// hand-roll quote escapes for PowerShell.
+import { execa } from 'execa';
+import os from 'node:os';
+function createPosixProvider(executable, type) {
+    return {
+        type,
+        spawn(command, opts) {
+            return execa(executable, ['-c', command], {
+                timeout: opts.timeout,
+                cwd: opts.cwd,
+                reject: false,
+                env: { ...(opts.env ?? process.env), PYTHONIOENCODING: 'utf-8' },
+            });
+        },
+    };
+}
+// PowerShell's -EncodedCommand accepts a base64 UTF-16LE payload. The char set
+// is [A-Za-z0-9+/=] which survives any outer quoting layer (cmd.exe, Node's
+// Windows argv-to-string serializer, etc.), so we never need to escape quotes
+// in the user's command.
+function encodePowerShellCommand(psCommand) {
+    return Buffer.from(psCommand, 'utf16le').toString('base64');
+}
+function createPowerShellProvider(executable) {
+    return {
+        type: 'powershell',
+        spawn(command, opts) {
+            // Prefix/suffix run inside the same -EncodedCommand payload:
+            //   • OutputEncoding = UTF-8 — PS 5.1 on zh-CN Windows otherwise writes
+            //     output in GBK (mojibake when we decode as UTF-8). Avoids the
+            //     `chcp 65001 >nul && ...` cmd.exe wrapper.
+            //   • ProgressPreference = SilentlyContinue — first-run module loads
+            //     emit CLIXML progress records on stderr, which would surface as
+            //     noise in tool output.
+            //   • trailing `exit` — PowerShell does NOT propagate $LASTEXITCODE
+            //     to its own process exit code. Without this, `git push` failing
+            //     with exit 1 or `tsc` failing with exit 2 all come back as exit 0
+            //     or a generic 1, losing the signal. Prefer $LASTEXITCODE when a
+            //     native exe ran; fall back to $? for cmdlet-only pipelines.
+            const wrapped = [
+                '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
+                "$ProgressPreference = 'SilentlyContinue'",
+                command,
+                '$__ec = if ($null -ne $LASTEXITCODE) { $LASTEXITCODE } elseif ($?) { 0 } else { 1 }',
+                'exit $__ec',
+            ].join('\n');
+            return execa(executable, ['-NoProfile', '-NonInteractive', '-EncodedCommand', encodePowerShellCommand(wrapped)], {
+                timeout: opts.timeout,
+                cwd: opts.cwd,
+                reject: false,
+                env: { ...(opts.env ?? process.env), PYTHONIOENCODING: 'utf-8' },
+            });
+        },
+    };
+}
+export function getShellProvider() {
+    if (os.platform() === 'win32') {
+        // Git Bash / MSYS2 / Cygwin set SHELL to a Unix-style path. Prefer that
+        // when present so the Unix tool ecosystem works as expected.
+        const shell = process.env.SHELL;
+        if (shell && /\b(bash|zsh)$/i.test(shell)) {
+            return createPosixProvider(shell, shell.endsWith('zsh') ? 'zsh' : 'bash');
+        }
+        return createPowerShellProvider('powershell.exe');
+    }
+    const userShell = process.env.SHELL ?? '/bin/bash';
+    return createPosixProvider(userShell, userShell.endsWith('zsh') ? 'zsh' : 'bash');
+}
+//# sourceMappingURL=shell-provider.js.map

package/dist/tools/shell-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-provider.js","sourceRoot":"","sources":["../../src/tools/shell-provider.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,8EAA8E;AAC9E,0CAA0C;AAC1C,OAAO,EAAE,KAAK,EAAsB,MAAM,OAAO,CAAA;AACjD,OAAO,EAAE,MAAM,SAAS,CAAA;AAexB,SAAS,mBAAmB,CAAC,UAAkB,EAAE,IAAoB;IACnE,OAAO;QACL,IAAI;QACJ,KAAK,CAAC,OAAO,EAAE,IAAI;YACjB,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;gBACxC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE;aACjE,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC;AAED,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,yBAAyB;AACzB,SAAS,uBAAuB,CAAC,SAAiB;IAChD,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC7D,CAAC;AAED,SAAS,wBAAwB,CAAC,UAAkB;IAClD,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,KAAK,CAAC,OAAO,EAAE,IAAI;YACjB,6DAA6D;YAC7D,wEAAwE;YACxE,mEAAmE;YACnE,gDAAgD;YAChD,qEAAqE;YACrE,qEAAqE;YACrE,4BAA4B;YAC5B,oEAAoE;YACpE,qEAAqE;YACrE,uEAAuE;YACvE,qEAAqE;YACrE,iEAAiE;YACjE,MAAM,OAAO,GAAG;gBACd,0DAA0D;gBAC1D,0CAA0C;gBAC1C,OAAO;gBACP,qFAAqF;gBACrF,YAAY;aACb,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACZ,OAAO,KAAK,CACV,UAAU,EACV,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC,EACtF;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE;aACjE,CACF,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC;QAC9B,wEAAwE;QACxE,6DAA6D;QAC7D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAA;QAC/B,IAAI,KAAK,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC3E,CAAC;QACD,OAAO,wBAAwB,CAAC,gBAAgB,CAAC,CAAA;IACnD,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,WAAW,CAAA;IAClD,OAAO,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AACnF,CAAC"}

package/dist/tools/shell-utils.d.ts

@@ -1,10 +1,4 @@
-export type ShellType = 'powershell' | 'bash' | 'zsh';
-export interface ShellConfig {
-    executable: string;
-    args: string[];
-    type: ShellType;
-}
-export declare function getShellConfig(): ShellConfig;
+export type { ShellType } from './shell-provider.js';
 /** Split compound shell commands by pipe/chain operators for permission checking */
 export declare function splitShellCommands(cmd: string): string[];
 /** Check if a sub-command is read-only (safe to auto-allow) */

package/dist/tools/shell-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-utils.d.ts","sourceRoot":"","sources":["../../src/tools/shell-utils.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,KAAK,CAAA;AAErD,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,IAAI,EAAE,SAAS,CAAA;CAChB;AAED,wBAAgB,cAAc,IAAI,WAAW,CAc5C;AAED,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA0CxD;AAkDD,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGlD"}
+{"version":3,"file":"shell-utils.d.ts","sourceRoot":"","sources":["../../src/tools/shell-utils.ts"],"names":[],"mappings":"AAKA,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA0CxD;AAkDD,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGlD"}

package/dist/tools/shell-utils.js

@@ -1,20 +1,3 @@
-// @x-code-cli/core — Cross-platform shell detection and abstraction
-import os from 'node:os';
-export function getShellConfig() {
-    if (os.platform() === 'win32') {
-        // Git Bash / MSYS2 / Cygwin set SHELL to a Unix-style path (e.g. /usr/bin/bash).
-        // Prefer that shell when available so the Unix tool ecosystem works as expected.
-        const shell = process.env.SHELL;
-        if (shell && /\b(bash|zsh)$/i.test(shell)) {
-            const type = shell.endsWith('zsh') ? 'zsh' : 'bash';
-            return { executable: shell, args: ['-c'], type };
-        }
-        return { executable: 'powershell.exe', args: ['-NoProfile', '-Command'], type: 'powershell' };
-    }
-    const userShell = process.env.SHELL ?? '/bin/bash';
-    const type = userShell.endsWith('zsh') ? 'zsh' : 'bash';
-    return { executable: userShell, args: ['-c'], type };
-}
 /** Split compound shell commands by pipe/chain operators for permission checking */
 export function splitShellCommands(cmd) {
     // Split by |, &&, ;, || — but not inside quotes