oh-my-opencode 4.18.1 → 4.19.0

package/dist/tui.js

@@ -19890,7 +19890,8 @@ var init_browser_automation = __esm(() => {
     "playwright-cli"
   ]);
   BrowserAutomationConfigSchema = exports_external.object({
-    provider: BrowserAutomationProviderSchema.default("playwright")
+    provider: BrowserAutomationProviderSchema.default("playwright"),
+    playwright_mcp_args: exports_external.array(exports_external.string()).optional()
   });
 });
 
@@ -19978,9 +19979,7 @@ var BuiltinCommandNameSchema;
 var init_commands = __esm(() => {
   init_zod();
   BuiltinCommandNameSchema = exports_external.enum([
-    "ralph-loop",
-    "ulw-loop",
-    "cancel-ralph",
+    "goal",
     "refactor",
     "start-work",
     "stop-continuation",
@@ -19995,7 +19994,7 @@ var init_default_mode = __esm(() => {
   init_zod();
   DefaultModeConfigSchema = exports_external.object({
     ultrawork: exports_external.boolean().default(false),
-    ralph_loop: exports_external.boolean().default(false)
+    goal: exports_external.boolean().default(false)
   });
 });
 
@@ -20056,6 +20055,17 @@ var init_experimental = __esm(() => {
   });
 });
 
+// packages/omo-opencode/src/config/schema/goal.ts
+var GoalConfigSchema;
+var init_goal = __esm(() => {
+  init_zod();
+  GoalConfigSchema = exports_external.object({
+    enabled: exports_external.boolean().default(false),
+    auto_start: exports_external.boolean().default(false),
+    default_max_iterations: exports_external.number().min(1).max(1000).default(100)
+  });
+});
+
 // packages/skills-loader-core/src/config/git-env-prefix.ts
 function isValidGitEnvPrefix(value) {
   if (value === "") {
@@ -20116,7 +20126,7 @@ var init_hooks = __esm(() => {
     "interactive-bash-session",
     "tool-pair-validator",
     "monitor-status-injector",
-    "ralph-loop",
+    "goal",
     "category-skill-reminder",
     "compaction-context-injector",
     "compaction-todo-preserver",
@@ -20264,18 +20274,6 @@ var init_monitor = __esm(() => {
   });
 });
 
-// packages/omo-opencode/src/config/schema/ralph-loop.ts
-var RalphLoopConfigSchema;
-var init_ralph_loop = __esm(() => {
-  init_zod();
-  RalphLoopConfigSchema = exports_external.object({
-    enabled: exports_external.boolean().default(false),
-    default_max_iterations: exports_external.number().min(1).max(1000).default(100),
-    state_dir: exports_external.string().optional(),
-    default_strategy: exports_external.enum(["reset", "continue"]).default("continue")
-  });
-});
-
 // packages/omo-opencode/src/config/schema/runtime-fallback.ts
 var RuntimeFallbackConfigSchema;
 var init_runtime_fallback = __esm(() => {
@@ -20536,8 +20534,8 @@ var init_oh_my_opencode_config = __esm(() => {
   init_notification();
   init_openclaw();
   init_model_capabilities();
+  init_goal();
   init_monitor();
-  init_ralph_loop();
   init_runtime_fallback();
   init_team_mode();
   init_skills();
@@ -20572,7 +20570,8 @@ var init_oh_my_opencode_config = __esm(() => {
     experimental: ExperimentalConfigSchema.optional(),
     auto_update: exports_external.boolean().optional(),
     skills: SkillsConfigSchema.optional(),
-    ralph_loop: RalphLoopConfigSchema.optional(),
+    goal: GoalConfigSchema.optional(),
+    ralph_loop: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
     runtime_fallback: exports_external.union([exports_external.boolean(), RuntimeFallbackConfigSchema]).optional(),
     background_task: BackgroundTaskConfigSchema.optional(),
     notification: NotificationConfigSchema.optional(),
@@ -20617,6 +20616,7 @@ var init_schema = __esm(() => {
   init_dynamic_context_pruning();
   init_experimental();
   init_fallback_models();
+  init_goal();
   init_git_env_prefix2();
   init_git_master();
   init_hooks();
@@ -20625,7 +20625,6 @@ var init_schema = __esm(() => {
   init_model_capabilities();
   init_notification();
   init_oh_my_opencode_config();
-  init_ralph_loop();
   init_runtime_fallback();
   init_team_mode();
   init_skills();
@@ -20671,6 +20670,7 @@ var init_agent_model_requirements = __esm(() => {
           model: "claude-opus-4-7",
           variant: "max"
         },
+        { providers: ["opencode-go", "kimi-for-coding", "moonshotai", "opencode", "vercel"], model: "kimi-k3" },
         { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
         { providers: ["kimi-for-coding"], model: "k2p5" },
         {
@@ -20695,7 +20695,7 @@ var init_agent_model_requirements = __esm(() => {
     hephaestus: {
       fallbackChain: [
         {
-          providers: ["openai", "vercel"],
+          providers: ["openai", "github-copilot", "vercel"],
           model: "gpt-5.6-sol",
           variant: "high"
         },
@@ -20803,8 +20803,13 @@ var init_agent_model_requirements = __esm(() => {
       fallbackChain: [
         {
           providers: ["openai", "vercel"],
-          model: "gpt-5.6-sol",
-          variant: "xhigh"
+          model: "gpt-5.6-terra",
+          variant: "high"
+        },
+        {
+          providers: ["github-copilot"],
+          model: "gpt-5.6-terra",
+          variant: "high"
         },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
@@ -20884,6 +20889,11 @@ var init_category_model_requirements = __esm(() => {
           model: "gpt-5.6-sol",
           variant: "xhigh"
         },
+        {
+          providers: ["github-copilot"],
+          model: "gpt-5.6-sol",
+          variant: "high"
+        },
         {
           providers: ["openai", "opencode", "vercel"],
           model: "gpt-5.5",
@@ -20910,7 +20920,12 @@ var init_category_model_requirements = __esm(() => {
           variant: "xhigh"
         },
         {
-          providers: ["openai", "vercel"],
+          providers: ["github-copilot"],
+          model: "gpt-5.6-terra",
+          variant: "high"
+        },
+        {
+          providers: ["openai", "github-copilot", "vercel"],
           model: "gpt-5.6-sol",
           variant: "high"
         },
@@ -20977,6 +20992,11 @@ var init_category_model_requirements = __esm(() => {
           model: "gpt-5.6-luna",
           variant: "xhigh"
         },
+        {
+          providers: ["github-copilot"],
+          model: "gpt-5.6-luna",
+          variant: "high"
+        },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
           model: "claude-sonnet-4-6"
@@ -21066,9 +21086,12 @@ function stripProviderPrefixForAliasLookup(normalizedModelID) {
   }
   return normalizedModelID.slice(slashIndex + 1);
 }
-function resolveModelIDAlias(modelID) {
+function resolveModelIDAlias(modelID, providerID) {
   const requestedModelID = normalizeLookupModelID(modelID);
   const aliasLookupModelID = stripProviderPrefixForAliasLookup(requestedModelID);
+  const normalizedProviderID = providerID ? normalizeLookupModelID(providerID) : undefined;
+  const providerPrefixEnd = requestedModelID.indexOf("/");
+  const embeddedProviderID = providerPrefixEnd > 0 ? requestedModelID.slice(0, providerPrefixEnd) : undefined;
   const exactRule = EXACT_ALIAS_RULES_BY_MODEL.get(aliasLookupModelID);
   if (exactRule) {
     return {
@@ -21079,6 +21102,13 @@ function resolveModelIDAlias(modelID) {
     };
   }
   for (const rule of PATTERN_ALIAS_RULES) {
+    if (rule.providerIDs) {
+      const matchesProviderID = normalizedProviderID !== undefined && rule.providerIDs.includes(normalizedProviderID);
+      const matchesEmbeddedProviderID = normalizedProviderID !== undefined && rule.allowedSubproviderHosts?.includes(normalizedProviderID) === true && embeddedProviderID !== undefined && rule.providerIDs.includes(embeddedProviderID);
+      if (!matchesProviderID && !matchesEmbeddedProviderID) {
+        continue;
+      }
+    }
     if (!rule.match(aliasLookupModelID)) {
       continue;
     }
@@ -21119,6 +21149,14 @@ var init_model_capability_aliases = __esm(() => {
   ];
   EXACT_ALIAS_RULES_BY_MODEL = new Map(EXACT_ALIAS_RULES.map((rule) => [rule.aliasModelID, rule]));
   PATTERN_ALIAS_RULES = [
+    {
+      ruleID: "openai-gpt-5.6-fast-service-tier-alias",
+      description: "Normalizes OpenCode's OpenAI GPT-5.6 fast service-tier IDs to canonical snapshot IDs.",
+      providerIDs: ["openai"],
+      allowedSubproviderHosts: ["vercel"],
+      match: (normalizedModelID) => /^gpt-5\.6-(?:sol|terra|luna)-fast$/.test(normalizedModelID),
+      canonicalize: (normalizedModelID) => normalizedModelID.slice(0, -"-fast".length)
+    },
     {
       ruleID: "claude-thinking-legacy-alias",
       description: "Normalizes the legacy claude-opus-4-7-thinking id to the canonical snapshot ID.",
@@ -21343,6 +21381,21 @@ var init_runtime_fallback_model = () => {};
 var SUPPLEMENTAL_MODEL_CAPABILITIES;
 var init_supplemental_entries = __esm(() => {
   SUPPLEMENTAL_MODEL_CAPABILITIES = {
+    "kimi-k3": {
+      id: "kimi-k3",
+      family: "kimi",
+      reasoning: true,
+      temperature: true,
+      toolCall: true,
+      modalities: {
+        input: ["text", "image", "video"],
+        output: ["text"]
+      },
+      limit: {
+        context: 262144,
+        output: 262144
+      }
+    },
     "kimi-k2.6": {
       id: "kimi-k2.6",
       family: "kimi",
@@ -21596,7 +21649,7 @@ function getProviderOverride(providerID, modelID) {
   return GITHUB_COPILOT_GPT5_MODEL.test(normalizeLookupModelID2(modelID)) ? GITHUB_COPILOT_GPT5_OVERRIDE : undefined;
 }
 function getModelCapabilities(input) {
-  const canonicalization = resolveModelIDAlias(input.modelID);
+  const canonicalization = resolveModelIDAlias(input.modelID, input.providerID);
   const override = getOverride(input.modelID);
   const providerOverride = getProviderOverride(input.providerID, canonicalization.canonicalModelID);
   const runtimeModel = readRuntimeModel(input.runtimeModel ?? input.providerCache?.findProviderModelMetadata(input.providerID, input.modelID));
@@ -22460,6 +22513,7 @@ var init_opencode_storage_detection = __esm(() => {
 var opencodePluginsCache;
 var init_load_opencode_plugins = __esm(() => {
   init_jsonc_parser2();
+  init_opencode_config_dir();
   opencodePluginsCache = new Map;
 });
 
@@ -76190,13 +76244,45 @@ function mergeLoadedConfig(userLayersNearestFirst, projectLayersNearestFirst) {
       config3 = mergeConfigs(config3, layer.config);
   }
   const userMcpEnvAllowlist = config3.mcp_env_allowlist ?? [];
+  const userPlaywrightMcpArgs = config3.browser_automation_engine?.playwright_mcp_args;
   for (const layer of [...projectLayersNearestFirst].reverse()) {
     if (layer.config)
       config3 = mergeConfigs(config3, layer.config);
   }
   config3 = { ...config3, mcp_env_allowlist: userMcpEnvAllowlist };
+  if (config3.browser_automation_engine) {
+    const {
+      playwright_mcp_args: _projectPlaywrightMcpArgs,
+      ...browserAutomationEngine
+    } = config3.browser_automation_engine;
+    config3 = {
+      ...config3,
+      browser_automation_engine: userPlaywrightMcpArgs !== undefined ? { ...browserAutomationEngine, playwright_mcp_args: userPlaywrightMcpArgs } : browserAutomationEngine
+    };
+  }
   return applyDisabledProviders(config3);
 }
+function migrateRalphLoopConfig(config3) {
+  const legacy = config3.ralph_loop;
+  if (legacy === undefined) {
+    return config3;
+  }
+  const enabled = typeof legacy.enabled === "boolean" ? legacy.enabled : undefined;
+  const defaultMaxIterations = typeof legacy.default_max_iterations === "number" ? legacy.default_max_iterations : undefined;
+  if (enabled === undefined && defaultMaxIterations === undefined) {
+    return config3;
+  }
+  log2("[config] ralph_loop is deprecated and will be removed in a future release. Use goal instead.");
+  const existingGoal = config3.goal;
+  return {
+    ...config3,
+    goal: {
+      enabled: existingGoal?.enabled ?? enabled ?? false,
+      auto_start: existingGoal?.auto_start ?? false,
+      default_max_iterations: existingGoal?.default_max_iterations ?? defaultMaxIterations ?? 100
+    }
+  };
+}
 function validatePluginConfig(directory) {
   const userLayersNearestFirst = discoverUserLayers().map((layer) => parseLayerConfig(layer.path));
   const projectLayersNearestFirst = discoverProjectLayersNearestFirst(directory).map((layer) => parseLayerConfig(layer.path));
@@ -76206,7 +76292,7 @@ function validatePluginConfig(directory) {
     valid: messages.length === 0,
     messages,
     path: firstFailingPath(layers) ?? firstPath(layers),
-    config: mergeLoadedConfig(userLayersNearestFirst, projectLayersNearestFirst)
+    config: migrateRalphLoopConfig(mergeLoadedConfig(userLayersNearestFirst, projectLayersNearestFirst))
   };
 }
 var init_validate = __esm(() => {
@@ -76215,6 +76301,7 @@ var init_validate = __esm(() => {
   init_single_config_loader();
   init_shared();
   init_disabled_providers();
+  init_logger2();
   init_plugin_identity();
   init_schema();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "4.18.1",
+  "version": "4.19.0",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -110,7 +110,7 @@
     "install:codex-dev": "bun run script/build-codex-install.ts && bun run script/install-codex-dev.ts",
     "build:codex-plugin": "npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build",
     "build:senpi-plugin": "bun run build:lsp-daemon && bun run build:senpi-plugin:stage",
-    "build:senpi-plugin:stage": "node packages/omo-senpi/plugin/scripts/stage-lsp-daemon-runtime.mjs && node packages/omo-senpi/plugin/scripts/build-extension.mjs && node packages/omo-senpi/plugin/scripts/sync-skills.mjs && node packages/omo-senpi/plugin/scripts/embed-directive.mjs --check && node packages/omo-senpi/plugin/scripts/build-install.mjs",
+    "build:senpi-plugin:stage": "bun run build:materialize-frontend && node packages/omo-senpi/plugin/scripts/stage-lsp-daemon-runtime.mjs && node packages/omo-senpi/plugin/scripts/build-extension.mjs && node packages/omo-senpi/plugin/scripts/sync-skills.mjs && node packages/omo-senpi/plugin/scripts/embed-directive.mjs --check && node packages/omo-senpi/plugin/scripts/build-install.mjs",
     "build:materialize-frontend": "node packages/omo-codex/plugin/scripts/materialize-shared-upstreams.mjs --strict",
     "build:shared-skills-assets": "bun run build:materialize-frontend && rm -rf dist/skills && cp -R packages/shared-skills/skills dist/skills",
     "build:lsp-tools-mcp": "npm --prefix packages/lsp-tools-mcp ci && npm --prefix packages/lsp-tools-mcp run build",
@@ -212,18 +212,18 @@
     "typescript": "^6.0.3"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "4.18.1",
-    "oh-my-opencode-darwin-x64": "4.18.1",
-    "oh-my-opencode-darwin-x64-baseline": "4.18.1",
-    "oh-my-opencode-linux-arm64": "4.18.1",
-    "oh-my-opencode-linux-arm64-musl": "4.18.1",
-    "oh-my-opencode-linux-x64": "4.18.1",
-    "oh-my-opencode-linux-x64-baseline": "4.18.1",
-    "oh-my-opencode-linux-x64-musl": "4.18.1",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.18.1",
-    "oh-my-opencode-windows-arm64": "4.18.1",
-    "oh-my-opencode-windows-x64": "4.18.1",
-    "oh-my-opencode-windows-x64-baseline": "4.18.1"
+    "oh-my-opencode-darwin-arm64": "4.19.0",
+    "oh-my-opencode-darwin-x64": "4.19.0",
+    "oh-my-opencode-darwin-x64-baseline": "4.19.0",
+    "oh-my-opencode-linux-arm64": "4.19.0",
+    "oh-my-opencode-linux-arm64-musl": "4.19.0",
+    "oh-my-opencode-linux-x64": "4.19.0",
+    "oh-my-opencode-linux-x64-baseline": "4.19.0",
+    "oh-my-opencode-linux-x64-musl": "4.19.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.19.0",
+    "oh-my-opencode-windows-arm64": "4.19.0",
+    "oh-my-opencode-windows-x64": "4.19.0",
+    "oh-my-opencode-windows-x64-baseline": "4.19.0"
   },
   "overrides": {
     "@earendil-works/pi-agent-core": "0.80.3",

package/packages/git-bash-mcp/dist/cli.js

@@ -17,6 +17,9 @@ function errorResponse(id, code, message, data) {
 function jsonRpcId(value) {
   return typeof value === "string" || typeof value === "number" || value === null ? value : null;
 }
+function messageFromError(error) {
+  return error instanceof Error ? error.message : String(error);
+}
 // ../mcp-stdio-core/src/transport.ts
 var HEADER_SEPARATOR = Buffer.from(`\r
 \r
@@ -39,16 +42,45 @@ async function* readStdioJsonRpcMessages(input) {
     yield parseJsonPayload(trailing, "line");
   }
 }
-function writeStdioJsonRpcResponse(output, response, responseMode) {
+async function writeStdioJsonRpcResponse(output, response, responseMode) {
   const body = JSON.stringify(response);
-  if (responseMode === "framed") {
-    output.write(`Content-Length: ${Buffer.byteLength(body, "utf8")}\r
+  const payload = responseMode === "framed" ? `Content-Length: ${Buffer.byteLength(body, "utf8")}\r
 \r
-${body}`);
-    return;
-  }
-  output.write(`${body}
-`);
+${body}` : `${body}
+`;
+  await writeChunk(output, payload);
+}
+function writeChunk(output, chunk) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const onError = (error) => {
+      if (settled)
+        return;
+      settled = true;
+      reject(error);
+    };
+    output.once("error", onError);
+    try {
+      output.write(chunk, (error) => {
+        if (settled)
+          return;
+        settled = true;
+        if (error) {
+          queueMicrotask(() => output.removeListener("error", onError));
+          reject(error);
+          return;
+        }
+        output.removeListener("error", onError);
+        resolve();
+      });
+    } catch (error) {
+      output.removeListener("error", onError);
+      if (settled)
+        return;
+      settled = true;
+      reject(error);
+    }
+  });
 }
 function readNextMessage(buffer) {
   if (buffer.length === 0)
@@ -144,40 +176,70 @@ async function runJsonRpcStdioServer(config) {
         break;
       idleTimer.arm();
       if (message.kind === "parse_error") {
-        handleParseError(message, config, log);
+        if (!await handleParseError(message, config, log))
+          break;
         continue;
       }
-      await handleRequest(message, config, log);
+      if (!await handleRequest(message, config, log))
+        break;
     }
   } finally {
     idleTimer.clear();
     log("stdio_stopped");
   }
 }
-function handleParseError(message, config, log) {
+async function handleParseError(message, config, log) {
   log("parse_error", { message: message.message });
   const response = config.parseErrorResponse?.(message.message) ?? errorResponse(null, -32700, "Parse error", message.message);
-  if (response !== undefined) {
-    writeStdioJsonRpcResponse(config.output, response, message.responseMode);
-  }
+  if (response === undefined)
+    return true;
+  return writeResponse(response, {
+    output: config.output,
+    responseMode: message.responseMode,
+    log
+  });
 }
 async function handleRequest(message, config, log) {
   const parsed = message.payload;
   const id = isPlainRecord(parsed) ? jsonRpcId(parsed["id"]) : null;
   const method = isPlainRecord(parsed) && typeof parsed["method"] === "string" ? parsed["method"] : null;
   log("request", { id: id === null ? null : String(id), method });
+  let response;
   try {
-    const response = await config.handler(parsed, config.handlerOptions);
-    if (response === undefined)
-      return;
-    writeStdioJsonRpcResponse(config.output, response, message.responseMode);
-    log("response", { id: String(response.id), method, is_error: response.error !== undefined });
+    response = await config.handler(parsed, config.handlerOptions);
   } catch (error) {
     if (config.onHandlerError === undefined)
       throw error;
     config.onHandlerError(error);
+    return true;
+  }
+  if (response === undefined)
+    return true;
+  if (!await writeResponse(response, {
+    output: config.output,
+    responseMode: message.responseMode,
+    log
+  }))
+    return false;
+  log("response", { id: String(response.id), method, is_error: response.error !== undefined });
+  return true;
+}
+async function writeResponse(response, context) {
+  try {
+    await writeStdioJsonRpcResponse(context.output, response, context.responseMode);
+    return true;
+  } catch (error) {
+    if (!isTerminalOutputError(error))
+      throw error;
+    context.log("output_error", { message: messageFromError(error) });
+    return false;
   }
 }
+function isTerminalOutputError(error) {
+  if (!(error instanceof Error) || !("code" in error))
+    return false;
+  return error.code === "EPIPE" || error.code === "ERR_STREAM_DESTROYED" || error.code === "ERR_STREAM_WRITE_AFTER_END";
+}
 function createIdleTimer(idleTimeoutMs, log, onIdleTimeout) {
   let timer = null;
   let isClosed = false;

package/packages/lsp-core/src/lsp/client-diagnostics-freshness.integration.test.ts

@@ -148,7 +148,7 @@ describe("LspClient diagnostics freshness", () => {
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
 				diagnosticResponses: [
 					{
-						delayMs: 20,
+						delayMs: 200,
 						report: { kind: "full", resultId: "v1", items: [diagnostic("pull-stale")] },
 					},
 					{
@@ -156,7 +156,7 @@ describe("LspClient diagnostics freshness", () => {
 					},
 				],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 80, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 800, versionlessPublishQuiescenceMs: 5 },
 		);
 		await context.client.openFile(context.source);
 
@@ -209,7 +209,7 @@ describe("LspClient diagnostics freshness", () => {
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
 				diagnosticResponses: [{ action: "close" }],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 50, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
 		);
 		await context.client.openFile(context.source);
 
@@ -229,7 +229,7 @@ describe("LspClient diagnostics freshness", () => {
 				],
 				diagnosticResponses: [{ error: { code: -32601, message: "Method not found" } }],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 50, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
 		);
 
 		const result = await context.client.diagnostics(context.source);

package/packages/lsp-core/src/lsp/directory-diagnostics.test.ts

@@ -5,7 +5,8 @@ import { join } from "node:path";
 import { describe, expect, it } from "bun:test";
 
 import { aggregateDiagnosticsForDirectory } from "./directory-diagnostics.js";
-import type { LspClient } from "./client.js";
+import { LspClient } from "./client.js";
+import { LspManager } from "./manager.js";
 import type { Diagnostic, ResolvedServer } from "./types.js";
 
 describe("directory diagnostics", () => {
@@ -94,8 +95,124 @@ describe("directory diagnostics", () => {
 			rmSync(workspace, { recursive: true, force: true });
 		}
 	});
+
+	it("#given cold client acquisition is pending #when directory diagnostics are aborted #then acquisition settles and cleans up before startup releases", async () => {
+		const workspace = mkdtempSync(join(tmpdir(), "lsp-directory-diag-cold-cancel-"));
+		const controller = new AbortController();
+		const startupStarted = deferred();
+		const startupRelease = deferred();
+		const server: ResolvedServer = {
+			id: "typescript",
+			command: ["typescript-language-server"],
+			extensions: [".ts"],
+			priority: 1,
+		};
+		const client = new PendingStartLspClient({
+			root: workspace,
+			server,
+			startupStarted,
+			startupRelease,
+		});
+		const manager = new LspManager({
+			clientFactory: () => client,
+			reaperIntervalMs: 60_000,
+		});
+		const aggregation = aggregateDiagnosticsForDirectory(workspace, ".ts", "all", 1, {
+			manager,
+			listFiles: () => [join(workspace, "a.ts")],
+			workspaceRoot: workspace,
+			server,
+			signal: controller.signal,
+		});
+
+		try {
+			await startupStarted.promise;
+			controller.abort();
+
+			const settledBeforeStartupRelease = await settlesWithin(aggregation, 100);
+
+			expect(settledBeforeStartupRelease).toBe(true);
+			await expect(aggregation).rejects.toHaveProperty("name", "AbortError");
+			expect(manager.clientCount()).toBe(0);
+			expect(client.stopCallCount).toBe(1);
+		} finally {
+			startupRelease.resolve();
+			await aggregation.catch(() => undefined);
+			await manager.stopAll();
+			rmSync(workspace, { recursive: true, force: true });
+		}
+	});
 });
 
+class PendingStartLspClient extends LspClient {
+	stopCallCount = 0;
+	private readonly startupStarted: Deferred;
+	private readonly startupRelease: Deferred;
+
+	constructor(options: PendingStartLspClientOptions) {
+		super(options.root, options.server);
+		this.startupStarted = options.startupStarted;
+		this.startupRelease = options.startupRelease;
+	}
+
+	override async start(): Promise<void> {
+		this.startupStarted.resolve();
+		await this.startupRelease.promise;
+	}
+
+	override async initialize(): Promise<void> {}
+
+	override async stop(): Promise<void> {
+		this.stopCallCount += 1;
+	}
+
+	override isAlive(): boolean {
+		return true;
+	}
+
+	override async diagnostics(): Promise<{ readonly items: Diagnostic[] }> {
+		return { items: [] };
+	}
+}
+
+interface PendingStartLspClientOptions {
+	readonly root: string;
+	readonly server: ResolvedServer;
+	readonly startupStarted: Deferred;
+	readonly startupRelease: Deferred;
+}
+
+interface Deferred {
+	readonly promise: Promise<void>;
+	resolve(): void;
+}
+
+function deferred(): Deferred {
+	let resolvePromise: (() => void) | undefined;
+	const promise = new Promise<void>((resolve) => {
+		resolvePromise = resolve;
+	});
+	return { promise, resolve: () => resolvePromise?.() };
+}
+
+async function settlesWithin(promise: Promise<unknown>, timeoutMs: number): Promise<boolean> {
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	try {
+		return await Promise.race([
+			promise.then(
+				() => true,
+				() => true,
+			),
+			new Promise<boolean>((resolve) => {
+				timer = setTimeout(() => resolve(false), timeoutMs);
+				timer.unref();
+			}),
+		]);
+	} finally {
+		if (timer !== undefined) clearTimeout(timer);
+	}
+}
+
 function diagnostic(message: string): Diagnostic {
 	return {
 		range: { start: { line: 0, character: 0 }, end: { line: 0, character: 1 } },