@tencent-ai/agent-harness-linux-arm64-musl 0.1.5 → 0.1.6

package/bin/runtime/codebuddy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-ai/codebuddy-code",
-  "version": "2.139.0",
+  "version": "2.143.1",
   "private": true,
   "description": "CodeBuddy runtime embedded in @tencent-ai/agent-harness",
   "license": "SEE LICENSE IN LICENSE.txt",

package/bin/runtime/codebuddy/product.cloudhosted.json

@@ -71,7 +71,11 @@
         "WaitForMcpServers",
         "Workflow",
         "Monitor",
-        "REPL"
+        "REPL",
+        "A2AGetAgentCard",
+        "A2ASendMessage",
+        "A2AGetTask",
+        "A2ACancelTask"
       ],
       "tags": [
         "cli",
@@ -299,11 +303,9 @@
     {
       "name": "Plan",
       "instructions": "agent-plan-instructions",
-      "description": "Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. \"src/components/**/*.tsx\"), search code for keywords (eg. \"API endpoints\"), or answer questions about the codebase (eg. \"how do API endpoints work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"very thorough\" for comprehensive analysis across multiple locations and naming conventions. (Tools: All tools)",
+      "description": "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a multi-step task before writing code. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs. Read-only: it designs but does not modify files or exit plan mode; the caller reviews the plan and implements it.",
       "tools": [
         "Read",
-        "Write",
-        "Edit",
         "Bash",
         "PowerShell",
         "Glob",
@@ -474,7 +476,7 @@
       }
     },
     {
-      "credits": "x0.25 credits",
+      "credits": "x0.51 credits",
       "id": "deepseek-v4-pro",
       "name": "Deepseek-V4-Pro",
       "vendor": "f",
@@ -498,7 +500,7 @@
       }
     },
     {
-      "credits": "x0.08 credits",
+      "credits": "x0.17 credits",
       "id": "deepseek-v4-flash",
       "name": "Deepseek-V4-Flash",
       "vendor": "f",
@@ -738,7 +740,7 @@
       }
     },
     {
-      "credits": "x0.25 credits",
+      "credits": "x0.51 credits",
       "id": "deepseek-v4-pro-exclusive",
       "name": "Deepseek-V4-Pro",
       "vendor": "f",
@@ -820,6 +822,6 @@
     "SelectImage": true,
     "SkipToolCallSupportCheck": true
   },
-  "commit": "adfab0e1298bb39ea54b1911496feb79cf1fce66",
-  "date": "2026-08-28T09:29:41.937Z"
+  "commit": "89709f860396a62d75e8cc01e9514cf221817e79",
+  "date": "2026-09-04T10:20:16.694Z"
 }

package/bin/runtime/codebuddy/product.internal.json

@@ -85,7 +85,11 @@
         "WaitForMcpServers",
         "Workflow",
         "Monitor",
-        "REPL"
+        "REPL",
+        "A2AGetAgentCard",
+        "A2ASendMessage",
+        "A2AGetTask",
+        "A2ACancelTask"
       ],
       "tags": [
         "cli",
@@ -178,6 +182,9 @@
       "name": "terminalTitleGenerator",
       "instructions": "terminal-title-generator-instructions",
       "description": "Generate terminal window titles from conversation topics.",
+      "models": [
+        "builtin-lite"
+      ],
       "tags": [
         "cli",
         "terminal-title-generator"
@@ -314,11 +321,9 @@
     {
       "name": "Plan",
       "instructions": "agent-plan-instructions",
-      "description": "Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. \"src/components/**/*.tsx\"), search code for keywords (eg. \"API endpoints\"), or answer questions about the codebase (eg. \"how do API endpoints work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"very thorough\" for comprehensive analysis across multiple locations and naming conventions. (Tools: All tools)",
+      "description": "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a multi-step task before writing code. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs. Read-only: it designs but does not modify files or exit plan mode; the caller reviews the plan and implements it.",
       "tools": [
         "Read",
-        "Write",
-        "Edit",
         "Bash",
         "Glob",
         "Grep",
@@ -827,6 +832,6 @@
       }
     }
   },
-  "commit": "adfab0e1298bb39ea54b1911496feb79cf1fce66",
-  "date": "2026-08-28T09:29:41.939Z"
+  "commit": "89709f860396a62d75e8cc01e9514cf221817e79",
+  "date": "2026-09-04T10:20:16.659Z"
 }

