feat: add enable/disable toggle for Claude Desktop routing #1291
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -316,13 +316,15 @@ export async function loadClaudeCodeStatus(apiBase: string, signal?: AbortSignal | |
|
|
||
| export async function loadClaudeDesktopStatus(apiBase: string, signal?: AbortSignal) { | ||
| const body = await readOptional<{ | ||
| enabled?: unknown; | ||
| applied?: unknown; | ||
| stale?: unknown; | ||
| activeProfile?: unknown; | ||
| appliedAt?: unknown; | ||
| }>(fetch(`${apiBase}/api/claude-desktop/status`, { signal })); | ||
| if (!body) return null; | ||
| return { | ||
| enabled: body.enabled !== false, | ||
| applied: body.applied === true, | ||
| stale: body.stale === true, | ||
| // Tri-state on purpose: `null` means undeterminable, which must not be | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ import { readJsonIfOk } from "../../fetch-json"; | |
| * nothing caught it locally because GUI typecheck runs from its own tsconfig — | ||
| * `bun x tsc --noEmit` at the repository root does not read this file. CI did. | ||
| */ | ||
| export type NativeIntegrationClientId = "claude" | "grok" | "codex" | "claude-desktop"; | ||
| export type NativeIntegrationState = "absent" | "current" | "unsafe"; | ||
| export type NativeRefusalReason = | ||
| | "not_installed" | ||
|
|
@@ -58,7 +58,7 @@ export type NativeErrorBody = NativeErrorEnvelope | NativeRefusalEnvelope; | |
|
|
||
| // Widening the type alone would leave this guard rejecting a `codex` response at | ||
| // runtime, so the set moves with it. | ||
| const NATIVE_CLIENTS: ReadonlySet<string> = new Set<NativeIntegrationClientId>(["claude", "grok", "codex", "claude-desktop"]); | ||
| const NATIVE_REFUSAL_CODES: ReadonlySet<string> = new Set([ | ||
| "native_integration_refused", | ||
| "native_integration_failed", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,6 +96,7 @@ export interface ClaudeCodePayload { | |
| authMode?: string; | ||
| } | ||
| export interface ClaudeDesktopPayload { | ||
| enabled?: boolean; | ||
| applied?: boolean; | ||
| stale?: boolean; | ||
| activeProfile?: boolean | null; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { createHash, randomUUID } from "node:crypto"; | ||
| import { copyFileSync, existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs"; | ||
| import { homedir } from "node:os"; | ||
| import { join } from "node:path"; | ||
| import { atomicWriteFile } from "../config"; | ||
|
|
@@ -379,3 +379,43 @@ export function atomicReplaceDesktopConfig( | |
| writer(path, content); | ||
| return existsSync(backupPath) ? { backupPath } : {}; | ||
| } | ||
|
|
||
| /** | ||
| * Remove the opencodex entry from Claude Desktop's 3P config library. | ||
| * | ||
| * Deletes the UUID-named config JSON and strips the entry from _meta.json. | ||
| * Safe to call when the library directory or metadata does not exist — it | ||
| * returns `cleared: false` rather than throwing. | ||
| */ | ||
| export function clearDesktop3pConfig(): { cleared: boolean; path: string; reason?: string } { | ||
| const libraryPath = resolveDesktop3pConfigLibraryPath(); | ||
| const metadataPath = join(libraryPath, "_meta.json"); | ||
| const sentinel = join(libraryPath, "_meta.json"); | ||
| try { | ||
| if (!existsSync(metadataPath)) { | ||
| return { cleared: false, path: sentinel, reason: "no metadata" }; | ||
| } | ||
| const metadata = parseMetadata(metadataPath); | ||
| const entry = metadata.entries.find(e => e?.name === "opencodex" && typeof e.id === "string"); | ||
| if (!entry || typeof entry.id !== "string") { | ||
| return { cleared: false, path: sentinel, reason: "no opencodex entry" }; | ||
| } | ||
| const configPath = join(libraryPath, `${entry.id}.json`); | ||
| // Remove the config file — best-effort; a missing file is not a failure. | ||
| if (existsSync(configPath)) { | ||
| unlinkSync(configPath); | ||
|
Comment on lines
+399
to
+406
Contributor
There was a problem hiding this comment. 🔒 Security & Privacy | 🟠 Major | ⚡ Quick win Validate the metadata entry ID before constructing the deletion path.
Require a canonical UUID before using an entry ID. Apply the validation in a shared metadata helper so 🤖 Prompt for AI Agents |
||
| } | ||
| // Strip the entry from metadata. | ||
| const entries = metadata.entries.filter(e => e !== entry); | ||
| const nextMeta: Desktop3pMetadata = { ...metadata, entries }; | ||
| // If Desktop is currently serving our profile, clear the appliedId too. | ||
| if (nextMeta.appliedId === entry.id) { | ||
| delete nextMeta.appliedId; | ||
| } | ||
| atomicWriteFile(metadataPath, JSON.stringify(nextMeta, null, 2) + "\n"); | ||
| return { cleared: true, path: configPath }; | ||
| } catch (error) { | ||
| const reason = error instanceof Error ? error.message : String(error); | ||
| return { cleared: false, path: sentinel, reason }; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -662,7 +662,7 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise | |
| try { | ||
| const state = await buildClaudeDesktopState(config); | ||
| const runtimePort = Number(url.port) || config.port; | ||
| return jsonResponse({ ...state, port: runtimePort, enabled: config.claudeCode?.desktopEnabled !== false }); | ||
|
Contributor
There was a problem hiding this comment. 🔒 Security & Privacy | 🟠 Major | ⚡ Quick win Gate every Claude Desktop configuration writer with The response at Line 665 reports that routing is disabled, but After a user disables routing, a catalog update or direct apply request can recreate the Desktop 3P entry. Both paths also pass Return before auto-apply when As per path instructions, “tokens and OAuth material must never be logged or serialized into responses.” 🤖 Prompt for AI AgentsSource: Path instructions |
||
| } catch (error) { | ||
| return jsonResponse({ error: error instanceof Error ? error.message : String(error) }, 400); | ||
| } | ||
|
|
@@ -809,6 +809,7 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise | |
| stale, | ||
| activeProfile, | ||
| health, | ||
| enabled: config.claudeCode?.desktopEnabled !== false, | ||
| }); | ||
| } catch (error) { | ||
| return jsonResponse({ error: error instanceof Error ? error.message : String(error) }, 400); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win
Reuse
toggleNativeIntegrationinstead of a rawfetchfor the Desktop toggle.gui/src/pages/integrations/native-api.tsalready exportstoggleNativeIntegration(apiBase, client, enabled, signal), which PUTs the same endpoint shape (/api/native-integrations/${client}), returns a typedNativeToggleEnvelope(ok,clientId,changed,state,message,reason), and throws a typedNativeApiErrorwith a parsed.refusal(includingdisableBlockedreason codes likenot_installedorconfig_busy) on failure.NativeIntegrationClientIdnow includes"claude-desktop"(native-api.ts Line 11), so this helper is directly usable here.The raw
fetch+readJsonOrThrowpath intoggleDesktop(Lines 317-329) bypasses that refusal-aware parsing. A native refusal from the server (for example, the config file busy or Desktop not installed) will still throw viareadJsonOrThrow's error path, but only as a flat string pulled fromerror/message, losing thereasoncode that the rest of the native-integration surface (claudeRow,grokRow,toggleBlocked: native?.disableBlocked) uses to drive localized, reason-specific messaging.Do you want me to generate a version of
toggleDesktopthat callstoggleNativeIntegrationand mapsNativeApiError.refusal?.messageinto the existingsetMessage/setAnnouncementflow?🤖 Prompt for AI Agents