Skip to content

Fix refresh logic #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matyrr-havok wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix refresh logic #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions content/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ contextMenu.addEventListener("click", async (e) => {

if (action === "refresh") {
hideContextMenu();
await pullState();
await pullState({ force: true });
return;
}
if (action === "reset-layout") {
Expand Down Expand Up @@ -732,9 +732,9 @@ window.addEventListener("resize", () => {

// ---- Boot ---------------------------------------------------------------

async function pullState() {
async function pullState({ force = false } = {}) {
try {
const state = await copilot.getState();
const state = force ? await copilot.requestRefresh() : await copilot.getState();
applyState(state);
} catch (e) {
// The page logs to the extension via copilot.log instead of
Expand All @@ -744,7 +744,7 @@ async function pullState() {
}
}

refreshBtn.addEventListener("click", pullState);
refreshBtn.addEventListener("click", () => pullState({ force: true }));

(async () => {
await initTheme();
Expand Down
33 changes: 26 additions & 7 deletions main.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { joinSession } from "@github/copilot-sdk/extension";
import { createRequire } from "node:module";
import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, watchFile, unwatchFile } from "node:fs";
import { homedir } from "node:os";
import { dirname, join } from "node:path";
import { join } from "node:path";
import { CopilotWebview } from "./lib/copilot-webview.js";

const require = createRequire(import.meta.url);
Expand Down Expand Up @@ -247,14 +247,30 @@ async function buildState() {
}

async function safeReadPlan() {
const diskPath = cachedSessionInfo?.workspacePath
? join(cachedSessionInfo.workspacePath, "plan.md")
: null;

if (diskPath) {
try {
return { exists: true, content: readFileSync(diskPath, "utf8"), path: diskPath };
} catch (e) {
if (e?.code !== "ENOENT" && e?.code !== "ENOTDIR") {
try { await session.log(`plan-visualizer: failed to read plan from ${diskPath} (${e.message})`, { level: "warning" }); } catch {}
return { exists: false, content: null, path: diskPath };
}
}
}

if (!session?.rpc?.plan?.read) {
return { exists: false, content: null, path: null };
return { exists: false, content: null, path: diskPath };
}
try {
const r = await session.rpc.plan.read();
return { exists: !!r?.exists, content: r?.content ?? null, path: r?.path ?? null };
const content = r?.content ?? null;
return { exists: !!r?.exists || content !== null, content, path: r?.path ?? diskPath };
} catch {
return { exists: false, content: null, path: null };
return { exists: false, content: null, path: diskPath };
}
}

Expand All @@ -274,9 +290,9 @@ function schedulePush() {
const state = await buildState();
const h = hashOf(state);
if (h === lastPushedHash) return;
lastPushedHash = h;
const code = `window.__plan?.update?.(${JSON.stringify(state)})`;
await webview.eval(code, { timeoutMs: 2000 }).catch(() => {});
await webview.eval(code, { timeoutMs: 2000 });
lastPushedHash = h;
} catch (e) {
try { await session.log(`plan-visualizer: pushState failed (${e.message})`, { level: "warning" }); } catch {}
}
Expand Down Expand Up @@ -345,7 +361,10 @@ const webview = new CopilotWebview({
height: 760,
callbacks: {
getState: async () => buildState(),
requestRefresh: async () => buildState(),
requestRefresh: async () => {
lastPushedHash = "";
return buildState();
},
listThemes: () => listThemes(),
getInitialTheme: () => readPersistedState().theme || null,
setThemeChoice: ({ name, mode } = {}) => {
Expand Down