package/bin/runtime/codebuddy/product.ioa.json

@@ -107,7 +107,11 @@
         "WaitForMcpServers",
         "Workflow",
         "Monitor",
-        "REPL"
+        "REPL",
+        "A2AGetAgentCard",
+        "A2ASendMessage",
+        "A2AGetTask",
+        "A2ACancelTask"
       ],
       "tags": [
         "cli",
@@ -205,7 +209,7 @@
       "instructions": "terminal-title-generator-instructions",
       "description": "Generate terminal window titles from conversation topics.",
       "models": [
-        "lite"
+        "builtin-lite"
       ],
       "tags": [
         "cli",
@@ -349,11 +353,9 @@
     {
       "name": "Plan",
       "instructions": "agent-plan-instructions",
-      "description": "Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. \"src/components/**/*.tsx\"), search code for keywords (eg. \"API endpoints\"), or answer questions about the codebase (eg. \"how do API endpoints work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"very thorough\" for comprehensive analysis across multiple locations and naming conventions. (Tools: All tools)",
+      "description": "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a multi-step task before writing code. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs. Read-only: it designs but does not modify files or exit plan mode; the caller reviews the plan and implements it.",
       "tools": [
         "Read",
-        "Write",
-        "Edit",
         "Bash",
         "PowerShell",
         "Glob",
@@ -1323,6 +1325,6 @@
       }
     }
   },
-  "commit": "adfab0e1298bb39ea54b1911496feb79cf1fce66",
-  "date": "2026-08-28T09:29:41.938Z"
+  "commit": "89709f860396a62d75e8cc01e9514cf221817e79",
+  "date": "2026-09-04T10:20:16.660Z"
 }

package/bin/runtime/codebuddy/product.json

@@ -1041,7 +1041,7 @@
     },
     {
       "name": "tool-webfetch-description",
-      "template": "\n- Fetches content from a specified URL and processes it using an AI model\n- Takes a URL and a prompt as input\n- Fetches the URL content, converts HTML to markdown\n- Processes the content with the prompt using a small, fast model\n- Returns the model's response about the content\n- Use this tool when you need to retrieve and analyze web content\n\nUsage notes:\n  - IMPORTANT: If an MCP-provided web fetch tool is available, prefer using that tool instead of this one, as it may have fewer restrictions. All MCP-provided tools start with \"mcp__\".\n  - The URL must be a fully-formed valid URL\n  - HTTP URLs will be automatically upgraded to HTTPS\n  - The prompt should describe what information you want to extract from the page\n  - This tool is read-only and does not modify any files\n  - Results may be summarized if the content is very large\n  - Includes a self-cleaning 15-minute cache for faster responses when repeatedly accessing the same URL\n  - When a URL redirects to a different host, the tool will inform you and provide the redirect URL in a special format. You should then make a new WebFetch request with the redirect URL to fetch the content.\n"
+      "template": "\n- Fetches content from a specified URL and processes it using an AI model\n- Takes a URL and a prompt as input\n- Fetches the URL content, converts HTML to markdown\n- Processes the content with the prompt using a small, fast model\n- Returns the model's response about the content\n- Use this tool when you need to retrieve and analyze web content\n\nUsage notes:\n  - IMPORTANT: If an MCP-provided web fetch tool is available, prefer using that tool instead of this one, as it may have fewer restrictions. All MCP-provided tools start with \"mcp__\".\n  - The URL must be a fully-formed valid URL\n  - HTTP URLs will be automatically upgraded to HTTPS\n  - The prompt should describe what information you want to extract from the page\n  - This tool is read-only and does not modify any files\n  - Results may be summarized if the content is very large\n  - Includes a self-cleaning 15-minute cache for faster responses when repeatedly accessing the same URL\n  - When a URL redirects to a different host, the tool will inform you and provide the redirect URL in a special format. You should then make a new WebFetch request with the redirect URL to fetch the content.\n  - IMPORTANT: WebFetch is for text-based web content. For direct media or binary URLs, download with Bash, preserve the real extension (infer it from curl's `%{content_type}` if needed), then open with Read.\n"
     },
     {
       "name": "tool-listmcpresources-description",
@@ -1239,6 +1239,22 @@
       "name": "tool-deferexecutetool-description",
       "template": "Execute a deferred tool by name. Use this to invoke tools discovered via ToolSearch without needing them in the active tools list.\n\nUsage:\n- First use ToolSearch to discover a tool and learn its parameter schema\n- Then call this tool with the exact tool name and parameters\n- Parameters are validated against the tool's schema before execution\n- The target tool's permission checks and hooks are applied normally\n\nExample:\nDeferExecuteTool({ toolName: \"ImageGen\", params: { prompt: \"a sunset over mountains\" } })\n\nNotes:\n- If parameter validation fails, a detailed error with the expected schema is returned\n- You can skip ToolSearch if you already know the tool name and parameters from a previous turn\n- This tool follows standard permission checks (may require approval depending on permissions configuration)\n"
     },
