@cortexkit/aft-opencode 0.28.2 → 0.29.0

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

@@ -49958,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";
@@ -54254,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/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.2",
+  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.2",
+    "@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.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.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.2",
+  "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.2",
+    "@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.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.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;
+}