doer-agent 0.2.0 → 0.2.1

package/dist/agent.js

@@ -764,7 +764,33 @@ 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 {
+        requestId,
+        command,
+        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)));
@@ -781,6 +807,16 @@ async function handleShellRpcMessage(args) {
         responseSubject = request.responseSubject;
         const shellPath = resolveShellPath();
         const taskWorkspace = resolveTaskWorkspace(request.cwd);
+        const codexAuth = await prepareCodexAuthBundle(request.codexAuthBundle);
+        const baseTaskEnvPatch = {
+            ...request.runtimeEnvPatch,
+            ...(codexAuth?.envPatch ?? {}),
+            WORKSPACE: taskWorkspace,
+        };
+        const taskGitEnv = await prepareTaskGitEnv({
+            cwd: taskWorkspace,
+            baseEnvPatch: baseTaskEnvPatch,
+        });
         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, {
@@ -789,8 +825,10 @@ async function handleShellRpcMessage(args) {
             detached: process.platform !== "win32",
             env: {
                 ...process.env,
-                WORKSPACE: taskWorkspace,
+                ...baseTaskEnvPatch,
+                ...taskGitEnv.envPatch,
                 PATH: taskPath,
+                DOER_AGENT_TOKEN: args.agentToken,
             },
             stdio: ["ignore", "pipe", "pipe"],
         });
@@ -866,6 +904,7 @@ function subscribeToShellRpc(args) {
                 msg,
                 jetstream: args.jetstream,
                 agentId: args.agentId,
+                agentToken: args.agentToken,
             });
         },
     });
@@ -1042,6 +1081,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 +1432,7 @@ async function main() {
         jetstream,
         userId,
         agentId: initialAgentId,
+        agentToken,
     });
     for (const pendingTaskId of pendingTaskIds) {
         await waitForAvailableSlot();
@@ -1535,6 +1578,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.1",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",