@cortexkit/aft-opencode 0.28.2 → 0.29.1

package/dist/bg-notifications.d.ts

@@ -46,13 +46,28 @@ interface DrainContext {
     directory: string;
     sessionID: string;
     /**
-     * Live OpenCode HTTP listener URL (from `input.serverUrl`). Used by the
-     * wake path to build a separate `createOpencodeClient` that hits the
-     * live listener via `globalThis.fetch` — works around the OpenCode
-     * promptAsync runner-split bug (anomalyco/opencode#28202). When absent,
-     * the wake stays queued and existing retry-with-backoff fires; we do
-     * NOT fall back to `input.client.session.promptAsync` because that
-     * reopens the bug path.
+     * Plugin-provided OpenCode SDK client (`input.client`). The wake path
+     * uses this as a fallback when `useLiveServerWake()` is false — i.e.
+     * the live HTTP listener was unreachable when probed at plugin init,
+     * so `getLiveServerClient(...)` cannot be built. Falling back here
+     * accepts the upstream `promptAsync` runner-split bug
+     * (anomalyco/opencode#28202; duplicate "stop" messages) in exchange
+     * for wakes still arriving at all in plain-TUI sessions.
+     *
+     * Typed `unknown` because the real `@opencode-ai/sdk` `OpencodeClient`
+     * has a narrower, generated `promptAsync` signature than the loose
+     * structural `OpenCodeClient` shape used by the live-server factory
+     * and test stubs. The wake closure asserts to `OpenCodeClient` after
+     * deciding which transport to use.
+     */
+    client?: unknown;
+    /**
+     * Live OpenCode HTTP listener URL (from `input.serverUrl`). When the
+     * listener was reachable at startup, the wake path builds a separate
+     * `createOpencodeClient` from this URL so requests hit the same Effect
+     * memoMap as the live UI — works around the runner-split bug
+     * (anomalyco/opencode#28202). When the listener was unreachable, the
+     * wake path falls back to `client` above; this URL is unused.
      */
     serverUrl?: string;
 }

package/dist/bg-notifications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bg-notifications.d.ts","sourceRoot":"","sources":["../src/bg-notifications.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bg-notifications.d.ts","sourceRoot":"","sources":["../src/bg-notifications.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAoKlD;;;;;;;;;;;;;;;;;;GAkBG;AAQH,QAAA,MAAM,MAAM,EAAE,MAA6D,CAAC;AAg0B5E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAqKlD;;;;;;;;;;;;;;;;;;GAkBG;AAQH,QAAA,MAAM,MAAM,EAAE,MAA6D,CAAC;AAqyB5E,eAAe,MAAM,CAAC"}

package/dist/index.js

