@cortexkit/aft-opencode 0.28.1 → 0.29.0

package/dist/config.d.ts

@@ -19,6 +19,7 @@ export declare const AftConfigSchema: z.ZodObject<{
     }>>;
     formatter: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
         biome: "biome";
+        oxfmt: "oxfmt";
         prettier: "prettier";
         deno: "deno";
         ruff: "ruff";
@@ -33,6 +34,7 @@ export declare const AftConfigSchema: z.ZodObject<{
         ruff: "ruff";
         none: "none";
         tsc: "tsc";
+        tsgo: "tsgo";
         pyright: "pyright";
         cargo: "cargo";
         go: "go";

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmExB,eAAO,MAAM,eAAe;;;;;;;;;iBAE1B,CAAC;AAuEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAqFjB,CAAC;AAEZ,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,sCAAsC,CAAC,EAAE,MAAM,CAAC;IAChD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAMD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,GAAG,qBAAqB,CAmDrF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA4B9F;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,iCAAiC,CAAC,EAAE,MAAM,CAAC;CAC5C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,kBAAkB,CAwEvE;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,SAAS,GAChB,8BAA8B,CAsBhC;AAED,KAAK,MAAM,GAAG;IACZ,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,CAAC;AAoMF,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAsB,GAC7B;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAwD1C;AAsWD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAiDjE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAqExB,eAAO,MAAM,eAAe;;;;;;;;;iBAE1B,CAAC;AAuEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAqFjB,CAAC;AAEZ,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,sCAAsC,CAAC,EAAE,MAAM,CAAC;IAChD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAMD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,GAAG,qBAAqB,CAmDrF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA4B9F;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,iCAAiC,CAAC,EAAE,MAAM,CAAC;CAC5C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,kBAAkB,CAwEvE;AAED,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,SAAS,GAChB,8BAA8B,CAsBhC;AAED,KAAK,MAAM,GAAG;IACZ,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,CAAC;AAoMF,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAsB,GAC7B;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAwD1C;AAsWD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAiDjE"}

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;AAozB5E,eAAe,MAAM,CAAC"}

package/dist/index.js

@@ -46720,6 +46720,7 @@ config(en_default());
 // src/config.ts
 var FormatterEnum = exports_external.enum([
   "biome",
+  "oxfmt",
   "prettier",
   "deno",
   "ruff",
@@ -46731,6 +46732,7 @@ var FormatterEnum = exports_external.enum([
 ]);
 var CheckerEnum = exports_external.enum([
   "tsc",
+  "tsgo",
   "biome",
   "pyright",
   "ruff",
@@ -48536,7 +48538,8 @@ function runInstall(spec, version2, cwd, signal) {
       resolve3(false);
       return;
     }
-    const child = spawn3("npm", ["install", "--no-save", "--ignore-scripts", "--silent", target], {
+    const npmBin = process.platform === "win32" ? "npm.cmd" : "npm";
+    const child = spawn3(npmBin, ["install", "--no-save", "--ignore-scripts", "--silent", target], {
       stdio: ["ignore", "pipe", "pipe"],
       cwd
     });
@@ -49955,6 +49958,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";
@@ -54251,19 +54276,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/lsp-auto-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-auto-install.d.ts","sourceRoot":"","sources":["../src/lsp-auto-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AA4BH,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,oCAAoC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,kGAAkG;IAClG,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B;AAED,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gDAAgD;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;;;OAOG;IACH,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C;;;;;;;;;OASG;IACH,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AA8DD,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAM/D;AAqXD;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,iBAAiB,EACzB,SAAS,GAAE,OAAO,KAAa,GAC9B,iBAAiB,CAwEnB"}
+{"version":3,"file":"lsp-auto-install.d.ts","sourceRoot":"","sources":["../src/lsp-auto-install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AA4BH,+DAA+D;AAC/D,MAAM,WAAW,iBAAiB;IAChC,oCAAoC;IACpC,WAAW,EAAE,OAAO,CAAC;IACrB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,kGAAkG;IAClG,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B;AAED,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gDAAgD;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;;;OAOG;IACH,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C;;;;;;;;;OASG;IACH,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AA8DD,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAM/D;AA4XD;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,iBAAiB,EACzB,SAAS,GAAE,OAAO,KAAa,GAC9B,iBAAiB,CAwEnB"}

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/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.1",
+  version: "0.29.0",
   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.1",
+    "@cortexkit/aft-bridge": "0.29.0",
     "@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.1",
-    "@cortexkit/aft-darwin-x64": "0.28.1",
-    "@cortexkit/aft-linux-arm64": "0.28.1",
-    "@cortexkit/aft-linux-x64": "0.28.1",
-    "@cortexkit/aft-win32-arm64": "0.28.1",
-    "@cortexkit/aft-win32-x64": "0.28.1"
+    "@cortexkit/aft-darwin-arm64": "0.29.0",
+    "@cortexkit/aft-darwin-x64": "0.29.0",
+    "@cortexkit/aft-linux-arm64": "0.29.0",
+    "@cortexkit/aft-linux-x64": "0.29.0",
+    "@cortexkit/aft-win32-arm64": "0.29.0",
+    "@cortexkit/aft-win32-x64": "0.29.0"
   },
   devDependencies: {
     "@types/node": "^22.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.28.1",
+  "version": "0.29.0",
   "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.1",
+    "@cortexkit/aft-bridge": "0.29.0",
     "@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.1",
-    "@cortexkit/aft-darwin-x64": "0.28.1",
-    "@cortexkit/aft-linux-arm64": "0.28.1",
-    "@cortexkit/aft-linux-x64": "0.28.1",
-    "@cortexkit/aft-win32-arm64": "0.28.1",
-    "@cortexkit/aft-win32-x64": "0.28.1"
+    "@cortexkit/aft-darwin-arm64": "0.29.0",
+    "@cortexkit/aft-darwin-x64": "0.29.0",
+    "@cortexkit/aft-linux-arm64": "0.29.0",
+    "@cortexkit/aft-linux-x64": "0.29.0",
+    "@cortexkit/aft-win32-arm64": "0.29.0",
+    "@cortexkit/aft-win32-x64": "0.29.0"
   },
   "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;
+}