+    {
+      "name": "tool-a2agetagentcard-description",
+      "template": "Get the Agent Card of an A2A agent available to this conversation by agent name.\nUse this before A2ASendMessage. Pass the returned Agent Card `name` as `agent_name` to A2ASendMessage / A2AGetTask / A2ACancelTask.\n\n<available_A2A_agents>\n{%- if a2aAgents and a2aAgents.length > 0 -%}\n{%- for agent in a2aAgents %}\n{{agent.name}}{% if agent.description %}：{{agent.description}}{% endif %}\n{%- endfor -%}\n{%- endif %}\n</available_A2A_agents>\n"
+    },
+    {
+      "name": "tool-a2asendmessage-description",
+      "template": "Send a message to one outbound A2A (Agent2Agent) agent authorized for this conversation.\n\nParameters:\n- `agent_name` (required): the target agent's name, exactly as returned by A2AGetAgentCard (the Agent Card `name`), or from an explicit @Agent mention.\n- `message` (required): a concise, self-contained task or question. Do not paste the whole conversation — state the goal and only the context the agent actually needs (the agent has no visibility into this conversation otherwise).\n- `skill_id` (optional): route directly to one declared skill, for @Agent.Skill-style precise dispatch. Only effective when A2AGetAgentCard reported `supports_skill_routing: true` for that agent; otherwise this is ignored.\n- `attachments` (optional): a list of files to attach to the message, each referenced by a fetchable `url` (plus optional `filename` and `media_type`). Each is sent to the agent as a standard A2A file part. The `url` must already be reachable by the remote agent — this tool sends it as-is and does NOT upload, host, or transform the file. Use this when you already have a URL for a file you want the agent to work on; obtain that URL through whatever mechanism your environment provides.\n\nThis call is NOT synchronous: it returns immediately with whatever single reply the agent gave, and does not wait for the task to finish. Check the returned status: only completed/failed/canceled/rejected are final. For ANY other status — working, submitted, input-required, or auth-required — you MUST immediately call A2AGetTask with the returned task_id, in the same turn, before doing anything else with this task. Do not wait, and do not ask the user for permission first.\n\nauth-required and input-required are NOT a signal to stop and hand off to the user by themselves — calling A2AGetTask to check status is just reading state, not performing a login or filling credentials on the user's behalf, so it does not conflict with any policy against automating logins. A2AGetTask polls automatically with backoff, relays the agent's own request (e.g. \"please sign in\", a clarifying question) to the user exactly once, and keeps waiting for the remote task to advance — it will surface the eventual outcome once the user (or the agent) resolves whatever it was waiting on.\n\nBehavior notes:\n- Calling the same `agent_id` (and `skill_id`, if used) again in a later turn continues the same conversation with that agent automatically — you don't need to restate prior context.\n- To message multiple agents in one turn, call this tool once per agent as parallel tool calls — one agent failing does not affect the others.\n- Any files or links the agent produced are returned as part of the result text.\n- Not available inside a sub-agent or team-member session — only the main conversation can call outbound A2A agents.\n"
+    },
+    {
+      "name": "tool-a2agettask-description",
+      "template": "Wait for a previously created outbound A2A task to finish, polling automatically.\n\nParameters:\n- `agent_name` (required): the same agent name passed to the original A2ASendMessage call.\n- `task_id` (required): the taskId from a prior A2ASendMessage or A2AGetTask result.\n\nThis call polls the remote task's real, current state with backoff, showing live progress as it goes, up to a bounded time/attempt limit. It returns once the task reaches a final state (completed/failed/canceled/rejected), or a \"still running\" result if the bound is hit first — if you get \"still running\", immediately call A2AGetTask again with the same task_id to keep waiting; do not give up after one bounded call.\n\nIf the task is waiting on external input or auth (input-required/auth-required), that request is relayed to the user once and polling continues with backoff — the next call/round of polling reflects the task's real state at that later point in time, not a repeat of what you already saw. Checking status this way is just reading state, not performing a login or filling credentials on the user's behalf, so calling this while the task is waiting on the user to complete a login/approval step out of band does not conflict with any policy against automating logins.\n\nNot available inside a sub-agent or team-member session — only the main conversation can query outbound A2A tasks.\n"
+    },
+    {
+      "name": "tool-a2acanceltask-description",
+      "template": "Request cancellation of a previously created outbound A2A task.\n\nParameters:\n- `agent_name` (required): the same agent name passed to the original A2ASendMessage call.\n- `task_id` (required): the taskId from a prior A2ASendMessage or A2AGetTask result.\n\nCancellation is a best-effort request, not a guarantee. If the task has already reached a terminal state (completed/failed/canceled/rejected), the call fails and the tool result will say so — that is expected, not an error to retry. Use A2AGetTask if you need to check the task's status before deciding whether to cancel it.\n\nNot available inside a sub-agent or team-member session — only the main conversation can cancel outbound A2A tasks.\n"
+    },
     {
       "name": "tool-describetool-description",
       "template": "Get detailed information about a specific tool by name.\n\nUse this when you already know the tool name and need its full definition (description and input schema). This is more efficient than searching when the tool name is known.\n\nUsage:\n- Provide the exact tool name (case-sensitive)\n- Returns the tool's full description and parameter schema\n- The tool is automatically activated for use in subsequent messages\n\nIf the tool is not found, consider using ToolSearch to discover available tools by description.\n"
@@ -1442,7 +1458,11 @@
         "WaitForMcpServers",
         "Workflow",
         "Monitor",
-        "REPL"
+        "REPL",
+        "A2AGetAgentCard",
+        "A2ASendMessage",
+        "A2AGetTask",
+        "A2ACancelTask"
       ],
       "tags": [
         "cli",
@@ -1538,7 +1558,7 @@
       "instructions": "terminal-title-generator-instructions",
       "description": "Generate terminal window titles from conversation topics.",
       "models": [
-        "lite"
+        "builtin-lite"
       ],
       "tags": [
         "cli",
@@ -1682,11 +1702,9 @@
     {
       "name": "Plan",
       "instructions": "agent-plan-instructions",
-      "description": "Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. \"src/components/**/*.tsx\"), search code for keywords (eg. \"API endpoints\"), or answer questions about the codebase (eg. \"how do API endpoints work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"very thorough\" for comprehensive analysis across multiple locations and naming conventions. (Tools: All tools)",
+      "description": "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a multi-step task before writing code. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs. Read-only: it designs but does not modify files or exit plan mode; the caller reviews the plan and implements it.",
       "tools": [
         "Read",
-        "Write",
-        "Edit",
         "Bash",
         "PowerShell",
         "Glob",
@@ -2190,8 +2208,24 @@
     {
       "name": "REPL",
       "description": "tool-repl-description"
+    },
+    {
+      "name": "A2AGetAgentCard",
+      "description": "tool-a2agetagentcard-description"
+    },
+    {
+      "name": "A2ASendMessage",
+      "description": "tool-a2asendmessage-description"
+    },
+    {
+      "name": "A2AGetTask",
+      "description": "tool-a2agettask-description"
+    },
+    {
+      "name": "A2ACancelTask",
+      "description": "tool-a2acanceltask-description"
     }
   ],
-  "commit": "adfab0e1298bb39ea54b1911496feb79cf1fce66",
-  "date": "2026-08-28T09:29:41.953Z"
+  "commit": "89709f860396a62d75e8cc01e9514cf221817e79",
+  "date": "2026-09-04T10:20:16.699Z"
 }

package/bin/runtime/codebuddy/product.selfhosted.json

@@ -63,7 +63,11 @@
         "WaitForMcpServers",
         "Workflow",
         "Monitor",
-        "REPL"
+        "REPL",
+        "A2AGetAgentCard",
+        "A2ASendMessage",
+        "A2AGetTask",
+        "A2ACancelTask"
       ],
       "tags": [
         "cli",
@@ -291,11 +295,9 @@
     {
       "name": "Plan",
       "instructions": "agent-plan-instructions",
-      "description": "Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. \"src/components/**/*.tsx\"), search code for keywords (eg. \"API endpoints\"), or answer questions about the codebase (eg. \"how do API endpoints work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"very thorough\" for comprehensive analysis across multiple locations and naming conventions. (Tools: All tools)",
+      "description": "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a multi-step task before writing code. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs. Read-only: it designs but does not modify files or exit plan mode; the caller reviews the plan and implements it.",
       "tools": [
         "Read",
-        "Write",
-        "Edit",
         "Bash",
         "PowerShell",
         "Glob",
@@ -357,6 +359,6 @@
     "ScheduledTasks": true,
     "SkipToolCallSupportCheck": true
   },
-  "commit": "adfab0e1298bb39ea54b1911496feb79cf1fce66",
-  "date": "2026-08-28T09:29:41.936Z"
+  "commit": "89709f860396a62d75e8cc01e9514cf221817e79",
+  "date": "2026-09-04T10:20:16.672Z"
 }

package/bin/vendor/shim/broker-ipc-client.cjs

@@ -10,7 +10,109 @@
 const net = require('net');
 const { spawnSync } = require('child_process');
 
-const DEFAULT_TIMEOUT_MS = 5_000;
+const DEFAULT_TIMEOUT_MS = 20_000;
+const MAX_CONCURRENT_REQUESTS = 128;
+const MAX_CONCURRENT_ASYNC_REQUESTS = MAX_CONCURRENT_REQUESTS - 1;
+const MAX_QUEUED_REQUESTS = 8192;
+const REQUEST_QUEUE_PRIORITIES = Object.freeze({ low: 0, normal: 1, high: 2 });
+let activeAsyncRequests = 0;
+let queuedRequestCount = 0;
+const requestWaiters = [new Set(), new Set(), new Set()];
+
+function requestTimeoutError() {
+    const error = new Error('Broker request timed out');
+    error.code = 'CODEBUDDY_BROKER_TIMEOUT';
+    return error;
+}
+
+function requestQueueTimeoutError() {
+    const error = new Error('Broker request timed out while waiting for an IPC slot');
+    error.code = 'CODEBUDDY_BROKER_QUEUE_TIMEOUT';
+    error.brokerRequestSent = false;
+    return error;
+}
+
+function requestQueueFullError() {
+    const error = new Error('Broker request queue is full');
+    error.code = 'CODEBUDDY_BROKER_QUEUE_FULL';
+    error.brokerRequestSent = false;
+    return error;
+}
+
+function requestQueueEvictedError() {
+    const error = new Error('Broker request was evicted from the queue by a higher-priority request');
+    error.code = 'CODEBUDDY_BROKER_QUEUE_EVICTED';
+    error.brokerRequestSent = false;
+    return error;
+}
+
+function requestQueuePriority(priority) {
+    return Object.hasOwn(REQUEST_QUEUE_PRIORITIES, priority)
+        ? REQUEST_QUEUE_PRIORITIES[priority]
+        : REQUEST_QUEUE_PRIORITIES.normal;
+}
+
+function removeRequestWaiter(waiter) {
+    if (!requestWaiters[waiter.priority].delete(waiter)) {
+        return false;
+    }
+    queuedRequestCount--;
+    return true;
+}
+
+function evictLowerPriorityRequest(priority) {
+    for (let candidatePriority = REQUEST_QUEUE_PRIORITIES.low; candidatePriority < priority; candidatePriority++) {
+        for (const waiter of requestWaiters[candidatePriority]) {
+            if (!waiter.evictable || !removeRequestWaiter(waiter)) { continue; }
+            waiter.reject(requestQueueEvictedError());
+            return true;
+        }
+    }
+    return false;
+}
+
+function acquireRequestSlot(timeoutMs, options) {
+    if (activeAsyncRequests < MAX_CONCURRENT_ASYNC_REQUESTS) {
+        activeAsyncRequests++;
+        return Promise.resolve();
+    }
+    const priority = requestQueuePriority(options.queuePriority);
+    if (queuedRequestCount >= MAX_QUEUED_REQUESTS
+        && (!options.queueEvictLowerPriority || !evictLowerPriorityRequest(priority))) {
+        return Promise.reject(requestQueueFullError());
+    }
+    return new Promise((resolve, reject) => {
+        const waiter = {
+            priority,
+            evictable: options.queueEvictable === true,
+            resolve: () => {
+                clearTimeout(waiter.timer);
+                resolve();
+            },
+            reject: error => {
+                clearTimeout(waiter.timer);
+                reject(error);
+            },
+        };
+        waiter.timer = setTimeout(() => {
+            if (!removeRequestWaiter(waiter)) { return; }
+            waiter.reject(requestQueueTimeoutError());
+        }, timeoutMs);
+        requestWaiters[priority].add(waiter);
+        queuedRequestCount++;
+    });
+}
+
+function releaseRequestSlot() {
+    for (let priority = REQUEST_QUEUE_PRIORITIES.high; priority >= REQUEST_QUEUE_PRIORITIES.low; priority--) {
+        const next = requestWaiters[priority].values().next().value;
+        if (next && removeRequestWaiter(next)) {
+            next.resolve();
+            return;
+        }
+    }
+    activeAsyncRequests--;
+}
 
 function brokerTimeoutMs() {
     const parsed = Number.parseInt(process.env.CODEBUDDY_SANDBOX_BROKER_TIMEOUT_MS || '', 10);
@@ -29,61 +131,96 @@ function parseBrokerResponse(line) {
     }
 }
 
-function sendBrokerRequest(request, options = {}) {
+function markBrokerRequestState(error, requestSent) {
+    const brokerError = error instanceof Error ? error : new Error(String(error));
+    brokerError.brokerRequestSent = requestSent;
+    return brokerError;
+}
+
+function nativeSyncErrorMayHaveBeenSent(error) {
+    const message = error && error.message ? error.message : String(error);
+    return ![
+        'requestBrokerSync requires socketPath and line',
+        'socket failed:',
+        'setsockopt timeout failed:',
+        'broker socket path is too long',
+        'connect failed:',
+    ].some(prefix => message.startsWith(prefix));
+}
+
+async function sendBrokerRequest(request, options = {}) {
     const socketPath = options.socketPath || brokerSocketPath();
     const timeoutMs = options.timeoutMs || brokerTimeoutMs();
-    return new Promise((resolve, reject) => {
-        if (!socketPath) {
-            reject(new Error('Broker socket unavailable'));
-            return;
-        }
+    if (!socketPath) {
+        throw markBrokerRequestState(new Error('Broker socket unavailable'), false);
+    }
 
-        let settled = false;
-        let buffer = '';
-        const socket = net.createConnection(socketPath);
-        const finish = (error, response) => {
-            if (settled) { return; }
-            settled = true;
-            clearTimeout(timer);
-            socket.destroy();
-            if (error) { reject(error); } else { resolve(response); }
-        };
-        const timer = setTimeout(() => finish(new Error('Broker request timed out')), timeoutMs);
+    const startedAt = Date.now();
+    await acquireRequestSlot(timeoutMs, options);
+    try {
+        const remainingTimeoutMs = timeoutMs - (Date.now() - startedAt);
+        if (remainingTimeoutMs <= 0) {
+            throw requestQueueTimeoutError();
+        }
+        const line = JSON.stringify(request);
+        return await new Promise((resolve, reject) => {
+            let settled = false;
+            let requestSent = false;
+            let buffer = '';
+            const socket = net.createConnection(socketPath);
+            const finish = (error, response) => {
+                if (settled) { return; }
+                settled = true;
+                clearTimeout(timer);
+                socket.once('close', () => {
+                    if (error) { reject(markBrokerRequestState(error, requestSent)); } else { resolve(response); }
+                });
+                socket.destroy();
+            };
+            const timer = setTimeout(() => finish(requestTimeoutError()), remainingTimeoutMs);
 
-        socket.setEncoding('utf8');
-        socket.on('connect', () => {
-            socket.write(`${JSON.stringify(request)}\n`);
+            socket.setEncoding('utf8');
+            socket.on('connect', () => {
+                requestSent = true;
+                socket.write(`${line}\n`);
+            });
+            socket.on('data', chunk => {
+                buffer += chunk;
+                const newlineIndex = buffer.indexOf('\n');
+                if (newlineIndex === -1) { return; }
+                try {
+                    finish(undefined, parseBrokerResponse(buffer.slice(0, newlineIndex)));
+                } catch (error) {
+                    finish(error);
+                }
+            });
+            socket.on('error', error => finish(error));
+            socket.on('end', () => {
+                if (!settled) {
+                    finish(new Error('Broker closed without a response'));
+                }
+            });
         });
-        socket.on('data', chunk => {
-            buffer += chunk;
-            const newlineIndex = buffer.indexOf('\n');
-            if (newlineIndex === -1) { return; }
-            try {
-                finish(undefined, parseBrokerResponse(buffer.slice(0, newlineIndex)));
-            } catch (error) {
-                finish(error);
-            }
-        });
-        socket.on('error', error => finish(error));
-        socket.on('end', () => {
-            if (!settled) {
-                finish(new Error('Broker closed without a response'));
-            }
-        });
-    });
+    } finally {
+        releaseRequestSlot();
+    }
 }
 
 function sendBrokerRequestSync(request, options = {}) {
     const socketPath = options.socketPath || brokerSocketPath();
     if (!socketPath) {
-        throw new Error('Broker socket unavailable');
+        throw markBrokerRequestState(new Error('Broker socket unavailable'), false);
     }
 
     const timeoutMs = options.timeoutMs || brokerTimeoutMs();
     const line = JSON.stringify(request);
     const nativeAddon = options.nativeAddon;
     if (nativeAddon && typeof nativeAddon.requestBrokerSync === 'function') {
-        return parseBrokerResponse(nativeAddon.requestBrokerSync(socketPath, line, timeoutMs));
+        try {
+            return parseBrokerResponse(nativeAddon.requestBrokerSync(socketPath, line, timeoutMs));
+        } catch (error) {
+            throw markBrokerRequestState(error, nativeSyncErrorMayHaveBeenSent(error));
+        }
     }
 
     const nodeBin = process.env.CODEBUDDY_NODE_BIN || process.execPath;
@@ -108,12 +245,20 @@ function sendBrokerRequestSync(request, options = {}) {
     });
 
     if (result.error) {
-        throw result.error;
+        const requestSent = !['ENOENT', 'EACCES', 'ENOEXEC'].includes(result.error.code);
+        throw markBrokerRequestState(result.error, requestSent);
     }
     if (result.status !== 0) {
-        throw new Error((result.stderr || '').trim() || `Broker sync helper exited with ${result.status}`);
+        throw markBrokerRequestState(
+            new Error((result.stderr || '').trim() || `Broker sync helper exited with ${result.status}`),
+            result.status !== 3 && result.status !== 123,
+        );
+    }
+    try {
+        return parseBrokerResponse(result.stdout);
+    } catch (error) {
+        throw markBrokerRequestState(error, true);
     }
-    return parseBrokerResponse(result.stdout);
 }
 
 function runSyncRequestCli(argv) {
@@ -124,6 +269,7 @@ function runSyncRequestCli(argv) {
     }
     const timeoutMs = Number.parseInt(timeoutValue || '', 10) || DEFAULT_TIMEOUT_MS;
     let settled = false;
+    let requestSent = false;
     let buffer = '';
     const socket = net.createConnection(socketPath);
     const finish = (code, message) => {
@@ -136,9 +282,12 @@ function runSyncRequestCli(argv) {
         }
         process.exit(code);
     };
-    const timer = setTimeout(() => finish(124, 'Broker request timed out'), timeoutMs);
+    const timer = setTimeout(() => finish(requestSent ? 124 : 123, 'Broker request timed out'), timeoutMs);
     socket.setEncoding('utf8');
-    socket.on('connect', () => socket.write(`${line}\n`));
+    socket.on('connect', () => {
+        requestSent = true;
+        socket.write(`${line}\n`);
+    });
     socket.on('data', chunk => {
         buffer += chunk;
         const newlineIndex = buffer.indexOf('\n');
@@ -146,7 +295,7 @@ function runSyncRequestCli(argv) {
             finish(0, buffer.slice(0, newlineIndex));
         }
     });
-    socket.on('error', error => finish(1, error && error.message ? error.message : String(error)));
+    socket.on('error', error => finish(requestSent ? 1 : 3, error && error.message ? error.message : String(error)));
     socket.on('end', () => finish(2, 'Broker closed without a response'));
 }