@@ -31001,6 +31001,7 @@ import { chmodSync as chmodSync2, copyFileSync, existsSync as existsSync2, mkdir
 import { createRequire as createRequire2 } from "node:module";
 import { homedir as homedir3 } from "node:os";
 import { join as join3 } from "node:path";
+var ensureBinaryForResolver = ensureBinary;
 function readBinaryVersion(binaryPath) {
   try {
     const result = spawnSync(binaryPath, ["--version"], {
@@ -31141,7 +31142,7 @@ async function findBinary(expectedVersion) {
     return syncResult;
   }
   log("Binary not found locally, attempting auto-download...");
-  const downloaded = await ensureBinary(expectedVersion);
+  const downloaded = await ensureBinaryForResolver(expectedVersion);
   if (downloaded)
     return downloaded;
   throw new Error([
@@ -31165,6 +31166,7 @@ async function findBinary(expectedVersion) {
 }
 
 // ../aft-bridge/dist/migration.js
+var spawnSyncForMigration = spawnSync2;
 var TARGET_MARKER = ".migrated_from_legacy";
 var DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
 function dataHome() {
@@ -31236,7 +31238,7 @@ async function ensureStorageMigrated(opts) {
 
 `);
   } catch {}
-  const result = spawnSync2(binaryPath, [
+  const result = spawnSyncForMigration(binaryPath, [
     "migrate-storage",
     "--from",
     legacyRoot,
@@ -32692,9 +32694,6 @@ function getLiveServerClient(serverUrl, directory) {
   clientCache.set(key, client);
   return client;
 }
-function isBunRuntime() {
-  return typeof globalThis.Bun !== "undefined";
-}
 async function probeServerReachable(serverUrl, timeoutMs = 1500) {
   if (!serverUrl)
     return false;
@@ -32713,6 +32712,13 @@ async function probeServerReachable(serverUrl, timeoutMs = 1500) {
     clearTimeout(timer);
   }
 }
+var liveServerWakeAvailable = false;
+function setLiveServerWakeAvailable(available) {
+  liveServerWakeAvailable = available;
+}
+function useLiveServerWake() {
+  return liveServerWakeAvailable;
+}
 
 // src/bg-notifications.ts
 function hashReminder(text) {
@@ -32819,18 +32825,26 @@ async function triggerWakeIfPending(drainContext, skipDrain) {
   if (state.pendingCompletions.length === 0 && state.pendingLongRunning.length === 0)
     return;
   scheduleWake(state, async (reminder, deliveredCompletions) => {
-    if (!drainContext.serverUrl) {
-      sessionWarn(drainContext.sessionID, `${LOG_PREFIX} wake serverUrl unavailable`, {
-        event: "bash_completion_wake_serverUrl_unavailable",
-        task_ids: deliveredCompletions.map((c) => c.task_id),
-        directory: drainContext.directory,
-        attempt: state.wakeRetryAttempts + 1
-      });
-      throw new Error("input.serverUrl is unavailable; cannot reach live OpenCode listener");
+    let client;
+    let clientPath;
+    if (useLiveServerWake() && drainContext.serverUrl) {
+      client = getLiveServerClient(drainContext.serverUrl, drainContext.directory);
+      clientPath = "live-server";
+    } else {
+      if (!drainContext.client) {
+        sessionWarn(drainContext.sessionID, `${LOG_PREFIX} wake client unavailable`, {
+          event: "bash_completion_wake_client_unavailable",
+          task_ids: deliveredCompletions.map((c) => c.task_id),
+          directory: drainContext.directory,
+          attempt: state.wakeRetryAttempts + 1
+        });
+        throw new Error("no wake transport available: live-server unreachable and input.client absent");
+      }
+      client = drainContext.client;
+      clientPath = "in-process-fallback";
     }
-    const client = getLiveServerClient(drainContext.serverUrl, drainContext.directory);
     if (typeof client.session?.promptAsync !== "function") {
-      throw new Error("live-server client.session.promptAsync is unavailable");
+      throw new Error(`wake client.session.promptAsync is unavailable (path=${clientPath})`);
     }
     const promptContext = await resolvePromptContext(client, drainContext.sessionID);
     const body = {
@@ -32856,7 +32870,7 @@ async function triggerWakeIfPending(drainContext, skipDrain) {
       directory: drainContext.directory,
       reminder_sha256: hashReminder(reminder),
       reminder_chars: reminder.length,
-      wake_client_path: "live-server",
+      wake_client_path: clientPath,
       prompt_context: promptContext ? {
         agent: promptContext.agent,
         model: promptContext.model ? {
@@ -49958,6 +49972,28 @@ async function cleanupWarnings(opts) {
   }
 }
 
+// src/shared/bash-hints.ts
+var CONFLICT_HINT = `
+
+[Hint] Use aft_conflicts to see all conflict regions across files in a single call.`;
+var GREP_HINT = `
+
+[Hint] Use the grep tool instead of bash for faster indexed search.`;
+function maybeAppendConflictsHint(output) {
+  if (!output.includes("Automatic merge failed; fix conflicts"))
+    return output;
+  if (!/^CONFLICT \(|^error: could not apply /m.test(output))
+    return output;
+  return output + CONFLICT_HINT;
+}
+function maybeAppendGrepHint(output) {
+  const firstLine = output.slice(0, 300).split(`
+`)[0] ?? "";
+  if (!/\b(rg|grep)\s/.test(firstLine))
+    return output;
+  return output + GREP_HINT;
+}
+
 // src/shared/rpc-server.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { mkdirSync as mkdirSync11, renameSync as renameSync7, unlinkSync as unlinkSync7, writeFileSync as writeFileSync10 } from "node:fs";
@@ -53990,18 +54026,12 @@ ${lines}
     config: aftConfig,
     storageDir: configOverrides.storage_dir
   };
-  let tuiPortZeroNudgeNeeded = false;
-  if (isBunRuntime()) {
-    probeServerReachable(input.serverUrl?.toString()).then((reachable) => {
-      tuiPortZeroNudgeNeeded = !reachable;
-      if (!reachable) {
-        log2("Detected OpenCode TUI without --port 0; live HTTP listener unreachable. " + "Will nudge once per session to restart with --port 0 (anomalyco/opencode#28202).");
-      }
-    }).catch(() => {
-      tuiPortZeroNudgeNeeded = true;
-    });
-  }
-  const tuiNudgeSentSessions = new Set;
+  probeServerReachable(input.serverUrl?.toString()).then((reachable) => {
+    setLiveServerWakeAvailable(reachable);
+    log2(reachable ? "Live OpenCode HTTP listener reachable; bg-notifications wake path = live-server (anomalyco/opencode#28202 workaround active)." : "Live OpenCode HTTP listener unreachable; bg-notifications wake path = in-process-fallback. Wakes will still arrive but the upstream duplicate-runner bug (anomalyco/opencode#28202) is not worked around. Launch with `opencode --port 0` in TUI mode to activate the workaround.");
+  }).catch(() => {
+    setLiveServerWakeAvailable(false);
+  });
   if (onnxRuntimePromise) {
     onnxRuntimePromise.then((ortDylibDir) => {
       if (ortDylibDir) {
@@ -54215,13 +54245,6 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     "chat.message": async (messageInput) => {
       const sid = messageInput.sessionID ?? messageInput.sessionId ?? messageInput.id;
       warmSessionDirectory(input.client, sid, input.directory);
-      if (tuiPortZeroNudgeNeeded && typeof sid === "string" && sid.length > 0) {
-        if (!tuiNudgeSentSessions.has(sid)) {
-          tuiNudgeSentSessions.add(sid);
-          const nudge = "Due to a bug in opencode (https://github.com/anomalyco/opencode/issues/28202), background bash notifications are now using a workaround which needs opencode to be run via `opencode --port 0` in TUI mode. Opencode Desktop doesn't need special treatment.";
-          sendIgnoredMessage2(input.client, sid, nudge).catch(() => {});
-        }
-      }
     },
     "command.execute.before": async (commandInput, _output) => {
       if (isTuiMode2() || commandInput.command !== STATUS_COMMAND) {
@@ -54254,19 +54277,9 @@ Install: ${getManualInstallHint()}`).catch(() => {});
         if (stored.metadata)
           output.metadata = { ...output.metadata, ...stored.metadata };
       }
-      if (toolInput.tool === "bash" && output.output?.includes("Automatic merge failed; fix conflicts")) {
-        output.output += `
-
-[Hint] Use aft_conflicts to see all conflict regions across files in a single call.`;
-      }
       if (toolInput.tool === "bash" && output.output) {
-        const firstLine = output.output.slice(0, 300).split(`
-`)[0] ?? "";
-        if (/\b(rg|grep)\s/.test(firstLine)) {
-          output.output += `
-
-[Hint] Use the grep tool instead of bash for faster indexed search.`;
-        }
+        output.output = maybeAppendConflictsHint(output.output);
+        output.output = maybeAppendGrepHint(output.output);
       }
       const sessionDir = getSessionDirectoryCached(toolInput.sessionID) ?? input.directory;
       await appendInTurnBgCompletions({ ctx, directory: sessionDir, sessionID: toolInput.sessionID }, output);

package/dist/shared/bash-hints.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Append the `aft_conflicts` hint when the output indicates a real git merge
+ * or rebase produced conflicts.
+ *
+ * Gated on BOTH:
+ *  - the "Automatic merge failed; fix conflicts" marker, AND
+ *  - a git-conflict signal (`CONFLICT (...)` line or `error: could not apply`)
+ *
+ * Both conditions are required because `aft_conflicts` calls `git ls-files -u`,
+ * which fails with "not a git repository" outside a git working tree. The
+ * marker string can legitimately appear in docs, READMEs, test fixtures, and
+ * grep output, so we cannot key off it alone — a false-positive hint sends
+ * agents into a confusing error.
+ */
+export declare function maybeAppendConflictsHint(output: string): string;
+/**
+ * Append the grep-tool hint when the bash command was a grep/rg invocation.
+ *
+ * Detected by examining the FIRST LINE of output (which is the echoed command
+ * line on most shells in foreground mode). We cap the slice at 300 chars so
+ * a single huge first line doesn't slow this hook.
+ */
+export declare function maybeAppendGrepHint(output: string): string;
+//# sourceMappingURL=bash-hints.d.ts.map

package/dist/shared/bash-hints.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bash-hints.d.ts","sourceRoot":"","sources":["../../src/shared/bash-hints.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAM/D;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAI1D"}

package/dist/shared/live-server-client.d.ts

@@ -19,6 +19,16 @@
  * UI uses, so the active session's `SessionRunState` is the one that
  * resolves `ensureRunning` and overlapping turns coalesce correctly.
  *
+ * The workaround only works when the live HTTP listener is actually
+ * reachable. OpenCode Desktop (Electron+Node) and TUI launched with
+ * `opencode --port 0` bind a real API listener; plain TUI binds an
+ * internal-only listener that 404s for `/session/*`. We probe once at
+ * plugin init and cache the result. When the listener is unreachable
+ * the wake path silently uses the in-process `input.client.session.promptAsync`,
+ * which keeps wakes flowing (at the cost of the upstream duplicate-runner
+ * bug) instead of producing no notification at all or nagging the user
+ * to relaunch with a different flag.
+ *
  * Tracked upstream as anomalyco/opencode#28202. When OpenCode fixes the
  * runtime split, this helper and its single consumer in `bg-notifications.ts`
  * can be deleted and the wake path can go back to `input.client`.
@@ -38,23 +48,32 @@ export type LiveServerClient = ReturnType<typeof createOpencodeClient>;
 export declare function getLiveServerClient(serverUrl: string, directory: string): LiveServerClient;
 /** Test helper — drop the cache between cases so each test starts clean. */
 export declare function __resetLiveServerClientCacheForTests(): void;
-/**
- * True when the current runtime is Bun. OpenCode's TUI ships with Bun;
- * the Electron Desktop app ships with Node. We use this to gate the
- * `--port 0` nudge: Desktop is unaffected by anomalyco/opencode#28202
- * because Node's webidl polyfill is complete, so undici v8 (and the live
- * HTTP server) work without additional flags.
- */
-export declare function isBunRuntime(): boolean;
 /**
  * Probe whether `serverUrl` accepts a connection within `timeoutMs`.
  * Returns `true` for any HTTP response (including 4xx / 5xx) since the
  * goal is to confirm the listener exists. Returns `false` on connection
  * refused, DNS failure, timeout, or undefined URL.
  *
- * Used at plugin init under Bun to detect TUI sessions started without
- * `opencode --port 0` — those bind an internal-only listener that 404s
- * for `/session/...` endpoints and breaks AFT's wake path.
+ * Used at plugin init to decide whether bg-notifications should use the
+ * live-server wake transport (workaround for anomalyco/opencode#28202)
+ * or fall back to the in-process `input.client.session.promptAsync`
+ * path. Plain TUI (no `--port 0`) binds an internal-only listener that
+ * 404s for `/session/...`, so this returns false there; OpenCode
+ * Desktop, `opencode run`, and `opencode --port 0` TUI return true.
  */
 export declare function probeServerReachable(serverUrl: string | undefined, timeoutMs?: number): Promise<boolean>;
+/**
+ * Record the probe result. Idempotent; if you record twice, the latest
+ * value wins. The wake path reads through `useLiveServerWake()`.
+ */
+export declare function setLiveServerWakeAvailable(available: boolean): void;
+/**
+ * Read the cached probe decision. `true` means the wake path should use
+ * `getLiveServerClient(serverUrl, directory)` and POST through the live
+ * HTTP listener. `false` means fall back to the in-process client passed
+ * via plugin context (`input.client`).
+ */
+export declare function useLiveServerWake(): boolean;
+/** Test helper — reset the decision cache between cases. */
+export declare function __resetLiveServerWakeForTests(): void;
 //# sourceMappingURL=live-server-client.d.ts.map

package/dist/shared/live-server-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live-server-client.d.ts","sourceRoot":"","sources":["../../src/shared/live-server-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AA6BvE;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAY1F;AAED,4EAA4E;AAC5E,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,SAAS,SAAO,GACf,OAAO,CAAC,OAAO,CAAC,CAqBlB"}
+{"version":3,"file":"live-server-client.d.ts","sourceRoot":"","sources":["../../src/shared/live-server-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AA6BvE;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAY1F;AAED,4EAA4E;AAC5E,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,SAAS,SAAO,GACf,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAmBD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,4DAA4D;AAC5D,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD"}

package/dist/tui.js

@@ -3,7 +3,7 @@ import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as
 // package.json
 var package_default = {
   name: "@cortexkit/aft-opencode",
-  version: "0.28.2",
+  version: "0.29.1",
   type: "module",
   description: "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   main: "dist/index.js",
@@ -32,7 +32,7 @@ var package_default = {
   },
   dependencies: {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.28.2",
+    "@cortexkit/aft-bridge": "0.29.1",
     "@opencode-ai/plugin": "^1.15.5",
     "@opencode-ai/sdk": "^1.15.5",
     "comment-json": "^4.6.2",
@@ -40,12 +40,12 @@ var package_default = {
     zod: "^4.1.8"
   },
   optionalDependencies: {
-    "@cortexkit/aft-darwin-arm64": "0.28.2",
-    "@cortexkit/aft-darwin-x64": "0.28.2",
-    "@cortexkit/aft-linux-arm64": "0.28.2",
-    "@cortexkit/aft-linux-x64": "0.28.2",
-    "@cortexkit/aft-win32-arm64": "0.28.2",
-    "@cortexkit/aft-win32-x64": "0.28.2"
+    "@cortexkit/aft-darwin-arm64": "0.29.1",
+    "@cortexkit/aft-darwin-x64": "0.29.1",
+    "@cortexkit/aft-linux-arm64": "0.29.1",
+    "@cortexkit/aft-linux-x64": "0.29.1",
+    "@cortexkit/aft-win32-arm64": "0.29.1",
+    "@cortexkit/aft-win32-x64": "0.29.1"
   },
   devDependencies: {
     "@types/node": "^22.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.28.2",
+  "version": "0.29.1",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.28.2",
+    "@cortexkit/aft-bridge": "0.29.1",
     "@opencode-ai/plugin": "^1.15.5",
     "@opencode-ai/sdk": "^1.15.5",
     "comment-json": "^4.6.2",
@@ -37,12 +37,12 @@
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.28.2",
-    "@cortexkit/aft-darwin-x64": "0.28.2",
-    "@cortexkit/aft-linux-arm64": "0.28.2",
-    "@cortexkit/aft-linux-x64": "0.28.2",
-    "@cortexkit/aft-win32-arm64": "0.28.2",
-    "@cortexkit/aft-win32-x64": "0.28.2"
+    "@cortexkit/aft-darwin-arm64": "0.29.1",
+    "@cortexkit/aft-darwin-x64": "0.29.1",
+    "@cortexkit/aft-linux-arm64": "0.29.1",
+    "@cortexkit/aft-linux-x64": "0.29.1",
+    "@cortexkit/aft-win32-arm64": "0.29.1",
+    "@cortexkit/aft-win32-x64": "0.29.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/shared/bash-hints.ts

@@ -0,0 +1,45 @@
+// Pure helpers for the bash-output hint nudges fired from `tool.execute.after`.
+//
+// These run on every bash result and append agent-visible "[Hint] ..." lines
+// that steer toward AFT tools. The functions return the new output string
+// (or the original string when no hint should fire) so the hook can compose
+// them without managing state.
+
+const CONFLICT_HINT =
+  "\n\n[Hint] Use aft_conflicts to see all conflict regions across files in a single call.";
+const GREP_HINT = "\n\n[Hint] Use the grep tool instead of bash for faster indexed search.";
+
+/**
+ * Append the `aft_conflicts` hint when the output indicates a real git merge
+ * or rebase produced conflicts.
+ *
+ * Gated on BOTH:
+ *  - the "Automatic merge failed; fix conflicts" marker, AND
+ *  - a git-conflict signal (`CONFLICT (...)` line or `error: could not apply`)
+ *
+ * Both conditions are required because `aft_conflicts` calls `git ls-files -u`,
+ * which fails with "not a git repository" outside a git working tree. The
+ * marker string can legitimately appear in docs, READMEs, test fixtures, and
+ * grep output, so we cannot key off it alone — a false-positive hint sends
+ * agents into a confusing error.
+ */
+export function maybeAppendConflictsHint(output: string): string {
+  if (!output.includes("Automatic merge failed; fix conflicts")) return output;
+  // git merge prints "CONFLICT (content|file|...): ..." per file.
+  // git rebase / git am print "error: could not apply <sha>" per failed pick.
+  if (!/^CONFLICT \(|^error: could not apply /m.test(output)) return output;
+  return output + CONFLICT_HINT;
+}
+
+/**
+ * Append the grep-tool hint when the bash command was a grep/rg invocation.
+ *
+ * Detected by examining the FIRST LINE of output (which is the echoed command
+ * line on most shells in foreground mode). We cap the slice at 300 chars so
+ * a single huge first line doesn't slow this hook.
+ */
+export function maybeAppendGrepHint(output: string): string {
+  const firstLine = output.slice(0, 300).split("\n")[0] ?? "";
+  if (!/\b(rg|grep)\s/.test(firstLine)) return output;
+  return output + GREP_HINT;
+}

package/src/shared/live-server-client.ts

@@ -19,6 +19,16 @@
  * UI uses, so the active session's `SessionRunState` is the one that
  * resolves `ensureRunning` and overlapping turns coalesce correctly.
  *
+ * The workaround only works when the live HTTP listener is actually
+ * reachable. OpenCode Desktop (Electron+Node) and TUI launched with
+ * `opencode --port 0` bind a real API listener; plain TUI binds an
+ * internal-only listener that 404s for `/session/*`. We probe once at
+ * plugin init and cache the result. When the listener is unreachable
+ * the wake path silently uses the in-process `input.client.session.promptAsync`,
+ * which keeps wakes flowing (at the cost of the upstream duplicate-runner
+ * bug) instead of producing no notification at all or nagging the user
+ * to relaunch with a different flag.
+ *
  * Tracked upstream as anomalyco/opencode#28202. When OpenCode fixes the
  * runtime split, this helper and its single consumer in `bg-notifications.ts`
  * can be deleted and the wake path can go back to `input.client`.
@@ -84,26 +94,18 @@ export function __resetLiveServerClientCacheForTests(): void {
   clientCache.clear();
 }
 
-/**
- * True when the current runtime is Bun. OpenCode's TUI ships with Bun;
- * the Electron Desktop app ships with Node. We use this to gate the
- * `--port 0` nudge: Desktop is unaffected by anomalyco/opencode#28202
- * because Node's webidl polyfill is complete, so undici v8 (and the live
- * HTTP server) work without additional flags.
- */
-export function isBunRuntime(): boolean {
-  return typeof (globalThis as { Bun?: unknown }).Bun !== "undefined";
-}
-
 /**
  * Probe whether `serverUrl` accepts a connection within `timeoutMs`.
  * Returns `true` for any HTTP response (including 4xx / 5xx) since the
  * goal is to confirm the listener exists. Returns `false` on connection
  * refused, DNS failure, timeout, or undefined URL.
  *
- * Used at plugin init under Bun to detect TUI sessions started without
- * `opencode --port 0` — those bind an internal-only listener that 404s
- * for `/session/...` endpoints and breaks AFT's wake path.
+ * Used at plugin init to decide whether bg-notifications should use the
+ * live-server wake transport (workaround for anomalyco/opencode#28202)
+ * or fall back to the in-process `input.client.session.promptAsync`
+ * path. Plain TUI (no `--port 0`) binds an internal-only listener that
+ * 404s for `/session/...`, so this returns false there; OpenCode
+ * Desktop, `opencode run`, and `opencode --port 0` TUI return true.
  */
 export async function probeServerReachable(
   serverUrl: string | undefined,
@@ -130,3 +132,43 @@ export async function probeServerReachable(
     clearTimeout(timer);
   }
 }
+
+/**
+ * Per-plugin-process decision: should bg-notifications use the live-server
+ * wake transport (workaround for anomalyco/opencode#28202), or fall back
+ * to the in-process `input.client.session.promptAsync` path?
+ *
+ * Set once at plugin init from the result of `probeServerReachable()`.
+ * Defaults to `false` if no decision has been recorded yet — that's the
+ * safe direction because `input.client.session.promptAsync` is always
+ * available (it's part of the plugin contract), whereas the live-server
+ * path needs both a probe-confirmed listener and the workaround code
+ * itself to be live.
+ *
+ * Read at wake time (not cached on a closure) so background probes that
+ * complete after plugin init still take effect on the next wake.
+ */
+let liveServerWakeAvailable = false;
+
+/**
+ * Record the probe result. Idempotent; if you record twice, the latest
+ * value wins. The wake path reads through `useLiveServerWake()`.
+ */
+export function setLiveServerWakeAvailable(available: boolean): void {
+  liveServerWakeAvailable = available;
+}
+
+/**
+ * Read the cached probe decision. `true` means the wake path should use
+ * `getLiveServerClient(serverUrl, directory)` and POST through the live
+ * HTTP listener. `false` means fall back to the in-process client passed
+ * via plugin context (`input.client`).
+ */
+export function useLiveServerWake(): boolean {
+  return liveServerWakeAvailable;
+}
+
+/** Test helper — reset the decision cache between cases. */
+export function __resetLiveServerWakeForTests(): void {
+  liveServerWakeAvailable = false;
+}