doer-agent 0.3.6 → 0.4.1

package/dist/agent.js

@@ -9,6 +9,8 @@ const DEFAULT_SERVER_BASE_URL = "https://doer.cranix.net";
 const AGENT_MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const AGENT_PROJECT_DIR = path.join(AGENT_MODULE_DIR, "..");
 const AGENT_PACKAGE_JSON_PATH = path.join(AGENT_PROJECT_DIR, "package.json");
+const HEARTBEAT_INTERVAL_MS = 5_000;
+const HEARTBEAT_FAILURE_THRESHOLD = 3;
 let activeTaskLogContext = null;
 let workspaceRootOverride = null;
 const fsRpcCodec = StringCodec();
@@ -605,10 +607,13 @@ function resolveAgentSettingsDir() {
 function resolveAgentSettingsFilePath() {
     return path.join(resolveAgentSettingsDir(), "config.json");
 }
+function resolveAgentModelInstructionsFilePath() {
+    return path.join(resolveAgentSettingsDir(), "model-instructions.md");
+}
 function createDefaultAgentSettingsConfig() {
     return {
         general: {
-            firstTurnPrompt: null,
+            personality: "pragmatic",
         },
         codex: {
             model: "gpt-5.4",
@@ -671,6 +676,9 @@ function normalizeNullableString(value) {
     const trimmed = value.trim();
     return trimmed ? trimmed : null;
 }
+function normalizeCodexPersonality(value, fallback) {
+    return value === "friendly" || value === "pragmatic" ? value : fallback;
+}
 function normalizeAgentSettingsConfig(value, fallback) {
     const base = fallback ?? createDefaultAgentSettingsConfig();
     const raw = value && typeof value === "object" && !Array.isArray(value) ? value : {};
@@ -685,7 +693,7 @@ function normalizeAgentSettingsConfig(value, fallback) {
     const figma = raw.figma && typeof raw.figma === "object" ? raw.figma : {};
     return {
         general: {
-            firstTurnPrompt: normalizeNullableString(general.firstTurnPrompt) ?? base.general.firstTurnPrompt,
+            personality: normalizeCodexPersonality(general.personality, base.general.personality),
         },
         codex: {
             model: typeof codex.model === "string" && codex.model.trim() ? codex.model.trim() : base.codex.model,
@@ -757,6 +765,20 @@ async function writeAgentSettingsConfig(config) {
     await mkdir(dir, { recursive: true });
     await writeFile(resolveAgentSettingsFilePath(), `${JSON.stringify(config, null, 2)}\n`, "utf8");
 }
+async function readAgentModelInstructions() {
+    const raw = await readFile(resolveAgentModelInstructionsFilePath(), "utf8").catch(() => "");
+    return raw.trim() ? raw : null;
+}
+async function writeAgentModelInstructions(value) {
+    const filePath = resolveAgentModelInstructionsFilePath();
+    const nextValue = typeof value === "string" ? value.trim() : "";
+    if (!nextValue) {
+        await unlink(filePath).catch(() => undefined);
+        return;
+    }
+    await mkdir(resolveAgentSettingsDir(), { recursive: true });
+    await writeFile(filePath, value ?? "", "utf8");
+}
 function maskSecretPreview(secret) {
     if (secret.length <= 6) {
         return `${secret.slice(0, 1)}***${secret.slice(-1)}`;
@@ -769,7 +791,7 @@ function toMaskedSecret(value) {
     }
     return { has: true, masked: maskSecretPreview(value), length: value.length };
 }
-function toAgentSettingsPublic(config) {
+async function toAgentSettingsPublic(config) {
     const realtimeKey = toMaskedSecret(config.realtime.apiKey);
     const gitOauth = toMaskedSecret(config.git.oauthToken);
     const awsSecret = toMaskedSecret(config.aws.secretAccessKey);
@@ -778,9 +800,11 @@ function toAgentSettingsPublic(config) {
     const notionToken = toMaskedSecret(config.notion.apiToken);
     const slackToken = toMaskedSecret(config.slack.botToken);
     const figmaToken = toMaskedSecret(config.figma.apiToken);
+    const customInstructions = await readAgentModelInstructions();
     return {
         general: {
-            firstTurnPrompt: config.general.firstTurnPrompt,
+            personality: config.general.personality,
+            customInstructions,
         },
         codex: {
             model: config.codex.model,
@@ -872,7 +896,7 @@ function normalizeAgentSettingsPatch(value) {
         assignNested(section, key, raw[flatKey]);
         delete patch[flatKey];
     };
-    move("firstTurnPrompt", "general", "firstTurnPrompt");
+    move("personality", "general", "personality");
     move("codexModel", "codex", "model");
     move("codexAuthMode", "codex", "authMode");
     move("realtimeModel", "realtime", "model");
@@ -1341,17 +1365,27 @@ function normalizeCodexModel(value) {
     const normalized = typeof value === "string" ? value.trim() : "";
     return normalized || "gpt-5.4";
 }
+function toTomlStringLiteral(value) {
+    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
 function buildManagedCodexArgs(args) {
     const promptArgs = ["--", args.prompt];
     const fixedArgs = ["--dangerously-bypass-approvals-and-sandbox"];
+    const configArgs = [
+        ...(args.personality ? ["--config", `personality=${toTomlStringLiteral(args.personality)}`] : []),
+        ...(args.modelInstructionsFile
+            ? ["--config", `model_instructions_file=${toTomlStringLiteral(args.modelInstructionsFile)}`]
+            : []),
+    ];
     const imageArgs = args.imagePaths.flatMap((imagePath) => ["--image", imagePath]);
     return [
         ...fixedArgs,
+        ...configArgs,
         "--model",
         args.model,
         ...(args.sessionId
-            ? ["exec", "resume", "--json", ...imageArgs, args.sessionId, ...promptArgs]
-            : ["exec", "--json", ...imageArgs, ...promptArgs]),
+            ? ["exec", "resume", ...imageArgs, args.sessionId, ...promptArgs]
+            : ["exec", ...imageArgs, ...promptArgs]),
     ];
 }
 function buildLocalCodexCliCommand(args) {
@@ -1717,6 +1751,14 @@ async function handleSettingsRpcMessage(args) {
         const next = request.action === "update" ? normalizeAgentSettingsConfig(request.patch, existing) : existing;
         if (request.action === "update") {
             await writeAgentSettingsConfig(next);
+            const customInstructions = typeof request.patch.customInstructions === "string"
+                ? request.patch.customInstructions
+                : request.patch.customInstructions === null
+                    ? null
+                    : undefined;
+            if (customInstructions !== undefined) {
+                await writeAgentModelInstructions(customInstructions);
+            }
         }
         else if (request.defaults) {
             const filePath = resolveAgentSettingsFilePath();
@@ -1731,7 +1773,7 @@ async function handleSettingsRpcMessage(args) {
             payload: {
                 requestId,
                 ok: true,
-                settings: toAgentSettingsPublic(next),
+                settings: await toAgentSettingsPublic(next),
             },
         });
     }
@@ -2337,6 +2379,8 @@ async function handleRunRpcMessage(args) {
             const runId = request.runId ?? requestId;
             await claimRunStartSlot({ runId, sessionId: request.sessionId });
             try {
+                const localAgentSettings = await readAgentSettingsConfig(null);
+                const customInstructions = await readAgentModelInstructions();
                 const task = await startManagedRun({
                     requestId,
                     runId,
@@ -2350,6 +2394,8 @@ async function handleRunRpcMessage(args) {
                         imagePaths: request.imagePaths,
                         sessionId: request.sessionId,
                         model: request.model,
+                        personality: localAgentSettings.general.personality,
+                        modelInstructionsFile: customInstructions ? resolveAgentModelInstructionsFilePath() : null,
                     }),
                     cwd: request.cwd,
                     runtimeEnvPatch: request.runtimeEnvPatch,
@@ -3890,7 +3936,8 @@ function persistEventOrFatal(args) {
         }
     })();
 }
-async function heartbeatAgent(args) {
+async function heartbeatAgentSession(args) {
+    await args.nc.flush();
     await postJson(`${args.serverBaseUrl}/api/agent/heartbeat`, {
         userId: args.userId,
         agentToken: args.agentToken,
@@ -4330,23 +4377,45 @@ async function main() {
         else {
             writeAgentInfraError(`nats session restored agentId=${initialAgentId} servers=${jetstream.servers.join(",")} at=${formatLocalTimestamp()}`);
         }
-        let heartbeatHealthy = null;
+        let heartbeatFailures = 0;
+        let heartbeatInFlight = false;
+        let sessionInvalidated = false;
+        const invalidateAgentSession = (reason) => {
+            if (sessionInvalidated) {
+                return;
+            }
+            sessionInvalidated = true;
+            writeAgentInfraError(`closing nats session: ${reason}`);
+            void jetstream.nc.close().catch((error) => {
+                const message = error instanceof Error ? error.message : String(error);
+                writeAgentInfraError(`failed to close nats session: ${message}`);
+            });
+        };
         const heartbeatTimer = setInterval(() => {
-            void heartbeatAgent({ serverBaseUrl, userId, agentToken })
+            if (heartbeatInFlight || sessionInvalidated) {
+                return;
+            }
+            heartbeatInFlight = true;
+            void heartbeatAgentSession({ nc: jetstream.nc, serverBaseUrl, userId, agentToken })
                 .then(() => {
-                if (heartbeatHealthy === false) {
+                heartbeatInFlight = false;
+                if (heartbeatFailures > 0) {
                     writeAgentInfraError(`heartbeat reconnected at=${formatLocalTimestamp()}`);
                 }
-                heartbeatHealthy = true;
+                heartbeatFailures = 0;
             })
                 .catch((error) => {
+                heartbeatInFlight = false;
                 const message = error instanceof Error ? error.message : String(error);
-                if (heartbeatHealthy !== false) {
-                    writeAgentInfraError(`heartbeat failed: ${message}`);
+                heartbeatFailures += 1;
+                if (heartbeatFailures > 1) {
+                    writeAgentInfraError(`heartbeat failed: ${message} (count=${heartbeatFailures}/${HEARTBEAT_FAILURE_THRESHOLD})`);
+                }
+                if (heartbeatFailures >= HEARTBEAT_FAILURE_THRESHOLD) {
+                    invalidateAgentSession(`heartbeat failure threshold reached at=${formatLocalTimestamp()}`);
                 }
-                heartbeatHealthy = false;
             });
-        }, 10_000);
+        }, HEARTBEAT_INTERVAL_MS);
         subscribeToFsRpc({
             jetstream,
             serverBaseUrl,

package/package.json

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

package/runtime/bin/doer-mcp-proxy

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-import net from "node:net";
-
-function debugLog(...parts) {
-  const now = new Date().toISOString();
-  process.stderr.write(`[doer-mcp-proxy][${now}] ${parts.join(" ")}\n`);
-}
-
-const socketPath = (process.env.DOER_MCP_SOCKET || "").trim();
-
-if (!socketPath) {
-  process.stderr.write("doer-mcp-proxy error: DOER_MCP_SOCKET is not set\n");
-  process.exit(1);
-}
-
-debugLog("connecting", `socket=${socketPath}`);
-const socket = net.createConnection(socketPath);
-
-socket.on("connect", () => {
-  debugLog("connected");
-  process.stdin.pipe(socket);
-  socket.pipe(process.stdout);
-});
-
-socket.on("error", (error) => {
-  const message = error instanceof Error ? error.message : String(error);
-  process.stderr.write(`doer-mcp-proxy error: ${message}\n`);
-  process.exit(1);
-});
-
-socket.on("close", () => {
-  debugLog("closed");
-  process.exit(0);
-});
-
-process.stdin.on("error", () => {
-  socket.destroy();
-});