Skip to content

Commit 9064c97

Browse files
committed
chore(upstream-fixes): track the two opencode-desktop workarounds
Register the CLI channel override (anomalyco/opencode#60676) and the desktop CLI staging fix (anomalyco/opencode#59601) in tracked-upstream-fixes.json, with matching FIXME markers in the overlay, so the weekly workflow flags them for removal once upstream closes them.
1 parent 3314a3f commit 9064c97

2 files changed

Lines changed: 35 additions & 0 deletions

File tree

‎.github/tracked-upstream-fixes.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,31 @@
483483
"tracking": ["https://github.com/NixOS/nixpkgs/pull/575004"],
484484
"workaround": "features/ai/lammacpp/default.nix -- `openwebPackage` let-binding that overrides open-webui's own python3Packages scope with `mcp = mcp_1` (as nixpkgs does for music-assistant), gated on mcp being >= 2 (see FIXME(nixpkgs-open-webui-mcp2)). Lives in the feature module, not overlays/, because fredhub supplies open-webui from its own `import inputs.nixpkgs { }` which overlays never reach.",
485485
"revert_action": "DONE. open-webui 0.12.5 ported to the mcp 2 API (`from mcp import Client`, `streamable_http_client`), so the mcp_1 pin turned from fix into cause: fredhub crash-looped on `ImportError: cannot import name 'Client' from 'mcp'` (mcp 1.29.0) and nginx served 502. Deleted the `openwebPackage` let-binding and FIXME; ExecStart uses cfg.openwebPackage again. posthog is still meta.broken under mcp 2.3.0 but is no longer in open-webui's closure (unpinned open-webui evaluates and builds). Verified at runtime: the unpinned open-webui-0.12.5 (bsapvf6b...) served against a scratch DATA_DIR returned /health {\"status\":true}."
486+
},
487+
{
488+
"id": "opencode-60676-desktop-service-channel",
489+
"done": false,
490+
"summary": "Upstream nix/opencode.nix builds the CLI with OPENCODE_CHANNEL=prod, so its background service registers in service-prod.json, but opencode-desktop only discovers service.json: the desktop starts its bundled server and then waits on the logo forever. We build the CLI on the \"latest\" channel instead, so the TUI and desktop share service.json.",
491+
"repo": "anomalyco/opencode",
492+
"check": "issue-closed",
493+
"issue": 60676,
494+
"tracking": [
495+
"https://github.com/anomalyco/opencode/issues/60676",
496+
"https://github.com/anomalyco/opencode/pull/60683"
497+
],
498+
"workaround": "flake/lib/opencode-overlay.nix -- `env.OPENCODE_CHANNEL = \"latest\"` on `opencode` (FIXME(opencode-60676-desktop-service-channel)).",
499+
"revert_action": "Closing the issue only means the fix is on upstream dev. First confirm the `opencode` release tag in flake.nix contains it (Renovate bumps tags). Then delete the env override and its FIXME, build `.#nixosConfigurations.Daytona.pkgs.opencode-desktop`, and launch it with empty XDG dirs in a private network namespace (`unshare -rn`): the main log must show `v2 CLI background service ready`. Keep `update = \"disable\"` in features/ai/opencode; it is still correct on prod. On deploy, the TUI moves back to service-prod.json, so close open sessions once."
500+
},
501+
{
502+
"id": "opencode-59601-desktop-cli-dist",
503+
"done": false,
504+
"summary": "Upstream nix/desktop.nix stages the bundled CLI in $OPENCODE_CLI_DIST, but packages/desktop/script/build.ts stopped reading it in 6996bbcd6 and only looks in ../cli/dist, so the prod desktop build throws `Production desktop builds bundle the CLI ... build it first`. We rewrite the staging path in buildPhase.",
505+
"repo": "anomalyco/opencode",
506+
"check": "issue-closed",
507+
"issue": 59601,
508+
"tracking": ["https://github.com/anomalyco/opencode/issues/59601"],
509+
"workaround": "flake/lib/opencode-overlay.nix -- the `buildPhase` override (stagedDist/readsDist) on `opencode-desktop` (FIXME(opencode-59601-desktop-cli-dist)). It already becomes a no-op once either side changes upstream, so it is harmless left in place, but it is dead code by then.",
510+
"revert_action": "Closing the issue only means the fix is on upstream dev. First confirm the `opencode` release tag in flake.nix contains it. Then delete the `buildPhase` override, the stagedDist/readsDist let-bindings and the FIXME, and confirm `.#nixosConfigurations.Daytona.pkgs.opencode-desktop` still builds."
486511
}
487512
]
488513
}

‎flake/lib/opencode-overlay.nix‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ in
6161

6262
postPatch = rearmBunCheck old;
6363

64+
# FIXME(opencode-60676-desktop-service-channel): WORKAROUND, not a fix.
65+
# Drop this env override once the pinned release carries
66+
# anomalyco/opencode#60683 (desktop discovers service-prod.json);
67+
# tracked by .github/workflows/track-upstream-fixes.yaml.
68+
#
6469
# The channel compiled into the CLI picks the background service's
6570
# registration file and fixed port. Upstream's recipe builds "prod"
6671
# (service-prod.json), but the desktop app only discovers "latest"'s
@@ -114,6 +119,11 @@ in
114119
# Electron) still comes from opencode/nixpkgs, as upstream builds it. The
115120
# recipe relaxes the Bun check in its own postPatch, so re-arm it here too.
116121
#
122+
# FIXME(opencode-59601-desktop-cli-dist): WORKAROUND, not a fix. Drop the
123+
# buildPhase override below (stagedDist/readsDist) once the pinned release
124+
# carries the fix for anomalyco/opencode#59601; tracked by
125+
# .github/workflows/track-upstream-fixes.yaml.
126+
#
117127
# The recipe stages the CLI in $OPENCODE_CLI_DIST, but since upstream's
118128
# 6996bbcd6 packages/desktop/script/build.ts only looks in ../cli/dist and
119129
# a prod build throws without it. Stage it there instead, only while the two

0 commit comments

Comments
 (0)