Skip to content

Commit 706c9da

Browse files
authored
Merge pull request anomalyco#227 from different-ai/add/restart-opencode-on-config-change
fix: reload workspace when OpenCode config changes
2 parents 3ece1a5 + c94f190 commit 706c9da

8 files changed

Lines changed: 291 additions & 15 deletions

File tree

‎packages/app/src/app/app.tsx‎

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import WorkspaceSwitchOverlay from "./components/workspace-switch-overlay";
2323
import CreateRemoteWorkspaceModal from "./components/create-remote-workspace-modal";
2424
import CreateWorkspaceModal from "./components/create-workspace-modal";
2525
import McpAuthModal from "./components/mcp-auth-modal";
26+
import ReloadWorkspaceToast from "./components/reload-workspace-toast";
2627
import OnboardingView from "./pages/onboarding";
2728
import DashboardView from "./pages/dashboard";
2829
import SessionView from "./pages/session";
@@ -153,6 +154,7 @@ export default function App() {
153154
const [busyStartedAt, setBusyStartedAt] = createSignal<number | null>(null);
154155
const [error, setError] = createSignal<string | null>(null);
155156
const [developerMode, setDeveloperMode] = createSignal(false);
157+
let markReloadRequiredRef: (reason: ReloadReason) => void = () => {};
156158

157159
const [selectedSessionId, setSelectedSessionId] = createSignal<string | null>(
158160
null
@@ -194,6 +196,7 @@ export default function App() {
194196
developerMode,
195197
setError,
196198
setSseConnected,
199+
markReloadRequired: (reason) => markReloadRequiredRef(reason),
197200
});
198201

199202
const {
@@ -501,8 +504,6 @@ export default function App() {
501504
const [mcpAuthModalOpen, setMcpAuthModalOpen] = createSignal(false);
502505
const [mcpAuthEntry, setMcpAuthEntry] = createSignal<(typeof MCP_QUICK_CONNECT)[number] | null>(null);
503506

504-
let markReloadRequiredRef: (reason: ReloadReason) => void = () => {};
505-
506507
const extensionsStore = createExtensionsStore({
507508
client,
508509
mode,
@@ -741,6 +742,7 @@ export default function App() {
741742
refreshPlugins,
742743
refreshSkills,
743744
refreshMcpServers,
745+
reloadWorkspaceEngine: () => workspaceStore.reloadWorkspaceEngine(),
744746
setProviders,
745747
setProviderDefaults,
746748
setProviderConnectedIds,
@@ -761,11 +763,10 @@ export default function App() {
761763
reloadLastTriggeredAt,
762764
reloadBusy,
763765
reloadError,
764-
reloadCopy,
765766
canReloadEngine,
766767
markReloadRequired,
767768
clearReloadRequired,
768-
reloadEngineInstance,
769+
reloadWorkspaceEngine,
769770
cacheRepairBusy,
770771
cacheRepairResult,
771772
repairOpencodeCache,
@@ -792,6 +793,43 @@ export default function App() {
792793
anyActiveRuns,
793794
} = systemState;
794795

796+
const [reloadToastDismissedAt, setReloadToastDismissedAt] = createSignal<number | null>(null);
797+
798+
const reloadToastVisible = createMemo(() => {
799+
if (!reloadRequired()) return false;
800+
const lastTriggeredAt = reloadLastTriggeredAt();
801+
const dismissedAt = reloadToastDismissedAt();
802+
if (!lastTriggeredAt) return true;
803+
if (!dismissedAt) return true;
804+
return dismissedAt < lastTriggeredAt;
805+
});
806+
807+
const reloadWarning = createMemo(() =>
808+
anyActiveRuns()
809+
? t("reload.toast_warning_active", currentLocale())
810+
: t("reload.toast_warning", currentLocale()),
811+
);
812+
813+
const reloadBlockedReason = createMemo(() => {
814+
if (!reloadRequired()) return null;
815+
if (!client()) return t("reload.toast_blocked_connect", currentLocale());
816+
if (mode() !== "host") return t("reload.toast_blocked_host", currentLocale());
817+
if (anyActiveRuns()) return t("reload.toast_blocked_runs", currentLocale());
818+
return null;
819+
});
820+
821+
const reloadActionLabel = createMemo(() =>
822+
reloadBusy()
823+
? t("reload.toast_reloading", currentLocale())
824+
: t("reload.toast_reload", currentLocale()),
825+
);
826+
827+
createEffect(() => {
828+
if (!reloadRequired()) {
829+
setReloadToastDismissedAt(null);
830+
}
831+
});
832+
795833
markReloadRequiredRef = markReloadRequired;
796834

797835
const {
@@ -1704,6 +1742,7 @@ export default function App() {
17041742
if (!result.ok) {
17051743
throw new Error(result.stderr || result.stdout || "Failed to update opencode.json");
17061744
}
1745+
markReloadRequired("config");
17071746
} catch (error) {
17081747
if (cancelled) return;
17091748
const message = error instanceof Error ? error.message : safeStringify(error);
@@ -2139,7 +2178,7 @@ export default function App() {
21392178
refreshMcpServers,
21402179
showMcpReloadBanner: reloadRequired() && reloadReasons().includes("mcp"),
21412180
mcpReloadBlocked: anyActiveRuns(),
2142-
reloadMcpEngine: () => reloadEngineInstance(),
2181+
reloadMcpEngine: () => reloadWorkspaceEngine(),
21432182
language: currentLocale(),
21442183
setLanguage: setLocale,
21452184
});
@@ -2284,7 +2323,7 @@ export default function App() {
22842323
setMcpAuthEntry(null);
22852324
await refreshMcpServers();
22862325
}}
2287-
onReloadEngine={() => reloadEngineInstance()}
2326+
onReloadEngine={() => reloadWorkspaceEngine()}
22882327
/>
22892328

22902329
<TemplateModal
@@ -2301,6 +2340,21 @@ export default function App() {
23012340
onScopeChange={setTemplateDraftScope}
23022341
/>
23032342

2343+
<ReloadWorkspaceToast
2344+
open={reloadToastVisible()}
2345+
title={t("reload.toast_title", currentLocale())}
2346+
description={t("reload.toast_description", currentLocale())}
2347+
warning={reloadWarning()}
2348+
blockedReason={reloadBlockedReason()}
2349+
error={reloadError()}
2350+
reloadLabel={reloadActionLabel()}
2351+
dismissLabel={t("reload.toast_dismiss", currentLocale())}
2352+
busy={reloadBusy()}
2353+
canReload={canReloadEngine()}
2354+
onReload={() => reloadWorkspaceEngine()}
2355+
onDismiss={() => setReloadToastDismissedAt(Date.now())}
2356+
/>
2357+
23042358
<WorkspacePicker
23052359
open={workspaceStore.workspacePickerOpen()}
23062360
workspaces={workspaceStore.workspaces()}
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import { Show } from "solid-js";
2+
import { AlertTriangle, RefreshCcw } from "lucide-solid";
3+
4+
import Button from "./button";
5+
6+
export type ReloadWorkspaceToastProps = {
7+
open: boolean;
8+
title: string;
9+
description: string;
10+
warning: string;
11+
blockedReason?: string | null;
12+
error?: string | null;
13+
reloadLabel: string;
14+
dismissLabel: string;
15+
busy?: boolean;
16+
canReload: boolean;
17+
onReload: () => void;
18+
onDismiss: () => void;
19+
};
20+
21+
export default function ReloadWorkspaceToast(props: ReloadWorkspaceToastProps) {
22+
return (
23+
<Show when={props.open}>
24+
<div class="fixed top-6 right-6 z-50 w-[min(420px,calc(100vw-2rem))]">
25+
<div class="rounded-2xl border border-gray-6/70 bg-gray-1/95 p-4 shadow-xl backdrop-blur animate-in fade-in slide-in-from-top-11 duration-200">
26+
<div class="flex items-start gap-3">
27+
<div class="mt-0.5 flex h-9 w-9 items-center justify-center rounded-full border border-amber-7/30 bg-amber-7/10 text-amber-11">
28+
<RefreshCcw size={16} />
29+
</div>
30+
<div class="flex-1 space-y-2">
31+
<div>
32+
<div class="text-sm font-semibold text-gray-12">{props.title}</div>
33+
<div class="text-xs text-gray-10">{props.description}</div>
34+
</div>
35+
<div class="text-xs text-gray-10">{props.warning}</div>
36+
<Show when={props.blockedReason}>
37+
<div class="flex items-start gap-2 rounded-lg border border-amber-7/30 bg-amber-7/10 px-3 py-2 text-xs text-amber-11">
38+
<AlertTriangle size={14} class="mt-0.5 shrink-0" />
39+
<span>{props.blockedReason}</span>
40+
</div>
41+
</Show>
42+
<Show when={props.error}>
43+
<div class="rounded-lg border border-red-7/30 bg-red-7/10 px-3 py-2 text-xs text-red-11">
44+
{props.error}
45+
</div>
46+
</Show>
47+
</div>
48+
</div>
49+
<div class="mt-3 flex justify-end gap-2">
50+
<Button
51+
variant="ghost"
52+
class="h-8 px-3 text-xs"
53+
onClick={() => props.onDismiss()}
54+
disabled={props.busy}
55+
>
56+
{props.dismissLabel}
57+
</Button>
58+
<Button
59+
variant="secondary"
60+
class="h-8 px-3 text-xs"
61+
onClick={() => props.onReload()}
62+
disabled={!props.canReload}
63+
>
64+
{props.reloadLabel}
65+
</Button>
66+
</div>
67+
</div>
68+
</div>
69+
</Show>
70+
);
71+
}

‎packages/app/src/app/context/session.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {
1111
OpencodeEvent,
1212
PendingPermission,
1313
PlaceholderAssistantMessage,
14+
ReloadReason,
1415
TodoItem,
1516
} from "../types";
1617
import {
@@ -19,6 +20,7 @@ import {
1920
normalizeDirectoryPath,
2021
normalizeEvent,
2122
normalizeSessionStatus,
23+
safeStringify,
2224
} from "../utils";
2325
import { unwrap } from "../lib/opencode";
2426

@@ -110,6 +112,7 @@ export function createSessionStore(options: {
110112
developerMode: () => boolean;
111113
setError: (message: string | null) => void;
112114
setSseConnected: (connected: boolean) => void;
115+
markReloadRequired?: (reason: ReloadReason) => void;
113116
}) {
114117
const [store, setStore] = createStore<StoreState>({
115118
sessions: [],
@@ -121,6 +124,50 @@ export function createSessionStore(options: {
121124
events: [],
122125
});
123126
const [permissionReplyBusy, setPermissionReplyBusy] = createSignal(false);
127+
const reloadDetectionSet = new Set<string>();
128+
129+
const skillPathPattern = /[\\/]\.opencode[\\/](skill|skills)[\\/]/i;
130+
const opencodeConfigPattern = /(?:^|[\\/])opencode\.json\b/i;
131+
const opencodePathPattern = /(?:^|[\\/])\.opencode[\\/]/i;
132+
133+
const extractSearchText = (value: unknown) => {
134+
if (!value) return "";
135+
if (typeof value === "string") return value;
136+
if (typeof value === "number") return String(value);
137+
return safeStringify(value);
138+
};
139+
140+
const detectReloadReason = (value: unknown): ReloadReason | null => {
141+
const text = extractSearchText(value);
142+
if (!text) return null;
143+
if (skillPathPattern.test(text)) return "skills";
144+
if (opencodeConfigPattern.test(text)) return "config";
145+
if (opencodePathPattern.test(text)) return "config";
146+
return null;
147+
};
148+
149+
const detectReloadFromPart = (part: Part): ReloadReason | null => {
150+
const record = part as Record<string, unknown>;
151+
return (
152+
detectReloadReason(record.text) ||
153+
detectReloadReason(record.path) ||
154+
detectReloadReason(record.title) ||
155+
detectReloadReason((record.state as { title?: unknown })?.title) ||
156+
detectReloadReason((record.state as { output?: unknown })?.output) ||
157+
detectReloadReason((record.state as { input?: unknown })?.input)
158+
);
159+
};
160+
161+
const maybeMarkReloadRequired = (part: Part) => {
162+
if (!options.markReloadRequired) return;
163+
if (!part?.id || !part.messageID) return;
164+
const key = `${part.messageID}:${part.id}`;
165+
if (reloadDetectionSet.has(key)) return;
166+
const reason = detectReloadFromPart(part);
167+
if (!reason) return;
168+
reloadDetectionSet.add(key);
169+
options.markReloadRequired(reason);
170+
};
124171

125172
const addError = (error: unknown, fallback = "Unknown error") => {
126173
const message = error instanceof Error ? error.message : fallback;
@@ -472,6 +519,7 @@ export function createSessionStore(options: {
472519
draft.parts[part.messageID] = upsertPartInfo(parts, part);
473520
}),
474521
);
522+
maybeMarkReloadRequired(part);
475523
}
476524
}
477525
}

‎packages/app/src/app/context/workspace.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,55 @@ export function createWorkspaceStore(options: {
717717
}
718718
}
719719

720+
async function reloadWorkspaceEngine() {
721+
if (!isTauriRuntime()) {
722+
options.setError("Reloading the engine requires the desktop app.");
723+
return false;
724+
}
725+
726+
if (options.mode() !== "host") {
727+
options.setError("Reload is only available in Host mode.");
728+
return false;
729+
}
730+
731+
const root = activeWorkspacePath().trim();
732+
if (!root) {
733+
options.setError("Pick a workspace folder first.");
734+
return false;
735+
}
736+
737+
options.setError(null);
738+
options.setBusy(true);
739+
options.setBusyLabel("status.reloading_engine");
740+
options.setBusyStartedAt(Date.now());
741+
742+
try {
743+
const info = await engineStop();
744+
setEngine(info);
745+
746+
const nextInfo = await engineStart(root, { preferSidecar: options.engineSource() === "sidecar" });
747+
setEngine(nextInfo);
748+
749+
if (nextInfo.baseUrl) {
750+
const ok = await connectToServer(nextInfo.baseUrl, nextInfo.projectDir ?? undefined);
751+
if (!ok) {
752+
options.setError("Failed to reconnect after reload");
753+
return false;
754+
}
755+
}
756+
757+
return true;
758+
} catch (e) {
759+
const message = e instanceof Error ? e.message : safeStringify(e);
760+
options.setError(addOpencodeCacheHint(message));
761+
return false;
762+
} finally {
763+
options.setBusy(false);
764+
options.setBusyLabel(null);
765+
options.setBusyStartedAt(null);
766+
}
767+
}
768+
720769
async function onInstallEngine() {
721770
options.setError(null);
722771
setEngineInstallLogs(null);
@@ -1133,6 +1182,7 @@ export function createWorkspaceStore(options: {
11331182
pickWorkspaceFolder,
11341183
startHost,
11351184
stopHost,
1185+
reloadWorkspaceEngine,
11361186
bootstrapOnboarding,
11371187
onModeSelect,
11381188
onBackToMode,

0 commit comments

Comments
 (0)