Bump version to 0.2.21-fork in package.json. Refactor InternalClient and SubprocessCLITransport to streamline message handling by directly writing userMessage to stdin, improving code readability and maintainability. Enhance cost handling in InternalClient to simplify the structure of the cost object.

Author: tobymarsden

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botanicastudios/claude-code-sdk-ts",
-  "version": "0.2.20-fork",
+  "version": "0.2.21-fork",
   "description": "Unofficial TypeScript port of the official Python Claude Code SDK",
   "type": "module",
   "main": "dist/index.cjs",

src/_internal/client.ts

@@ -86,36 +86,7 @@ export class InternalClient {
       throw new Error('No active transport for streaming input');
     }
 
-    const messagePreview =
-      typeof userMessage.content === 'string'
-        ? userMessage.content.substring(0, 50) + '...'
-        : '[content blocks]';
-
-    this.debugLog(
-      'DEBUG: Sending streaming input to active transport:',
-      messagePreview
-    );
-
-    const jsonlMessage = {
-      type: 'user',
-      message: {
-        role: 'user',
-        content: userMessage.content
-      }
-    };
-
-    const jsonlString = JSON.stringify(jsonlMessage) + '\n';
-    
-    this.debugLog(
-      'DEBUG: Writing JSONL to stdin:',
-      JSON.stringify(jsonlMessage).substring(0, 100) + '...'
-    );
-
-    if (this.options.debug) {
-      this.debugLog('DEBUG stdin (raw):', jsonlString);
-    }
-
-    this.transport.writeToStdin(jsonlString);
+    this.transport.writeToStdin(userMessage);
 
     this.debugLog('DEBUG: Successfully wrote JSONL message to stdin');
   }
@@ -186,13 +157,15 @@ export class InternalClient {
           content: output.result || '',
           result: output.result || '',
           usage: output.usage,
-          cost: output.cost ? {
-            input_cost: output.cost.input_cost,
-            output_cost: output.cost.output_cost,
-            cache_creation_cost: output.cost.cache_creation_cost,
-            cache_read_cost: output.cost.cache_read_cost,
-            total_cost: output.cost.total_cost || output.total_cost_usd
-          } : undefined,
+          cost: output.cost
+            ? {
+                input_cost: output.cost.input_cost,
+                output_cost: output.cost.output_cost,
+                cache_creation_cost: output.cost.cache_creation_cost,
+                cache_read_cost: output.cost.cache_read_cost,
+                total_cost: output.cost.total_cost || output.total_cost_usd
+              }
+            : undefined,
           session_id: output.session_id
         };
 

src/_internal/transport/subprocess-cli.ts

@@ -14,7 +14,8 @@ import {
 import type {
   ClaudeCodeOptions,
   CLIOutput,
-  ProcessCompleteHandler
+  ProcessCompleteHandler,
+  UserMessage
 } from '../../types.js';
 
 export class SubprocessCLITransport {
@@ -85,25 +86,26 @@ export class SubprocessCLITransport {
   /**
    * Write streaming input to the active process stdin
    */
-  writeToStdin(data: string): void {
+  writeToStdin(userMessage: UserMessage): void {
     if (!this.isActive()) {
       throw new Error('No active process to write to');
     }
 
     if (this.process && this.process.stdin) {
       try {
+        const content = userMessage.content as string;
         if (this.streamingMode) {
           // For streaming mode, wrap message in JSONL format
           const jsonlMessage = {
             type: 'user',
             message: {
               role: 'user',
-              content: [{ type: 'text', text: data }]
+              content: [{ type: 'text', text: content }]
             }
           };
 
           const jsonlString = JSON.stringify(jsonlMessage) + '\n';
-          
+
           this.debugLog(
             'DEBUG: [Transport] Writing JSONL to process stdin:',
             JSON.stringify(jsonlMessage).substring(0, 150) + '...'
@@ -120,14 +122,14 @@ export class SubprocessCLITransport {
           // For non-streaming mode, write as-is (though this shouldn't happen)
           this.debugLog(
             'DEBUG: [Transport] Writing raw data to stdin:',
-            data.substring(0, 100) + '...'
+            content.substring(0, 100) + '...'
           );
-          
+
           if (this.options.debug) {
-            this.debugLog('DEBUG stdin (raw):', data);
+            this.debugLog('DEBUG stdin (raw):', content);
           }
-          
-          this.process.stdin.write(data);
+
+          this.process.stdin.write(content);
         }
       } catch (error) {
         throw new Error(`Failed to write to stdin: ${error}`);
@@ -393,7 +395,7 @@ export class SubprocessCLITransport {
           };
 
           const initialJsonlString = JSON.stringify(jsonlMessage) + '\n';
-          
+
           this.debugLog(
             'DEBUG: [Transport] Sending initial JSONL message in streaming mode',
             {
@@ -415,11 +417,11 @@ export class SubprocessCLITransport {
         } else {
           // For simple queries, send as plain text and close stdin
           const promptString = this.prompt + '\n';
-          
+
           if (this.options.debug) {
             this.debugLog('DEBUG stdin (raw):', promptString);
           }
-          
+
           this.process.stdin.write(promptString);
           this.process.stdin.end();
         }