summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--js/bun.lock3
-rw-r--r--js/package.json1
-rw-r--r--js/src/index.ts57
-rw-r--r--js/src/lsp/client.ts7
-rw-r--r--js/src/lsp/index.ts18
-rw-r--r--js/src/session/session.ts3
-rw-r--r--js/src/tool/index.ts3
-rw-r--r--js/src/tool/lsp-diagnostics.ts (renamed from js/src/tool/diagnostics.ts)2
-rw-r--r--js/src/tool/lsp-hover.ts38
9 files changed, 117 insertions, 15 deletions
diff --git a/js/bun.lock b/js/bun.lock
index bf5357c81..971ed8b93 100644
--- a/js/bun.lock
+++ b/js/bun.lock
@@ -11,6 +11,7 @@
"ai": "^5.0.0-alpha.4",
"cac": "^6.7.14",
"clipanion": "^4.0.0-rc.4",
+ "diff": "^8.0.2",
"hono": "^4.7.10",
"hono-openapi": "^0.4.8",
"jsdom": "^26.1.0",
@@ -159,6 +160,8 @@
"decimal.js": ["[email protected]", "", {}, "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="],
+ "diff": ["[email protected]", "", {}, "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg=="],
+
"duplexify": ["[email protected]", "", { "dependencies": { "end-of-stream": "^1.4.1", "inherits": "^2.0.3", "readable-stream": "^3.1.1", "stream-shift": "^1.0.2" } }, "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA=="],
"emoji-regex": ["[email protected]", "", {}, "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="],
diff --git a/js/package.json b/js/package.json
index 8504de450..70d4f82a8 100644
--- a/js/package.json
+++ b/js/package.json
@@ -27,6 +27,7 @@
"ai": "^5.0.0-alpha.4",
"cac": "^6.7.14",
"clipanion": "^4.0.0-rc.4",
+ "diff": "^8.0.2",
"hono": "^4.7.10",
"hono-openapi": "^0.4.8",
"jsdom": "^26.1.0",
diff --git a/js/src/index.ts b/js/src/index.ts
index b0e3ed270..7d6feed45 100644
--- a/js/src/index.ts
+++ b/js/src/index.ts
@@ -6,6 +6,7 @@ import { Bus } from "./bus";
import { Session } from "./session/session";
import cac from "cac";
import { Share } from "./share/share";
+import { Storage } from "./storage/storage";
const cli = cac("opencode");
@@ -41,6 +42,52 @@ cli
const shareID = await Session.share(session.id);
if (shareID)
console.log("Share ID: https://dev.opencode.ai/share?id=" + session.id);
+
+ let index = 0;
+ Bus.subscribe(Storage.Event.Write, async (payload) => {
+ const [root, , type, messageID] = payload.properties.key.split("/");
+ if (root !== "session" && type !== "message") return;
+ const message = await Session.messages(session.id).then((x) =>
+ x.find((x) => x.id === messageID),
+ );
+ if (!message) return;
+
+ for (; index < message.parts.length; index++) {
+ const part = message.parts[index];
+ if (part.type === "text") continue;
+ if (part.type === "step-start") continue;
+ if (
+ part.type === "tool-invocation" &&
+ part.toolInvocation.state !== "result"
+ )
+ break;
+
+ if (part.type === "tool-invocation") {
+ console.log(`🔧 ${part.toolInvocation.toolName}`);
+ if (
+ part.toolInvocation.state === "result" &&
+ "result" in part.toolInvocation
+ ) {
+ const result = part.toolInvocation.result;
+ if (typeof result === "string") {
+ const lines = result.split("\n");
+ const truncated = lines.slice(0, 4);
+ if (lines.length > 4) truncated.push("...");
+ console.log(truncated.join("\n"));
+ } else if (result && typeof result === "object") {
+ const jsonStr = JSON.stringify(result, null, 2);
+ const lines = jsonStr.split("\n");
+ const truncated = lines.slice(0, 4);
+ if (lines.length > 4) truncated.push("...");
+ console.log(truncated.join("\n"));
+ }
+ }
+ continue;
+ }
+ console.log(part);
+ }
+ });
+
const result = await Session.chat(session.id, {
type: "text",
text: message.join(" "),
@@ -50,16 +97,6 @@ cli
if (part.type === "text") {
console.log("opencode:", part.text);
}
- if (part.type === "tool-invocation") {
- console.log(
- "tool:",
- part.toolInvocation.toolName,
- part.toolInvocation.args,
- part.toolInvocation.state === "result"
- ? part.toolInvocation.result
- : "",
- );
- }
}
});
});
diff --git a/js/src/lsp/client.ts b/js/src/lsp/client.ts
index e8e7d694e..1de187a94 100644
--- a/js/src/lsp/client.ts
+++ b/js/src/lsp/client.ts
@@ -144,7 +144,7 @@ export namespace LSPClient {
textDocument: {
uri: `file://` + input.path,
languageId,
- version: ++version,
+ version: Date.now(),
text,
},
});
@@ -157,7 +157,7 @@ export namespace LSPClient {
await connection.sendNotification("textDocument/didChange", {
textDocument: {
uri: `file://` + input.path,
- version: ++version,
+ version: Date.now(),
},
contentChanges: [
{
@@ -181,7 +181,7 @@ export namespace LSPClient {
event.properties.path === input.path &&
event.properties.serverID === result.clientID
) {
- log.info("refreshed diagnostics", input);
+ log.info("got diagnostics", input);
clearTimeout(timeout);
unsub?.();
resolve();
@@ -190,6 +190,7 @@ export namespace LSPClient {
}),
new Promise<void>((resolve) => {
timeout = setTimeout(() => {
+ log.info("timed out refreshing diagnostics", input);
unsub?.();
resolve();
}, 5000);
diff --git a/js/src/lsp/index.ts b/js/src/lsp/index.ts
index f9d48e7bf..2294d439f 100644
--- a/js/src/lsp/index.ts
+++ b/js/src/lsp/index.ts
@@ -54,6 +54,24 @@ export namespace LSP {
return results;
}
+ export async function hover(input: {
+ file: string;
+ line: number;
+ character: number;
+ }) {
+ return run((client) => {
+ return client.connection.sendRequest("textDocument/hover", {
+ textDocument: {
+ uri: `file://${input.file}`,
+ },
+ position: {
+ line: input.line,
+ character: input.character,
+ },
+ });
+ });
+ }
+
async function run<T>(
input: (client: LSPClient.Info) => Promise<T>,
): Promise<T[]> {
diff --git a/js/src/session/session.ts b/js/src/session/session.ts
index cbe6cd89c..8b3f7fba1 100644
--- a/js/src/session/session.ts
+++ b/js/src/session/session.ts
@@ -42,6 +42,7 @@ export namespace Session {
export type Message = UIMessage<{
time: {
created: number;
+ completed?: number;
};
sessionID: string;
tool: Record<string, Tool.Metadata>;
@@ -305,6 +306,8 @@ export namespace Session {
}
await write(next);
}
+ next.metadata!.time.completed = Date.now();
+ await write(next);
return next;
}
}
diff --git a/js/src/tool/index.ts b/js/src/tool/index.ts
index b18f85012..3930c87c4 100644
--- a/js/src/tool/index.ts
+++ b/js/src/tool/index.ts
@@ -5,4 +5,5 @@ export * from "./glob";
export * from "./grep";
export * from "./view";
export * from "./ls";
-export * from "./diagnostics";
+export * from "./lsp-diagnostics";
+export * from "./lsp-hover";
diff --git a/js/src/tool/diagnostics.ts b/js/src/tool/lsp-diagnostics.ts
index 3610c7781..41c33f822 100644
--- a/js/src/tool/diagnostics.ts
+++ b/js/src/tool/lsp-diagnostics.ts
@@ -4,7 +4,7 @@ import path from "node:path";
import { LSP } from "../lsp";
import { App } from "../app";
-export const DiagnosticsTool = Tool.define({
+export const LspDiagnosticTool = Tool.define({
name: "diagnostics",
description: `Get diagnostics for a file and/or project.
diff --git a/js/src/tool/lsp-hover.ts b/js/src/tool/lsp-hover.ts
new file mode 100644
index 000000000..9957920a2
--- /dev/null
+++ b/js/src/tool/lsp-hover.ts
@@ -0,0 +1,38 @@
+import { z } from "zod";
+import { Tool } from "./tool";
+import path from "node:path";
+import { LSP } from "../lsp";
+import { App } from "../app";
+
+export const LspHoverTool = Tool.define({
+ name: "lsp.hover",
+ description: `
+ Looks up hover information for a given position in a source file using the Language Server Protocol (LSP).
+ This includes type information, documentation, or symbol details at the specified line and character.
+ Useful for providing code insights, explanations, or context-aware assistance based on the user's current cursor location.
+ `,
+ parameters: z.object({
+ file: z.string().describe("The path to the file to get diagnostics."),
+ line: z.number().describe("The line number to get diagnostics."),
+ character: z.number().describe("The character number to get diagnostics."),
+ }),
+ execute: async (args) => {
+ console.log(args);
+ const app = await App.use();
+ const file = path.isAbsolute(args.file)
+ ? args.file
+ : path.join(app.root, args.file);
+ await LSP.file(file);
+ const result = await LSP.hover({
+ ...args,
+ file,
+ });
+ console.log(result);
+ return {
+ metadata: {
+ result,
+ },
+ output: JSON.stringify(result, null, 2),
+ };
+ },
+});
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-30 21:19:27 +0000