fix(integrations): honor OFF for Claude Desktop drift and Grok ensure #2250
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
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 |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /** | ||
| * Align Grok and Claude Desktop files with the durable switches during `ocx ensure`. | ||
| * | ||
| * handleEnsure used to load config once, then health-probe / model-sync / spawn, | ||
| * and only afterwards mutate ~/.grok/config.toml and the Desktop library from | ||
| * that snapshot. An OFF→ON flip in that window stripped a freshly enabled fence | ||
| * or deleted a freshly applied Desktop profile; ON→OFF rewrote the files the | ||
| * user had just turned off. Re-read persisted desired state immediately before | ||
| * each external-file mutation, and use that current config for sync inputs. | ||
| */ | ||
| import { loadConfig } from "../config"; | ||
| import { stripGrokConfig, type GrokInjectResult } from "../grok/inject"; | ||
| import { removeDesktop3pStandardPivot } from "../claude/desktop-3p"; | ||
| import { | ||
| claudeDesktopIntegrationEnabled, | ||
| shouldSyncGrokOnStart, | ||
| } from "../codex/desired-state"; | ||
| import type { OcxConfig } from "../types"; | ||
|
|
||
| export function grokSyncFailureMessage(err: unknown): string { | ||
| const detail = err instanceof Error ? err.message : String(err); | ||
| return `Grok Build config sync failed: ${detail}. ` | ||
| + "~/.grok/config.toml may still point at a previous proxy port — " | ||
| + "run 'ocx ensure' (or apply from the dashboard's Grok page) to repoint it."; | ||
| } | ||
|
|
||
| export interface EnsureDesiredIntegrationsDeps { | ||
| loadConfig: () => OcxConfig; | ||
| stripGrokConfig: typeof stripGrokConfig; | ||
| syncGrokConfig: ( | ||
| port: number, | ||
| config: OcxConfig, | ||
| opts?: { hostname?: string }, | ||
| ) => Promise<GrokInjectResult>; | ||
| removeDesktop3pStandardPivot: typeof removeDesktop3pStandardPivot; | ||
| log?: (message: string) => void; | ||
| error?: (message: string) => void; | ||
| } | ||
|
|
||
| async function defaultSyncGrokConfig( | ||
| port: number, | ||
| config: OcxConfig, | ||
| opts: { hostname?: string } = {}, | ||
| ): Promise<GrokInjectResult> { | ||
| const { syncGrokConfig } = await import("../grok/sync"); | ||
| return syncGrokConfig(port, config, opts); | ||
| } | ||
|
|
||
| const productionDeps: EnsureDesiredIntegrationsDeps = { | ||
| loadConfig, | ||
| stripGrokConfig, | ||
| syncGrokConfig: defaultSyncGrokConfig, | ||
| removeDesktop3pStandardPivot, | ||
| }; | ||
|
|
||
| function io(deps: EnsureDesiredIntegrationsDeps): { | ||
| log: (message: string) => void; | ||
| error: (message: string) => void; | ||
| } { | ||
| return { | ||
| log: deps.log ?? (message => console.log(message)), | ||
| error: deps.error ?? (message => console.error(message)), | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Keep ~/.grok/config.toml aligned with the durable Grok switch. | ||
| * | ||
| * `handleStart` already gates inject on `shouldSyncGrokOnStart`. `ocx ensure` | ||
| * used to call `syncGrokConfig` unconditionally, so a dashboard/update/restart | ||
| * path that lands in ensure rewrote the fence while the switch stayed OFF. | ||
| * When the switch is OFF, strip any leftover managed block instead of injecting. | ||
| */ | ||
| export async function ensureGrokFenceMatchesDesired( | ||
| port: number, | ||
| opts: { hostname?: string } = {}, | ||
| deps: EnsureDesiredIntegrationsDeps = productionDeps, | ||
| ): Promise<void> { | ||
| const config = deps.loadConfig(); | ||
| const { log, error } = io(deps); | ||
| if (!shouldSyncGrokOnStart(config)) { | ||
| try { | ||
| const grok = deps.stripGrokConfig(); | ||
| if (grok.changed) log(` ↩️ ${grok.message}`); | ||
| else if (!grok.ok) error(`⚠️ ${grok.message}`); | ||
| } catch (err) { | ||
| error(`⚠️ ${grokSyncFailureMessage(err)}`); | ||
| } | ||
| return; | ||
| } | ||
| try { | ||
| const hostname = opts.hostname ?? config.hostname; | ||
| const g = await deps.syncGrokConfig( | ||
|
There was a problem hiding this comment.
When Grok is ON at line 79, Useful? React with 👍 / 👎. |
||
| port, | ||
| config, | ||
| hostname !== undefined ? { hostname } : {}, | ||
| ); | ||
| if (g.changed) log(" + Grok Build config updated (~/.grok/config.toml)"); | ||
| else if (!g.ok) error(`⚠️ ${g.message}`); | ||
| } catch (err) { | ||
| error(`⚠️ ${grokSyncFailureMessage(err)}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * When Claude Desktop is durably OFF, clear any leftover owned gateway profile. | ||
| * ensure/update used to leave Claude-3p residue in place after a failed disable | ||
| * (drifted fingerprint), so the Integrations card kept looking applied/stale. | ||
| */ | ||
| export function ensureClaudeDesktopMatchesDesired( | ||
| deps: EnsureDesiredIntegrationsDeps = productionDeps, | ||
| ): void { | ||
| const config = deps.loadConfig(); | ||
| const { log, error } = io(deps); | ||
| if (claudeDesktopIntegrationEnabled(config)) return; | ||
| try { | ||
| const removed = deps.removeDesktop3pStandardPivot({ | ||
| appliedFingerprint: config.claudeCode?.desktopProfile?.appliedFingerprint ?? null, | ||
| }); | ||
| if (removed.ok && removed.changed) { | ||
| log(" ↩️ Claude Desktop integration residue removed."); | ||
| } else if (!removed.ok) { | ||
| error(`⚠️ Claude Desktop cleanup skipped: ${removed.reason ?? removed.kind}.`); | ||
| } | ||
| } catch (err) { | ||
| const detail = err instanceof Error ? err.message : String(err); | ||
| error(`⚠️ Claude Desktop cleanup failed: ${detail}.`); | ||
| } | ||
| } | ||
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.
This new OFF branch changes
ocx ensurefrom always replacing the managed block to stripping it when the durable switch is disabled, butdocs-site/src/content/docs/guides/grok-build.md:13-14,31-32and every translated copy still state that ensure writes/replaces the block. Update the canonical guide and its translations so operators are not told behavior that now directly contradicts the implementation.AGENTS.md reference: src/AGENTS.md:L28-L28
Useful? React with 👍 / 👎.