claude-code-rust 0.12.4 → 0.13.2

package/README.md

@@ -4,11 +4,15 @@ A native Rust terminal interface for Claude Code. Drop-in replacement for Anthro
 
 [![npm version](https://img.shields.io/npm/v/claude-code-rust)](https://www.npmjs.com/package/claude-code-rust)
 [![npm downloads](https://img.shields.io/npm/dm/claude-code-rust)](https://www.npmjs.com/package/claude-code-rust)
-[![CI](https://github.com/srothgan/claude-code-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/srothgan/claude-code-rust/actions/workflows/ci.yml)
+[![CI](https://github.com/srothgan/claude-code-rust/actions/workflows/pr.yml/badge.svg)](https://github.com/srothgan/claude-code-rust/actions/workflows/pr.yml)
 [![Docs](https://img.shields.io/badge/docs-GitHub%20Pages-blue)](https://srothgan.github.io/claude-code-rust/)
 [![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Node.js](https://img.shields.io/badge/Node.js-%3E%3D18-green.svg)](https://nodejs.org/)
 
+<p align="center">
+  <img src="assets/banner.png" alt="Claude Code Rust running a Read tool call with syntax-highlighted output" width="900">
+</p>
+
 ## About
 
 Claude Code Rust replaces the stock Claude Code terminal interface with a native Rust binary built on [Ratatui](https://ratatui.rs/). It connects to the same Claude API through a local Agent SDK bridge. Core Claude Code functionality - tool calls, file editing, terminal commands, and permissions - works unchanged.
@@ -26,7 +30,14 @@ Claude Code Rust replaces the stock Claude Code terminal interface with a native
 npm install -g claude-code-rust
 ```
 
-The published package installs a `claude-rs` command and fetches the matching prebuilt release binary for your platform during install.
+The npm package installs a small launcher plus a platform-specific optional dependency containing the prebuilt Rust binary for your OS and architecture.
+
+If `claude-rs` reports a missing platform package, check whether optional dependencies were omitted:
+
+```bash
+npm config get omit
+npm install -g claude-code-rust
+```
 
 If `claude-rs` resolves to an older global shim, ensure your npm global bin directory comes first on `PATH` or remove the stale shim before retrying.
 
@@ -43,15 +54,17 @@ Full documentation is available at [srothgan.github.io/claude-code-rust](https:/
 
 ## Why
 
-The stock Claude Code TUI runs on Node.js with React Ink. This causes real problems:
+The stock Claude Code TUI runs on Node.js with React Ink, which renders by redrawing full frames over raw ANSI escape codes. This causes real, widely-reported problems:
 
-- **Memory**: 200-400MB baseline vs ~20-50MB for a native binary
-- **Startup**: 2-5 seconds vs under 100ms
-- **Scrollback**: Broken virtual scrolling that loses history
-- **Input latency**: Event queue delays on keystroke handling
-- **Copy/paste**: Custom implementation instead of native terminal support
+- **Flickering**: The whole view is redrawn on every status update, causing constant flicker — bad enough to crash editors' integrated terminals during long sessions
+- **CPU**: Sustained high CPU even when idle, and runaway loops that spawn multiple background processes
+- **Memory**: 200-400MB baseline (and climbing with conversation length) vs ~20-50MB for a native binary
+- **Resize**: Window resizing leaves duplicated frames in scrollback, loses lines when shrinking, and can garble the display
+- **Input latency**: Keystrokes echo with visible delay as context fills up, and noticeably worse on Windows
+- **Scrollback**: Hijacks the terminal's native scrollback, erasing history you can no longer scroll back to
+- **Paste**: Large pastes can flood stdout and freeze the terminal
 
-Claude Code Rust fixes all of these by compiling to a single native binary with direct terminal control via Crossterm.
+Claude Code Rust addresses these by compiling to a single native binary with diffed, direct terminal control via Crossterm and Ratatui — no full-frame redraws, no Node runtime overhead.
 
 ## Documentation
 

package/agent-sdk/dist/bridge/mcp_metadata.js

@@ -48,6 +48,16 @@ function optionalTimeout(record, context) {
     }
     return value;
 }
+function optionalRequestTimeoutMs(record, context) {
+    const value = record.request_timeout_ms;
+    if (value === undefined) {
+        return undefined;
+    }
+    if (typeof value !== "number" || !Number.isFinite(value) || !Number.isInteger(value) || value < 1000) {
+        throw new Error(`${context}.request_timeout_ms must be an integer >= 1000`);
+    }
+    return value;
+}
 function optionalAlwaysLoad(record, context) {
     const value = record.always_load;
     if (value === undefined) {
@@ -98,6 +108,7 @@ export function parseMcpServerConfig(value, context) {
         throw new Error(`${context}.type must be a string`);
     }
     const timeout = optionalTimeout(record, context);
+    const requestTimeoutMs = optionalRequestTimeoutMs(record, context);
     const alwaysLoad = optionalAlwaysLoad(record, context);
     switch (type) {
         case "stdio": {
@@ -114,6 +125,7 @@ export function parseMcpServerConfig(value, context) {
                 ...(optionalStringArray(record, "args", context) ? { args: optionalStringArray(record, "args", context) } : {}),
                 ...(optionalStringMap(record, "env", context) ? { env: optionalStringMap(record, "env", context) } : {}),
                 ...(timeout === undefined ? {} : { timeout }),
+                ...(requestTimeoutMs === undefined ? {} : { request_timeout_ms: requestTimeoutMs }),
                 ...(alwaysLoad === undefined ? {} : { always_load: alwaysLoad }),
             };
         }
@@ -130,6 +142,7 @@ export function parseMcpServerConfig(value, context) {
                 ...(optionalStringMap(record, "headers", context) ? { headers: optionalStringMap(record, "headers", context) } : {}),
                 ...(tools === undefined ? {} : { tools }),
                 ...(timeout === undefined ? {} : { timeout }),
+                ...(requestTimeoutMs === undefined ? {} : { request_timeout_ms: requestTimeoutMs }),
                 ...(alwaysLoad === undefined ? {} : { always_load: alwaysLoad }),
             };
         }
@@ -148,6 +161,9 @@ function toSdkToolPolicies(tools) {
         ...(tool.org_max_permission === undefined ? {} : { org_max_permission: tool.org_max_permission }),
     }));
 }
+function sdkRequestTimeoutConfig(config) {
+    return config.request_timeout_ms === undefined ? {} : { requestTimeoutMs: config.request_timeout_ms };
+}
 export function bridgeMcpConfigToSdk(config) {
     switch (config.type) {
         case "stdio":
@@ -157,6 +173,7 @@ export function bridgeMcpConfigToSdk(config) {
                 ...(config.args ? { args: config.args } : {}),
                 ...(config.env ? { env: config.env } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
+                ...sdkRequestTimeoutConfig(config),
                 ...(config.always_load === undefined ? {} : { alwaysLoad: config.always_load }),
             };
         case "sse":
@@ -166,6 +183,7 @@ export function bridgeMcpConfigToSdk(config) {
                 ...(config.headers ? { headers: config.headers } : {}),
                 ...(config.tools ? { tools: toSdkToolPolicies(config.tools) } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
+                ...sdkRequestTimeoutConfig(config),
                 ...(config.always_load === undefined ? {} : { alwaysLoad: config.always_load }),
             };
         case "http":
@@ -175,6 +193,7 @@ export function bridgeMcpConfigToSdk(config) {
                 ...(config.headers ? { headers: config.headers } : {}),
                 ...(config.tools ? { tools: toSdkToolPolicies(config.tools) } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
+                ...sdkRequestTimeoutConfig(config),
                 ...(config.always_load === undefined ? {} : { alwaysLoad: config.always_load }),
             };
     }
@@ -250,6 +269,16 @@ export function mapMcpServerStatus(status) {
             : [],
     };
 }
+function sdkRequestTimeoutMs(config) {
+    if (!config || typeof config !== "object" || Array.isArray(config)) {
+        return undefined;
+    }
+    const raw = config;
+    const value = raw.requestTimeoutMs ?? raw.request_timeout_ms;
+    return typeof value === "number" && Number.isFinite(value) && Number.isInteger(value)
+        ? value
+        : undefined;
+}
 export function mapMcpServerStatusConfig(config) {
     switch (config.type) {
         case "stdio":
@@ -259,6 +288,7 @@ export function mapMcpServerStatusConfig(config) {
                 ...(Array.isArray(config.args) && config.args.length > 0 ? { args: config.args } : {}),
                 ...(config.env ? { env: config.env } : {}),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
+                ...(sdkRequestTimeoutMs(config) === undefined ? {} : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
                 ...(config.alwaysLoad === undefined ? {} : { always_load: config.alwaysLoad }),
             };
         case "sse": {
@@ -269,6 +299,7 @@ export function mapMcpServerStatusConfig(config) {
                 ...(config.headers ? { headers: config.headers } : {}),
                 ...(tools === undefined ? {} : { tools }),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
+                ...(sdkRequestTimeoutMs(config) === undefined ? {} : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
                 ...(config.alwaysLoad === undefined ? {} : { always_load: config.alwaysLoad }),
             };
         }
@@ -280,6 +311,7 @@ export function mapMcpServerStatusConfig(config) {
                 ...(config.headers ? { headers: config.headers } : {}),
                 ...(tools === undefined ? {} : { tools }),
                 ...(config.timeout === undefined ? {} : { timeout: config.timeout }),
+                ...(sdkRequestTimeoutMs(config) === undefined ? {} : { request_timeout_ms: sdkRequestTimeoutMs(config) }),
                 ...(config.alwaysLoad === undefined ? {} : { always_load: config.alwaysLoad }),
             };
         }
@@ -321,6 +353,7 @@ function mcpStatusConfigDiagnostics(config) {
             return {
                 config_type: "stdio",
                 ...(config.timeout === undefined ? {} : { timeout_ms: config.timeout }),
+                ...(config.request_timeout_ms === undefined ? {} : { request_timeout_ms: config.request_timeout_ms }),
                 ...(config.always_load === undefined ? {} : { always_load: config.always_load }),
                 configured_tool_policy_count: 0,
             };
@@ -329,6 +362,7 @@ function mcpStatusConfigDiagnostics(config) {
             return {
                 config_type: config.type,
                 ...(config.timeout === undefined ? {} : { timeout_ms: config.timeout }),
+                ...(config.request_timeout_ms === undefined ? {} : { request_timeout_ms: config.request_timeout_ms }),
                 ...(config.always_load === undefined ? {} : { always_load: config.always_load }),
                 configured_tool_policy_count: config.tools?.length ?? 0,
             };
@@ -359,6 +393,7 @@ export function summarizeMcpServersForDiagnostics(servers) {
             config_type: config.config_type,
             ...(server.scope ? { scope: server.scope } : {}),
             ...(config.timeout_ms === undefined ? {} : { timeout_ms: config.timeout_ms }),
+            ...(config.request_timeout_ms === undefined ? {} : { request_timeout_ms: config.request_timeout_ms }),
             ...(config.always_load === undefined ? {} : { always_load: config.always_load }),
             tool_count: server.tools.length,
             configured_tool_policy_count: config.configured_tool_policy_count,

package/agent-sdk/dist/bridge/model_metadata.js

@@ -1,11 +1,6 @@
-const OPUS_MODEL_ALIAS = "opus";
+const DEFAULT_MODEL_ALIAS = "fable";
 const MAX_MODEL_VERSION_PARTS = 2;
 const RELEASE_BUILD_TOKEN = /^20\d{6}$/;
-function isUnavailableModelId(id) {
-    const normalized = id.trim().toLowerCase();
-    // TODO: Revisit only after a product decision if Anthropic restores Fable 5 access.
-    return normalized === "fable" || normalized.startsWith("claude-fable-5");
-}
 function isEffortLevel(value) {
     return (value === "low" ||
         value === "medium" ||
@@ -19,7 +14,7 @@ function normalizeModelKey(id) {
         return { original, family: "unknown", versionParts: [], variantParts: [], buildParts: [] };
     }
     const lower = original.toLowerCase();
-    const contextMatch = lower.match(/\[([^\]]+)\]$/);
+    const contextMatch = lower.match(/\[([^[\]]+)\]$/);
     const contextSuffix = contextMatch?.[1];
     const withoutContext = contextMatch ? lower.slice(0, contextMatch.index) : lower;
     const withoutPrefix = withoutContext.startsWith("claude-")
@@ -27,7 +22,10 @@ function normalizeModelKey(id) {
         : withoutContext;
     const parts = withoutPrefix.split("-").filter((part) => part.length > 0);
     const familyPart = parts[0] ?? "";
-    const family = familyPart === "opus" || familyPart === "sonnet" || familyPart === "haiku"
+    const family = familyPart === "fable" ||
+        familyPart === "opus" ||
+        familyPart === "sonnet" ||
+        familyPart === "haiku"
         ? familyPart
         : "unknown";
     const versionParts = [];
@@ -36,6 +34,10 @@ function normalizeModelKey(id) {
     if (family !== "unknown") {
         for (const part of parts.slice(1)) {
             if (/^\d+$/.test(part)) {
+                if (versionParts.length > 0 && RELEASE_BUILD_TOKEN.test(part)) {
+                    buildParts.push(part);
+                    continue;
+                }
                 if (versionParts.length < MAX_MODEL_VERSION_PARTS) {
                     const parsed = Number.parseInt(part, 10);
                     if (Number.isFinite(parsed)) {
@@ -120,11 +122,13 @@ function humanizeModelId(id) {
     if (normalized.family === "unknown") {
         return id;
     }
-    const familyLabel = normalized.family === "opus"
-        ? "Opus"
-        : normalized.family === "sonnet"
-            ? "Sonnet"
-            : "Haiku";
+    const familyLabel = normalized.family === "fable"
+        ? "Fable"
+        : normalized.family === "opus"
+            ? "Opus"
+            : normalized.family === "sonnet"
+                ? "Sonnet"
+                : "Haiku";
     const versionLabel = normalized.versionParts.length > 0 ? ` ${normalized.versionParts.join(".")}` : "";
     const contextLabel = normalized.contextSuffix?.toLowerCase() === "1m"
         ? " [1M]"
@@ -144,19 +148,23 @@ function currentModelIsAuthoritative(resolvedId, requestedId) {
     return true;
 }
 function resolveCatalogModel(availableModels, resolvedId, requestedId) {
-    const exactResolved = availableModels.find((entry) => entry.id === resolvedId);
+    const exactResolved = availableModels.find((entry) => entry.id === resolvedId || entry.resolved_model === resolvedId);
     if (exactResolved) {
         return exactResolved;
     }
     if (requestedId) {
-        const exactRequested = availableModels.find((entry) => entry.id === requestedId);
+        const exactRequested = availableModels.find((entry) => entry.id === requestedId || entry.resolved_model === requestedId);
         if (exactRequested &&
-            modelKeysAreCompatible(exactRequested.id, resolvedId) &&
+            (modelKeysAreCompatible(exactRequested.id, resolvedId) ||
+                (exactRequested.resolved_model !== undefined &&
+                    modelKeysAreCompatible(exactRequested.resolved_model, resolvedId))) &&
             !hasVariantSiblingConflict(availableModels, exactRequested.id, resolvedId)) {
             return exactRequested;
         }
     }
-    const compatible = availableModels.filter((entry) => modelKeysAreCompatible(entry.id, resolvedId) &&
+    const compatible = availableModels.filter((entry) => (modelKeysAreCompatible(entry.id, resolvedId) ||
+        (entry.resolved_model !== undefined &&
+            modelKeysAreCompatible(entry.resolved_model, resolvedId))) &&
         !hasVariantSiblingConflict(availableModels, entry.id, resolvedId));
     return compatible.length === 1 ? compatible[0] : undefined;
 }
@@ -168,12 +176,14 @@ export function mapAvailableModels(models) {
         .filter((entry) => {
         return (typeof entry?.value === "string" &&
             entry.value.trim().length > 0 &&
-            !isUnavailableModelId(entry.value) &&
             typeof entry.displayName === "string" &&
             entry.displayName.trim().length > 0);
     })
         .map((entry) => ({
         id: entry.value,
+        ...(typeof entry.resolvedModel === "string" && entry.resolvedModel.trim().length > 0
+            ? { resolved_model: entry.resolvedModel.trim() }
+            : {}),
         display_name: entry.displayName,
         supports_effort: entry.supportsEffort === true,
         supported_effort_levels: Array.isArray(entry.supportedEffortLevels)
@@ -198,9 +208,9 @@ export function resolveCurrentModel(session) {
     const resolvedId = session.resolvedRuntimeModelId?.trim() ||
         session.model.trim() ||
         requestedId ||
-        OPUS_MODEL_ALIAS;
+        DEFAULT_MODEL_ALIAS;
     const catalogModel = resolveCatalogModel(session.availableModels, resolvedId, requestedId);
-    const runtimeDisplayId = resolvedId || requestedId || OPUS_MODEL_ALIAS;
+    const runtimeDisplayId = resolvedId || requestedId || DEFAULT_MODEL_ALIAS;
     const displayNameShort = shortDisplayNameForModelId(runtimeDisplayId);
     const displayNameLong = catalogModel?.display_name ?? humanizeModelId(runtimeDisplayId);
     return {

package/agent-sdk/dist/bridge/session_lifecycle.js

@@ -19,7 +19,7 @@ export { shouldEmitStartupAuthRequiredForAccount } from "./account_metadata.js";
 const BRIDGE_RUNTIME_PROCESS_NAME = process.platform === "win32" ? "claude-rs-bridge-node.exe" : "claude-rs-bridge-node";
 const BRIDGE_RUNTIME_GUARD_PROMPT = `Do not terminate the Claude Rust bridge runtime process \`${BRIDGE_RUNTIME_PROCESS_NAME}\`; ` +
     "when cleaning up development servers, only stop processes by explicit PIDs you started in this session.";
-const STARTUP_FALLBACK_MODEL_ALIAS = "opus";
+const STARTUP_FALLBACK_MODEL_ALIAS = "fable";
 function permissionDisplayFromCanUseOptions(options) {
     const title = typeof options.title === "string" ? options.title.trim() : "";
     const displayName = typeof options.displayName === "string" ? options.displayName.trim() : "";
@@ -600,6 +600,7 @@ export function buildQueryOptions(params) {
     const systemPrompt = systemPromptFromLaunchSettings(params.launchSettings);
     const modelOption = startupModelOption(params.launchSettings);
     const permissionModeOptions = startupPermissionModeOptions(params.launchSettings);
+    const shouldPassCanUseTool = permissionModeOptions.permissionMode !== "bypassPermissions";
     const settings = normalizedSettingsFromLaunchSettings(params.launchSettings);
     return {
         cwd: params.cwd,
@@ -658,7 +659,7 @@ export function buildQueryOptions(params) {
         settingSources: DEFAULT_SETTING_SOURCES,
         resume: params.resume,
         ...(params.resumeSessionAt ? { resumeSessionAt: params.resumeSessionAt } : {}),
-        canUseTool: params.canUseTool,
+        ...(shouldPassCanUseTool ? { canUseTool: params.canUseTool } : {}),
         onElicitation: async (request) => {
             const requestId = randomUUID();
             const mode = request.mode === "form" || request.mode === "url"

package/agent-sdk/dist/bridge/user_interaction.js

@@ -142,6 +142,32 @@ function buildQuestionRequest(promptToolCall, prompt, index, total) {
 function askUserQuestionTranscript(answers) {
     return answers.map((entry) => `${entry.header}: ${entry.answer}\n  ${entry.question}`).join("\n");
 }
+function askUserQuestionCompletedRawInput(prompts, answers, annotations, questionResults) {
+    return {
+        questions: prompts.map((prompt) => ({
+            question: prompt.question,
+            header: prompt.header,
+            multiSelect: prompt.multiSelect,
+            options: prompt.options.map((option) => ({
+                label: option.label,
+                description: option.description,
+                ...(option.preview ? { preview: option.preview } : {}),
+            })),
+        })),
+        answers,
+        ...(Object.keys(annotations).length > 0 ? { annotations: questionAnnotationsJson(annotations) } : {}),
+        question_results: questionResults,
+    };
+}
+function questionAnnotationsJson(annotations) {
+    return Object.fromEntries(Object.entries(annotations).map(([question, annotation]) => [
+        question,
+        {
+            ...(annotation.preview ? { preview: annotation.preview } : {}),
+            ...(annotation.notes ? { notes: annotation.notes } : {}),
+        },
+    ]));
+}
 function deriveAnnotation(selectedOptions, annotation) {
     const preview = annotation?.preview?.trim().length
         ? annotation.preview
@@ -166,6 +192,7 @@ export async function requestAskUserQuestionAnswers(session, toolUseId, inputDat
     const answers = {};
     const annotations = {};
     const transcript = [];
+    const questionResults = [];
     for (const [index, prompt] of prompts.entries()) {
         const promptToolCall = askUserQuestionPromptToolCall(baseToolCall, prompt, index, prompts.length);
         const fields = {
@@ -214,11 +241,35 @@ export async function requestAskUserQuestionAnswers(session, toolUseId, inputDat
             annotations[prompt.question] = annotation;
         }
         transcript.push({ header: prompt.header, question: prompt.question, answer });
+        questionResults.push({
+            question: prompt.question,
+            header: prompt.header,
+            question_index: index,
+            total_questions: prompts.length,
+            selected_options: selectedOptions.map((option) => ({
+                option_id: option.option_id,
+                label: option.label,
+                ...(option.description ? { description: option.description } : {}),
+                ...(option.preview ? { preview: option.preview } : {}),
+            })),
+            ...(annotation
+                ? {
+                    annotation: {
+                        ...(annotation.preview ? { preview: annotation.preview } : {}),
+                        ...(annotation.notes ? { notes: annotation.notes } : {}),
+                    },
+                }
+                : {}),
+        });
         const summary = askUserQuestionTranscript(transcript);
+        const completed = index + 1 >= prompts.length;
         const progressFields = {
-            status: index + 1 >= prompts.length ? "completed" : "in_progress",
+            status: completed ? "completed" : "in_progress",
             raw_output: summary,
             content: [{ type: "content", content: { type: "text", text: summary } }],
+            ...(completed
+                ? { raw_input: askUserQuestionCompletedRawInput(prompts, answers, annotations, questionResults) }
+                : {}),
         };
         emitToolCallUpdate(session, toolUseId, progressFields, "summary");
     }

package/agent-sdk/dist/bridge.js

@@ -129,7 +129,7 @@ export function emitAgentConfigOptionUpdate(sessionId, agent) {
         value: agent,
     });
 }
-const EXPECTED_AGENT_SDK_VERSION = "0.3.193";
+const EXPECTED_AGENT_SDK_VERSION = "0.3.198";
 const require = createRequire(import.meta.url);
 export function resolveInstalledAgentSdkVersion() {
     try {
@@ -261,6 +261,19 @@ function emitRewindResult(sessionId, restoreMode, status, requestId, fileResult,
         ...(message ? { message } : {}),
     }, requestId);
 }
+function requestIdFromCommandLine(line) {
+    try {
+        const parsed = JSON.parse(line);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+            return undefined;
+        }
+        const requestId = parsed.request_id;
+        return typeof requestId === "string" ? requestId : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 async function replaceConversationForRewind(command, session, targetUserMessageId, requestId, pendingRewindResult) {
     const historyMessages = await getSessionMessages(command.session_id, {
         dir: session.cwd,
@@ -1145,11 +1158,13 @@ function main() {
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
+                const requestId = requestIdFromCommandLine(line);
                 bridgeLogger.error({
                     target: LOG_TARGETS.BRIDGE_PROTOCOL,
                     eventName: "bridge_command_decode_failed",
                     message: "failed to decode bridge command envelope",
                     outcome: "failure",
+                    ...(requestId ? { requestId } : {}),
                     sizeBytes: Buffer.byteLength(line),
                     fields: {
                         preview: line.slice(0, 240),
@@ -1157,7 +1172,7 @@ function main() {
                         error_message: message,
                     },
                 });
-                failConnection(`invalid command envelope: ${message}`);
+                failConnection(`invalid command envelope: ${message}`, requestId);
                 return;
             }
             try {

package/agent-sdk/package.json

@@ -0,0 +1,4 @@
+{
+  "private": true,
+  "type": "module"
+}

package/bin/claude-rs.js

@@ -6,10 +6,22 @@ const fs = require("node:fs");
 const path = require("node:path");
 
 const TARGETS = {
-  "darwin:arm64": { target: "aarch64-apple-darwin", exe: "claude-rs" },
-  "darwin:x64": { target: "x86_64-apple-darwin", exe: "claude-rs" },
-  "linux:x64": { target: "x86_64-unknown-linux-gnu", exe: "claude-rs" },
-  "win32:x64": { target: "x86_64-pc-windows-msvc", exe: "claude-rs.exe" }
+  "darwin:arm64": {
+    packageName: "@srothgan/claude-code-rust-darwin-arm64",
+    exe: "claude-rs"
+  },
+  "darwin:x64": {
+    packageName: "@srothgan/claude-code-rust-darwin-x64",
+    exe: "claude-rs"
+  },
+  "linux:x64": {
+    packageName: "@srothgan/claude-code-rust-linux-x64-gnu",
+    exe: "claude-rs"
+  },
+  "win32:x64": {
+    packageName: "@srothgan/claude-code-rust-win32-x64-msvc",
+    exe: "claude-rs.exe"
+  }
 };
 
 function resolveInstall() {
@@ -19,16 +31,43 @@ function resolveInstall() {
     return { error: `Unsupported platform/arch for claude-rs: ${key}` };
   }
 
-  const binaryPath = path.join(__dirname, "..", "vendor", info.target, info.exe);
+  let packageJsonPath;
+  try {
+    packageJsonPath = require.resolve(`${info.packageName}/package.json`);
+  } catch (error) {
+    if (error && error.code === "MODULE_NOT_FOUND") {
+      return {
+        error:
+          `Missing platform package ${info.packageName} for ${key}.\n` +
+          "This usually means npm optional dependencies were omitted.\n" +
+          "Check `npm config get omit`, then reinstall with:\n" +
+          "  npm install -g claude-code-rust"
+      };
+    }
+    throw error;
+  }
+
+  const binaryPath = path.join(path.dirname(packageJsonPath), "bin", info.exe);
   if (!fs.existsSync(binaryPath)) {
     return {
       error:
         `Missing binary at ${binaryPath}\n` +
-        "Reinstall with `npm install -g claude-code-rust` to fetch release artifacts."
+        `The installed ${info.packageName} package is incomplete. Reinstall with:\n` +
+        "  npm install -g claude-code-rust"
+    };
+  }
+
+  const bundledBridgeScript = path.join(__dirname, "..", "agent-sdk", "dist", "bridge.js");
+  if (!fs.existsSync(bundledBridgeScript)) {
+    return {
+      error:
+        `Missing bundled bridge at ${bundledBridgeScript}\n` +
+        "The installed claude-code-rust package is incomplete. Reinstall with:\n" +
+        "  npm install -g claude-code-rust"
     };
   }
 
-  return { binaryPath };
+  return { binaryPath, bundledBridgeScript };
 }
 
 const resolved = resolveInstall();
@@ -38,6 +77,10 @@ if (resolved.error) {
 }
 
 const child = spawn(resolved.binaryPath, process.argv.slice(2), {
+  env: {
+    ...process.env,
+    CLAUDE_RS_AGENT_BRIDGE: process.env.CLAUDE_RS_AGENT_BRIDGE || resolved.bundledBridgeScript
+  },
   stdio: "inherit",
   windowsHide: true
 });

package/package.json

@@ -1,13 +1,18 @@
 {
   "name": "claude-code-rust",
-  "version": "0.12.4",
+  "version": "0.13.2",
   "description": "Claude Code Rust - native Rust terminal interface for Claude Code",
   "keywords": [
     "cli",
     "tui",
     "claude",
+    "claude-code",
+    "anthropic",
+    "agent-sdk",
     "ai",
-    "terminal"
+    "terminal",
+    "rust",
+    "ratatui"
   ],
   "license": "Apache-2.0",
   "repository": {
@@ -23,25 +28,21 @@
   },
   "files": [
     "bin",
-    "agent-sdk/dist",
-    "scripts",
-    "LICENSE",
-    "README.md"
+    "agent-sdk",
+    "README.md",
+    "LICENSE"
   ],
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.193",
+    "@anthropic-ai/claude-agent-sdk": "0.3.198",
     "@anthropic-ai/sdk": "0.106.0",
     "@modelcontextprotocol/sdk": "1.29.0",
     "zod": "4.4.3"
   },
-  "scripts": {
-    "postinstall": "node ./scripts/postinstall.js",
-    "prepack": "npm --prefix agent-sdk run build",
-    "quality:duplicates": "jscpd --config .jscpd.json src agent-sdk/src scripts bin --no-tips --no-colors",
-    "quality:duplicates:summary": "node scripts/jscpd-warning-summary.mjs jscpd-report/jscpd-report.json"
-  },
-  "devDependencies": {
-    "jscpd": "5.0.11"
+  "optionalDependencies": {
+    "@srothgan/claude-code-rust-darwin-arm64": "0.13.2",
+    "@srothgan/claude-code-rust-darwin-x64": "0.13.2",
+    "@srothgan/claude-code-rust-linux-x64-gnu": "0.13.2",
+    "@srothgan/claude-code-rust-win32-x64-msvc": "0.13.2"
   },
   "engines": {
     "node": ">=18"

package/agent-sdk/README.md

@@ -1,17 +0,0 @@
-# claude-rs agent-sdk bridge
-
-NDJSON stdio bridge that connects the Rust TUI (`claude-code-rust`) with `@anthropic-ai/claude-agent-sdk`. Spawned as a child process by the Rust binary and communicates via line-delimited JSON envelopes over stdin/stdout.
-
-## Local build
-
-```bash
-npm install
-npm run build
-```
-
-Build output is written to `dist/bridge.js`.
-
-## License
-
-This bridge is part of the `claude-code-rust` project and is licensed under
-the Apache License 2.0. See the repository root [LICENSE](../LICENSE).