doer-agent 0.2.0 → 0.2.2

package/dist/agent.js

@@ -357,6 +357,20 @@ function writeTaskStream(taskId, stream, chunk) {
 function writeTaskUpload(taskId, message) {
     process.stdout.write(`[doer-agent][task=${taskId}][upload] ${message}\n`);
 }
+function writeRpcStream(requestId, stream, chunk) {
+    const target = stream === "stdout" ? process.stdout : process.stderr;
+    const lines = chunk.replace(/\r/g, "\n").split("\n");
+    for (let i = 0; i < lines.length; i += 1) {
+        const line = lines[i];
+        if (line.length === 0 && i === lines.length - 1) {
+            continue;
+        }
+        target.write(`[doer-agent][rpc=${requestId}][${stream}] ${line}\n`);
+    }
+}
+function writeRpcStatus(requestId, message) {
+    process.stdout.write(`[doer-agent][rpc=${requestId}][status] ${message}\n`);
+}
 function isLikelyNatsAuthError(error) {
     const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
     return (message.includes("auth")
@@ -753,10 +767,15 @@ function normalizeShellRpcRequest(args) {
     if (requestAgentId !== args.agentId) {
         throw new Error("agent id mismatch");
     }
+    const kind = args.request.kind === "apply_patch" ? "apply_patch" : "shell";
     const command = typeof args.request.command === "string" ? args.request.command.trim() : "";
-    if (!command) {
+    const patch = typeof args.request.patch === "string" ? args.request.patch : "";
+    if (kind === "shell" && !command) {
         throw new Error("missing command");
     }
+    if (kind === "apply_patch" && !patch.trim()) {
+        throw new Error("missing patch");
+    }
     const responseSubject = typeof args.request.responseSubject === "string" ? args.request.responseSubject.trim() : "";
     if (!responseSubject) {
         throw new Error("missing responseSubject");
@@ -764,7 +783,35 @@ function normalizeShellRpcRequest(args) {
     const cwd = typeof args.request.cwd === "string" && args.request.cwd.trim() ? args.request.cwd.trim() : null;
     const timeoutRaw = Number(args.request.timeoutMs);
     const timeoutMs = Number.isFinite(timeoutRaw) ? Math.max(1000, Math.min(Math.floor(timeoutRaw), 300000)) : 30000;
-    return { requestId, command, cwd, timeoutMs, responseSubject };
+    return {
+        kind,
+        requestId,
+        command: kind === "shell" ? command : null,
+        patch: kind === "apply_patch" ? patch : null,
+        cwd,
+        timeoutMs,
+        responseSubject,
+        runtimeEnvPatch: normalizeEnvPatch(args.request.runtimeEnvPatch),
+        codexAuthBundle: normalizeShellRpcCodexAuthBundle(args.request.codexAuth),
+    };
+}
+function normalizeShellRpcCodexAuthBundle(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return null;
+    }
+    const row = value;
+    const authJson = typeof row.authJson === "string" ? row.authJson : null;
+    if (!authJson) {
+        return null;
+    }
+    return {
+        taskId: typeof row.taskId === "string" ? row.taskId : undefined,
+        authMode: row.authMode === "oauth" ? "oauth" : row.authMode === "api_key" ? "api_key" : undefined,
+        issuedAt: typeof row.issuedAt === "string" ? row.issuedAt : undefined,
+        expiresAt: typeof row.expiresAt === "string" ? row.expiresAt : undefined,
+        authJson,
+        apiKey: typeof row.apiKey === "string" || row.apiKey === null ? row.apiKey : undefined,
+    };
 }
 function publishShellRpcResponse(args) {
     args.nc.publish(args.responseSubject, shellRpcCodec.encode(JSON.stringify(args.payload)));
@@ -779,28 +826,61 @@ async function handleShellRpcMessage(args) {
         const request = normalizeShellRpcRequest({ request: payload, agentId: args.agentId });
         requestId = request.requestId;
         responseSubject = request.responseSubject;
+        const startedAtMs = Date.now();
         const shellPath = resolveShellPath();
         const taskWorkspace = resolveTaskWorkspace(request.cwd);
-        const runtimeBinPath = path.join(AGENT_PROJECT_DIR, "runtime/bin");
-        const taskPath = [runtimeBinPath, process.env.PATH || ""].filter(Boolean).join(path.delimiter);
-        const child = spawn(request.command, {
+        const codexAuth = await prepareCodexAuthBundle(request.codexAuthBundle);
+        const baseTaskEnvPatch = {
+            ...request.runtimeEnvPatch,
+            ...(codexAuth?.envPatch ?? {}),
+            WORKSPACE: taskWorkspace,
+        };
+        const taskGitEnv = await prepareTaskGitEnv({
             cwd: taskWorkspace,
-            shell: shellPath,
-            detached: process.platform !== "win32",
-            env: {
-                ...process.env,
-                WORKSPACE: taskWorkspace,
-                PATH: taskPath,
-            },
-            stdio: ["ignore", "pipe", "pipe"],
+            baseEnvPatch: baseTaskEnvPatch,
         });
+        const runtimeBinPath = path.join(AGENT_PROJECT_DIR, "runtime/bin");
+        const taskPath = [runtimeBinPath, process.env.PATH || ""].filter(Boolean).join(path.delimiter);
+        const child = request.kind === "apply_patch"
+            ? spawn("apply_patch", {
+                cwd: taskWorkspace,
+                detached: process.platform !== "win32",
+                env: {
+                    ...process.env,
+                    ...baseTaskEnvPatch,
+                    ...taskGitEnv.envPatch,
+                    PATH: taskPath,
+                    DOER_AGENT_TOKEN: args.agentToken,
+                },
+                stdio: ["pipe", "pipe", "pipe"],
+            })
+            : spawn(request.command ?? "", {
+                cwd: taskWorkspace,
+                shell: shellPath,
+                detached: process.platform !== "win32",
+                env: {
+                    ...process.env,
+                    ...baseTaskEnvPatch,
+                    ...taskGitEnv.envPatch,
+                    PATH: taskPath,
+                    DOER_AGENT_TOKEN: args.agentToken,
+                },
+                stdio: ["ignore", "pipe", "pipe"],
+            });
+        if (request.kind === "apply_patch") {
+            child.stdin?.write(request.patch ?? "");
+            child.stdin?.end();
+        }
+        writeRpcStatus(requestId, `started kind=${request.kind} cwd=${taskWorkspace} shell=${request.kind === "shell" ? shellPath : "apply_patch"}`);
         child.stdout.setEncoding("utf8");
         child.stderr.setEncoding("utf8");
         child.stdout.on("data", (chunk) => {
             stdout += chunk;
+            writeRpcStream(requestId, "stdout", chunk);
         });
         child.stderr.on("data", (chunk) => {
             stderr += chunk;
+            writeRpcStream(requestId, "stderr", chunk);
         });
         let timedOut = false;
         const timeout = setTimeout(() => {
@@ -832,6 +912,7 @@ async function handleShellRpcMessage(args) {
                 ...(timedOut ? { error: `Command timed out after ${request.timeoutMs}ms` } : {}),
             },
         });
+        writeRpcStatus(requestId, `${timedOut ? "timed_out" : "completed"} exitCode=${result.exitCode ?? "null"} signal=${result.signal ?? "null"} durationMs=${Date.now() - startedAtMs}`);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -850,6 +931,7 @@ async function handleShellRpcMessage(args) {
                 },
             });
         }
+        writeRpcStatus(requestId, `failed error=${message}`);
         writeAgentError(`shell rpc failed requestId=${requestId} error=${message}`);
     }
 }
@@ -866,6 +948,7 @@ function subscribeToShellRpc(args) {
                 msg,
                 jetstream: args.jetstream,
                 agentId: args.agentId,
+                agentToken: args.agentToken,
             });
         },
     });
@@ -1042,6 +1125,9 @@ async function prepareTaskCodexAuth(args) {
         writeAgentError(`task=${args.taskId} codex auth sync skipped: ${message}`);
         return null;
     });
+    return await prepareCodexAuthBundle(bundle);
+}
+async function prepareCodexAuthBundle(bundle) {
     if (!bundle || typeof bundle.authJson !== "string") {
         return null;
     }
@@ -1390,6 +1476,7 @@ async function main() {
         jetstream,
         userId,
         agentId: initialAgentId,
+        agentToken,
     });
     for (const pendingTaskId of pendingTaskIds) {
         await waitForAvailableSlot();
@@ -1535,6 +1622,7 @@ async function main() {
                 jetstream,
                 userId,
                 agentId: refreshedAgentId,
+                agentToken,
             });
             for (const pendingTaskId of pendingTaskIds) {
                 await waitForAvailableSlot();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",