@cortexkit/aft-opencode 0.6.7 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAgClD;;;;;;;;;;;;;;;;;GAiBG;AACH,QAAA,MAAM,MAAM,EAAE,MAuIb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -17,6 +17,7 @@ const PLUGIN_VERSION = (() => {
|
|
|
17
17
|
}
|
|
18
18
|
})();
|
|
19
19
|
import { astTools } from "./tools/ast.js";
|
|
20
|
+
import { conflictTools } from "./tools/conflicts.js";
|
|
20
21
|
import { aftPrefixedTools, hoistedTools } from "./tools/hoisted.js";
|
|
21
22
|
import { importTools } from "./tools/imports.js";
|
|
22
23
|
import { lspTools } from "./tools/lsp.js";
|
|
@@ -108,6 +109,8 @@ const plugin = async (input) => {
|
|
|
108
109
|
...refactoringTools(ctx),
|
|
109
110
|
// LSP diagnostics: recommended+
|
|
110
111
|
...(surface !== "minimal" && lspTools(ctx)),
|
|
112
|
+
// Git conflicts: recommended+
|
|
113
|
+
...(surface !== "minimal" && conflictTools(ctx)),
|
|
111
114
|
});
|
|
112
115
|
// Remove all-only tools when surface is minimal or recommended
|
|
113
116
|
if (surface !== "all") {
|
|
@@ -143,6 +146,12 @@ const plugin = async (input) => {
|
|
|
143
146
|
if (stored.metadata)
|
|
144
147
|
output.metadata = { ...output.metadata, ...stored.metadata };
|
|
145
148
|
}
|
|
149
|
+
// Hint: when a git merge/rebase produces conflicts, nudge the agent toward aft_conflicts
|
|
150
|
+
if (input.tool === "bash" &&
|
|
151
|
+
output.output?.includes("Automatic merge failed; fix conflicts")) {
|
|
152
|
+
output.output +=
|
|
153
|
+
"\n\n[Hint] Use aft_conflicts to see all conflict regions across files in a single call.";
|
|
154
|
+
}
|
|
146
155
|
},
|
|
147
156
|
dispose: () => pool.shutdown(),
|
|
148
157
|
};
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qEAAqE;AACrE,MAAM,cAAc,GAAW,CAAC,GAAG,EAAE;IACnC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3C,OAAQ,GAAG,CAAC,iBAAiB,CAAyB,CAAC,OAAO,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qEAAqE;AACrE,MAAM,cAAc,GAAW,CAAC,GAAG,EAAE;IACnC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3C,OAAQ,GAAG,CAAC,iBAAiB,CAAyB,CAAC,OAAO,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,GAAW,KAAK,EAAE,KAAK,EAAE,EAAE;IACrC,MAAM,UAAU,GAAG,MAAM,UAAU,EAAE,CAAC;IAEtC,4EAA4E;IAC5E,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEjD,sEAAsE;IACtE,MAAM,eAAe,GAA4B,EAAE,CAAC;IACpD,IAAI,SAAS,CAAC,cAAc,KAAK,SAAS;QACxC,eAAe,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;IAC5D,IAAI,SAAS,CAAC,gBAAgB,KAAK,SAAS;QAC1C,eAAe,CAAC,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC;IAChE,IAAI,SAAS,CAAC,SAAS,KAAK,SAAS;QAAE,eAAe,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;IACvF,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS;QAAE,eAAe,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IACjF,IAAI,SAAS,CAAC,wBAAwB,KAAK,SAAS;QAClD,eAAe,CAAC,wBAAwB,GAAG,SAAS,CAAC,wBAAwB,CAAC;IAEhF,MAAM,IAAI,GAAG,IAAI,UAAU,CACzB,UAAU,EACV;QACE,UAAU,EAAE,cAAc;QAC1B,iBAAiB,EAAE,CAAC,aAAa,EAAE,UAAU,EAAE,EAAE;YAC/C,IAAI,CACF,wBAAwB,aAAa,0BAA0B,UAAU,IAAI;gBAC3E,2EAA2E,CAC9E,CAAC;YACF,iEAAiE;YACjE,YAAY,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,IAAI,CACjC,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,IAAI,EAAE,CAAC;oBACT,GAAG,CAAC,yCAAyC,IAAI,gCAAgC,CAAC,CAAC;oBACnF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAC3B,GAAG,EAAE,CAAC,GAAG,CAAC,wEAAwE,CAAC,EACnF,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CACjD,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,+BAA+B,UAAU,sBAAsB,aAAa,GAAG,CAAC,CAAC;gBACxF,CAAC;YACH,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,KAAK,CACH,yBAA0B,GAAa,CAAC,OAAO,sDAAsD,UAAU,EAAE,CAClH,CAAC;YACJ,CAAC,CACF,CAAC;QACJ,CAAC;KACF,EACD,eAAe,CAChB,CAAC;IACF,MAAM,GAAG,GAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAE7E,sBAAsB;IACtB,mDAAmD;IACnD,yFAAyF;IACzF,+FAA+F;IAC/F,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,IAAI,aAAa,CAAC;IAExD,qCAAqC;IACrC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;QAC7B,cAAc;QACd,YAAY;QACZ,UAAU;QACV,eAAe;QACf,cAAc;KACf,CAAC,CAAC;IAEH,sBAAsB;IACtB,MAAM,QAAQ,GAAG,gBAAgB,CAAC;QAChC,+EAA+E;QAC/E,GAAG,CAAC,OAAO,KAAK,SAAS;YACvB,CAAC,SAAS,CAAC,mBAAmB,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;QACxF,GAAG,YAAY,CAAC,GAAG,CAAC;QAEpB,GAAG,WAAW,CAAC,GAAG,CAAC;QACnB,2BAA2B;QAC3B,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;QAC9C,GAAG,cAAc,CAAC,GAAG,CAAC;QACtB,GAAG,eAAe,CAAC,GAAG,CAAC;QACvB,0BAA0B;QAC1B,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3C,GAAG,gBAAgB,CAAC,GAAG,CAAC;QACxB,gCAAgC;QAChC,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3C,8BAA8B;QAC9B,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC;KACjD,CAAC,CAAC;IAEH,+DAA+D;IAC/D,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;gBACrB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;IACzD,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;gBACrB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,IAAI,CACF,oBAAoB,IAAI,4BAA4B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACvF,CAAC;YACJ,CAAC;QACH,CAAC;QACD,GAAG,CAAC,YAAY,QAAQ,CAAC,IAAI,aAAa,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,0EAA0E;QAC1E,oBAAoB,EAAE,KAAK,EACzB,KAA0D,EAC1D,MAAwF,EACxF,EAAE;YACF,IAAI,CAAC,MAAM;gBAAE,OAAO;YACpB,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAClE,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,MAAM,CAAC,KAAK;oBAAE,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC9C,IAAI,MAAM,CAAC,QAAQ;oBAAE,MAAM,CAAC,QAAQ,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpF,CAAC;YACD,yFAAyF;YACzF,IACE,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,uCAAuC,CAAC,EAChE,CAAC;gBACD,MAAM,CAAC,MAAM;oBACX,yFAAyF,CAAC;YAC9F,CAAC;QACH,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;KAC/B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { ToolDefinition } from "@opencode-ai/plugin";
|
|
2
|
+
import type { PluginContext } from "../types.js";
|
|
3
|
+
/**
|
|
4
|
+
* Tool definition for the git conflict discovery and parsing tool.
|
|
5
|
+
*/
|
|
6
|
+
export declare function conflictTools(ctx: PluginContext): Record<string, ToolDefinition>;
|
|
7
|
+
//# sourceMappingURL=conflicts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/tools/conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAgBhF"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tool definition for the git conflict discovery and parsing tool.
|
|
3
|
+
*/
|
|
4
|
+
export function conflictTools(ctx) {
|
|
5
|
+
return {
|
|
6
|
+
aft_conflicts: {
|
|
7
|
+
description: "Show all git merge conflicts across the repository — returns line-numbered conflict regions with context for every conflicted file in a single call.",
|
|
8
|
+
args: {},
|
|
9
|
+
execute: async (_args, context) => {
|
|
10
|
+
const bridge = ctx.pool.getBridge(context.directory, context.sessionID);
|
|
11
|
+
const response = await bridge.send("git_conflicts", {});
|
|
12
|
+
if (response.success === false) {
|
|
13
|
+
throw new Error(response.message || "git_conflicts failed");
|
|
14
|
+
}
|
|
15
|
+
return response.text;
|
|
16
|
+
},
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=conflicts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/tools/conflicts.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,GAAkB;IAC9C,OAAO;QACL,aAAa,EAAE;YACb,WAAW,EACT,sJAAsJ;YACxJ,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAmB,EAAE;gBACjD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACxE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;gBACxD,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;oBAC/B,MAAM,IAAI,KAAK,CAAE,QAAQ,CAAC,OAAkB,IAAI,sBAAsB,CAAC,CAAC;gBAC1E,CAAC;gBACD,OAAO,QAAQ,CAAC,IAAc,CAAC;YACjC,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cortexkit/aft-opencode",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"zod": "^4.1.8"
|
|
29
29
|
},
|
|
30
30
|
"optionalDependencies": {
|
|
31
|
-
"@cortexkit/aft-darwin-arm64": "0.
|
|
32
|
-
"@cortexkit/aft-darwin-x64": "0.
|
|
33
|
-
"@cortexkit/aft-linux-arm64": "0.
|
|
34
|
-
"@cortexkit/aft-linux-x64": "0.
|
|
35
|
-
"@cortexkit/aft-win32-x64": "0.
|
|
31
|
+
"@cortexkit/aft-darwin-arm64": "0.7.0",
|
|
32
|
+
"@cortexkit/aft-darwin-x64": "0.7.0",
|
|
33
|
+
"@cortexkit/aft-linux-arm64": "0.7.0",
|
|
34
|
+
"@cortexkit/aft-linux-x64": "0.7.0",
|
|
35
|
+
"@cortexkit/aft-win32-x64": "0.7.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/node": "^22.0.0",
|