runtimeuse 0.2.0 → 0.3.0

package/src/server.ts

@@ -7,7 +7,6 @@ import { defaultLogger, type Logger } from "./logger.js";
 export interface RuntimeUseServerConfig {
   handler: AgentHandler;
   port?: number;
-  defaultModel?: string;
   uploadTimeoutMs?: number;
   artifactWaitMs?: number;
   postInvocationDelayMs?: number;
@@ -34,7 +33,6 @@ export class RuntimeUseServer {
     const sessionConfig: SessionConfig = {
       handler: this.config.handler,
       uploadTracker,
-      defaultModel: this.config.defaultModel,
       uploadTimeoutMs: this.config.uploadTimeoutMs,
       artifactWaitMs: this.config.artifactWaitMs,
       postInvocationDelayMs: this.config.postInvocationDelayMs,

package/src/session.test.ts

@@ -39,17 +39,29 @@ vi.mock("fs", async () => {
     ...actual,
     default: {
       ...actual,
-      createWriteStream: vi.fn(() => ({ write: vi.fn(), end: vi.fn(), close: vi.fn() })),
+      createWriteStream: vi.fn(() => ({
+        write: vi.fn(),
+        end: vi.fn(),
+        close: vi.fn(),
+      })),
     },
   };
 });
 
 import { WebSocketSession, type SessionConfig } from "./session.js";
 import { UploadTracker } from "./upload-tracker.js";
-import type { AgentHandler, AgentInvocation, AgentResult, MessageSender } from "./agent-handler.js";
+import type {
+  AgentHandler,
+  AgentInvocation,
+  AgentResult,
+  MessageSender,
+} from "./agent-handler.js";
 import CommandHandler from "./command-handler.js";
 
-const mockHandlerRun = vi.fn<(invocation: AgentInvocation, sender: MessageSender) => Promise<AgentResult>>();
+const mockHandlerRun =
+  vi.fn<
+    (invocation: AgentInvocation, sender: MessageSender) => Promise<AgentResult>
+  >();
 
 const mockHandler: AgentHandler = {
   run: mockHandlerRun,
@@ -87,6 +99,7 @@ const INVOCATION_MSG = {
   system_prompt: "You are a tester",
   user_prompt: "Test the login flow",
   secrets_to_redact: ["secret123"],
+  artifacts_dir: "/tmp/artifacts",
   output_format_json_schema_str: JSON.stringify({
     type: "json_schema",
     schema: { type: "object" },
@@ -135,8 +148,7 @@ describe("WebSocketSession", () => {
       mockHandlerRun.mockImplementation(
         () =>
           new Promise((r) => {
-            resolveAgent = () =>
-              r({ structuredOutput: { success: true } });
+            resolveAgent = () => r({ structuredOutput: { success: true } });
           }),
       );
 
@@ -158,8 +170,7 @@ describe("WebSocketSession", () => {
       mockHandlerRun.mockImplementation(
         () =>
           new Promise((r) => {
-            resolveAgent = () =>
-              r({ structuredOutput: { success: true } });
+            resolveAgent = () => r({ structuredOutput: { success: true } });
           }),
       );
 
@@ -251,9 +262,7 @@ describe("WebSocketSession", () => {
     });
 
     it("sends error message when agent throws", async () => {
-      mockHandlerRun.mockRejectedValueOnce(
-        new Error("agent crashed"),
-      );
+      mockHandlerRun.mockRejectedValueOnce(new Error("agent crashed"));
 
       const { session, ws } = createSession();
       const done = session.run();
@@ -336,36 +345,7 @@ describe("WebSocketSession", () => {
   });
 
   describe("pre-agent invocation commands", () => {
-    it("executes pre-agent commands and sends success result", async () => {
-      mockCommandExecute.mockResolvedValueOnce({ exitCode: 0 });
-
-      const { session, ws } = createSession();
-      const done = session.run();
-      sendMessage(ws, {
-        ...INVOCATION_MSG,
-        pre_agent_invocation_commands: [
-          { command: "npm test", cwd: "/app", env: { CI: "true" } },
-        ],
-      });
-      await done;
-
-      expect(CommandHandler).toHaveBeenCalledWith(
-        { command: "npm test", cwd: "/app", env: { CI: "true" } },
-        expect.any(Object),
-        expect.any(Object),
-        expect.any(Object),
-        expect.any(AbortController),
-        expect.any(Function),
-        expect.any(Function),
-      );
-
-      const sent = parseSentMessages(ws);
-      const result = sent.find((m) => m.message_type === "result_message");
-      expect(result).toBeDefined();
-      expect(result!.structured_output.success).toBe(true);
-    });
-
-    it("does not call handler.run when pre-agent command succeeds", async () => {
+    it("continues to agent when pre-agent command exits with 0", async () => {
       mockCommandExecute.mockResolvedValueOnce({ exitCode: 0 });
 
       const { session, ws } = createSession();
@@ -376,10 +356,10 @@ describe("WebSocketSession", () => {
       });
       await done;
 
-      expect(mockHandlerRun).not.toHaveBeenCalled();
+      expect(mockHandlerRun).toHaveBeenCalled();
     });
 
-    it("sends failure result when pre-agent command exits with non-zero code", async () => {
+    it("sends error message when pre-agent command exits with non-zero code", async () => {
       mockCommandExecute.mockResolvedValueOnce({
         exitCode: 1,
         error: new Error("test failed"),
@@ -394,9 +374,9 @@ describe("WebSocketSession", () => {
       await done;
 
       const sent = parseSentMessages(ws);
-      const result = sent.find((m) => m.message_type === "result_message");
-      expect(result).toBeDefined();
-      expect(result!.structured_output.success).toBe(false);
+      const error = sent.find((m) => m.message_type === "error_message");
+      expect(error).toBeDefined();
+      expect(error!.error).toContain("Command failed with exit code: 1");
     });
 
     it("sends error and result messages when command execution throws", async () => {
@@ -414,9 +394,9 @@ describe("WebSocketSession", () => {
       const errors = sent.filter((m) => m.message_type === "error_message");
       expect(errors.length).toBeGreaterThan(0);
 
-      const result = sent.find((m) => m.message_type === "result_message");
-      expect(result).toBeDefined();
-      expect(result!.structured_output.success).toBe(false);
+      const error = sent.find((m) => m.message_type === "error_message");
+      expect(error).toBeDefined();
+      expect(error!.error).toContain("spawn failed");
     });
 
     it("runs agent normally when no pre-agent commands are provided", async () => {

package/src/session.ts

@@ -1,5 +1,3 @@
-import fs from "fs";
-import path from "path";
 import { WebSocket } from "ws";
 
 import type { AgentHandler, MessageSender } from "./agent-handler.js";
@@ -13,14 +11,12 @@ import type {
 } from "./types.js";
 import { sleep } from "./utils.js";
 import { createLogger, defaultLogger, type Logger } from "./logger.js";
-import { DEFAULT_ARTIFACTS_DIR } from "./constants.js";
 import CommandHandler from "./command-handler.js";
 import DownloadHandler from "./download-handler.js";
 
 export interface SessionConfig {
   handler: AgentHandler;
   uploadTracker: UploadTracker;
-  defaultModel?: string;
   uploadTimeoutMs?: number;
   artifactWaitMs?: number;
   postInvocationDelayMs?: number;
@@ -129,20 +125,21 @@ export class WebSocketSession {
     this.logger = createLogger(message.source_id);
     this.config.uploadTracker.setLogger(this.logger);
 
-    const artifactsDir = message.artifacts_dir ?? DEFAULT_ARTIFACTS_DIR;
-    this.artifactManager = new ArtifactManager({
-      artifactsDir,
-      uploadTracker: this.config.uploadTracker,
-      send: (msg) => this.send(msg),
-    });
-    this.artifactManager.setLogger(this.logger);
+    const artifactsDir = message.artifacts_dir;
+    if (artifactsDir) {
+      this.artifactManager = new ArtifactManager({
+        artifactsDir,
+        uploadTracker: this.config.uploadTracker,
+        send: (msg) => this.send(msg),
+      });
+      this.artifactManager.setLogger(this.logger);
+    }
 
     const outputFormat = JSON.parse(message.output_format_json_schema_str) as {
       type: "json_schema";
       schema: Record<string, unknown>;
     };
-    const model =
-      message.preferred_model ?? this.config.defaultModel ?? "default";
+    const model = message.preferred_model;
 
     this.logger.log(`Received invocation: model=${model}`);
 
@@ -157,87 +154,48 @@ export class WebSocketSession {
         }
       }
       if (message.pre_agent_invocation_commands) {
-        const stdoutFile = path.join(artifactsDir, `cmd-stdout.out`);
-        const stderrFile = path.join(artifactsDir, `cmd-stderr.out`);
-        const stdoutStream = fs.createWriteStream(stdoutFile);
-        const stderrStream = fs.createWriteStream(stderrFile);
-
         for (const command of message.pre_agent_invocation_commands) {
           try {
             this.logger.log(
               `Executing command: ${command.command} in directory: ${command.cwd}`,
             );
-            const commandHandler = new CommandHandler(
+            const commandHandler = new CommandHandler({
               command,
-              this.logger,
-              stdoutStream,
-              stderrStream,
-              this.abortController,
-              (stdout) =>
+              logger: this.logger,
+              abortController: this.abortController,
+              onStdout: (stdout) =>
                 this.send({
                   message_type: "assistant_message",
                   text_blocks: [stdout],
                 }),
-              (stderr) =>
+              onStderr: (stderr) =>
                 this.send({
                   message_type: "assistant_message",
                   text_blocks: [stderr],
                 }),
-            );
-            try {
-              const result = await commandHandler.execute();
-              if (result.exitCode === 0) {
-                this.send({
-                  message_type: "result_message",
-                  structured_output: {
-                    success: true,
-                    steps: [],
-                    summary: "Workflow completed successfully",
-                  },
-                  metadata: {},
-                });
-                return;
-              } else {
-                this.logger.error(
-                  "Command failed with exit code:",
-                  result.exitCode,
-                );
-                this.send({
-                  message_type: "result_message",
-                  structured_output: {
-                    success: false,
-                    steps: [],
-                    summary: "Workflow completed with failure",
-                  },
-                  metadata: {},
-                });
-                return;
-              }
-            } catch (error) {
-              this.logger.error("Error executing command:", error);
+            });
+
+            const result = await commandHandler.execute();
+            if (result.exitCode !== 0) {
+              this.logger.error(
+                "Command failed with exit code:",
+                result.exitCode,
+              );
               this.send({
                 message_type: "error_message",
-                error: String(error),
-                metadata: {},
-              });
-              this.send({
-                message_type: "result_message",
-                structured_output: {
-                  success: false,
-                  steps: [],
-                  summary: "Workflow completed with failure",
-                },
+                error: "Command failed with exit code: " + result.exitCode,
                 metadata: {},
               });
-              throw error;
+              return;
             }
           } catch (error) {
-            this.logger.error("Error executing command:", error);
+            this.logger.error(
+              "Error executing pre-agent invocation command:",
+              error,
+            );
             throw error;
           }
         }
-        stderrStream.close();
-        stdoutStream.close();
       }
 
       const sender: MessageSender = {
@@ -289,7 +247,7 @@ export class WebSocketSession {
       this.logger.error("Error in agent execution:", error);
       this.send({
         message_type: "error_message",
-        error: String(error),
+        error: error instanceof Error ? error.message : JSON.stringify(error),
         metadata: {},
       });
     }

package/src/types.ts

@@ -17,7 +17,7 @@ interface InvocationMessage {
   secrets_to_redact: string[];
   agent_env?: Record<string, string>;
   output_format_json_schema_str: string;
-  preferred_model?: string;
+  preferred_model: string;
   artifacts_dir?: string;
   pre_agent_invocation_commands?: Command[];
   post_agent_invocation_commands?: Command[];
@@ -42,14 +42,6 @@ interface AssistantMessage {
 
 interface ArtifactUploadRequestMessage {
   message_type: "artifact_upload_request_message";
-  artifact_type:
-    | "screenshot"
-    | "video"
-    | "tool_calls"
-    | "javascript"
-    | "python"
-    | "shellscript"
-    | "other";
   filename: string;
   filepath: string;
 }
@@ -68,17 +60,11 @@ interface ErrorMessage {
   metadata: Record<string, unknown>;
 }
 
-interface StreamEndMessage {
-  message_type: "stream_end";
-  content: string;
-}
-
 type OutgoingMessage =
   | ResultMessage
   | AssistantMessage
   | ArtifactUploadRequestMessage
-  | ErrorMessage
-  | StreamEndMessage;
+  | ErrorMessage;
 
 type IncomingMessage =
   | InvocationMessage
@@ -95,7 +81,6 @@ export type {
   ArtifactUploadRequestMessage,
   ArtifactUploadResponseMessage,
   ErrorMessage,
-  StreamEndMessage,
   Command,
   RuntimeEnvironmentDownloadable,
 };

package/dist/default-handler.d.ts

@@ -1,3 +0,0 @@
-import type { AgentHandler } from "./agent-handler.js";
-export declare const defaultHandler: AgentHandler;
-//# sourceMappingURL=default-handler.d.ts.map

package/dist/default-handler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"default-handler.d.ts","sourceRoot":"","sources":["../src/default-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EAIb,MAAM,oBAAoB,CAAC;AAkB5B,eAAO,MAAM,cAAc,EAAE,YAsE5B,CAAC"}

package/dist/default-handler.js

@@ -1,76 +0,0 @@
-import { query } from "@anthropic-ai/claude-agent-sdk";
-function extractTextFromContent(content) {
-    const parts = [];
-    for (const block of content) {
-        if (typeof block === "object" &&
-            block !== null &&
-            "type" in block &&
-            block.type === "text" &&
-            "text" in block) {
-            parts.push(String(block.text));
-        }
-    }
-    return parts.join("\n");
-}
-export const defaultHandler = {
-    async run(invocation, sender) {
-        const abortController = new AbortController();
-        const onAbort = () => abortController.abort();
-        invocation.signal.addEventListener("abort", onAbort, { once: true });
-        try {
-            const conversation = query({
-                prompt: invocation.userPrompt,
-                options: {
-                    systemPrompt: invocation.systemPrompt,
-                    model: invocation.model,
-                    outputFormat: invocation.outputFormat,
-                    abortController,
-                    cwd: process.cwd(),
-                    env: { ...process.env, ...invocation.env },
-                    tools: { type: "preset", preset: "claude_code" },
-                    permissionMode: "bypassPermissions",
-                    allowDangerouslySkipPermissions: true,
-                },
-            });
-            let structuredOutput = {};
-            const metadata = {};
-            for await (const message of conversation) {
-                if (message.type === "assistant") {
-                    const text = extractTextFromContent(message.message?.content ?? []);
-                    if (text) {
-                        sender.sendAssistantMessage([text]);
-                    }
-                }
-                else if (message.type === "result") {
-                    metadata.duration_ms = message.duration_ms;
-                    metadata.duration_api_ms = message.duration_api_ms;
-                    metadata.num_turns = message.num_turns;
-                    metadata.total_cost_usd = message.total_cost_usd;
-                    metadata.usage = message.usage;
-                    metadata.session_id = message.session_id;
-                    if (message.subtype === "success") {
-                        if (message.structured_output != null) {
-                            structuredOutput =
-                                message.structured_output;
-                        }
-                        else {
-                            structuredOutput = { result: message.result };
-                        }
-                    }
-                    else {
-                        structuredOutput = {
-                            error: message.subtype,
-                            errors: "errors" in message ? message.errors : [],
-                        };
-                        sender.sendErrorMessage(`Agent ended with ${message.subtype}`, metadata);
-                    }
-                }
-            }
-            return { structuredOutput, metadata };
-        }
-        finally {
-            invocation.signal.removeEventListener("abort", onAbort);
-        }
-    },
-};
-//# sourceMappingURL=default-handler.js.map

package/dist/default-handler.js.map

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