Skip to content

fix: resolve #12355 - dev-fleet: differentiate the unresolved-channel notice on an - #12356

Closed
fathirramadhan-web wants to merge 3 commits into
kirodotdev:mainfrom
fathirramadhan-web:fix/issue-12355-dev-fleet-differentiate-the-unresolved-c
Closed

fathirramadhan-web wants to merge 3 commits into
kirodotdev:mainfrom
fathirramadhan-web:fix/issue-12355-dev-fleet-differentiate-the-unresolved-c

Conversation

@fathirramadhan-web

Copy link
Copy Markdown

Closes #12355

Overview

Addresses the problem reported in #12355 by resolving the underlying issue and ensuring test coverage passes.

Verification

  • Tested locally
  • Linters/tests pass

Chen Tong and others added 2 commits September 20, 2026 20:14
Dev Fleet manages git checkouts, and a git checkout has no release channel —
`platform/update_capability.py` says so outright: "Only the wheel command
carries a channel. A git checkout follows its remote." That leaves no way to
run what stable actually shipped next to unreleased work.

Adds ONE detached worktree pinned to the stable channel, named
`release-channel-stable` as a sibling of the primary checkout, appearing as an
ordinary fleet row that pods and Make Live already drive.

Why not a pin on the primary checkout: sync fast-forwards it (`merge --ff-only`)
and refuses unless HEAD is literally `BASE_BRANCH`. A stable tag is normally
BEHIND main, so pinning that checkout could only work by detaching its HEAD —
which the sync guard rejects, and which repoints every origin/main comparison on
the row — or by resetting main backwards, which destroys work.

Not coupled to the update channel: nothing reads or writes
`$KIROCREW_HOME/channel`. That file says which lane the user's install FOLLOWS
for updates; a pin here says which ref a worktree SITS ON. There is one channel
and it is a single `CHANNEL = "stable"` constant, not a lane vocabulary — an
unpublished lane is a state of that channel, never a second kind of row.

Resolution takes the newest `vX.Y.Z` in SEMVER-DESCENDING order. Tag creation
date is not the ordering: a retagged or backfilled release publishes out of
order, and "newest release" is a claim about version precedence rather than
about when someone pushed the tag.

Resolution is sourced from a private pruned tag mirror
(`refs/dev-fleet/release-tags/`), fetched under a checked refspec, so a local tag
cannot decide what gets checked out — a forged `v9.9.9` in the operator's own
clone resolves nothing. An `ls-remote` provenance check closes the window
between resolving a tag and checking it out, and `repo_supplied_filter` refuses
repo-configured content filters so a fetched repository cannot run its own code
during the checkout; both run inside `_GIT_MUTATION_LOCK`.

`release-channel-*` is reserved, so adoption requires the SHAPE (detached),
never the name — a user's branch checkout under that name keeps ordinary
controls and its ordinary behind-main count, and reports that it is not a
release worktree rather than being silently adopted.

Create only: there is no in-place mutation of a pin. A pinned tree that moved on
its own would shift under a pod being debugged, and an explicit Advance turned
out to be the mechanism forcing every unpleasant tradeoff around it, so moving a
pin is Remove followed by Create — two visible acts on the row that owns them.

Fleet payload gains `release_channel`, its own key rather than extra `worktrees`
rows: a channel with no worktree has no path, and every consumer of a worktrees
entry assumes one. On this row BEHIND measures distance from the CHANNEL TIP (the
behind-main figure is large by construction and names no action) and PR renders
as inapplicable rather than as the no-PR dash. Because the Behind column header
is one shared element above rows with two different denominators, it names both.

Adds `website/capture/devfleet-release-channel.{tsx,html}` and
`website/scripts/capture-devfleet-release-channel.mjs`, the committed harness
that renders the three row states — adopted, placeholder, reserved-name branch —
against the real page with `fetch` stubbed at the network seam.
@fathirramadhan-web
fathirramadhan-web requested review from a team and hoang-phan98 September 20, 2026 20:38
@github-actions github-actions Bot added fork Pull request from a fork (external contributor) readiness: action required A blocking check or review needs attention labels Sep 20, 2026
@dwu96

dwu96 commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@github-actions github-actions Bot added the merge conflict Branch has merge conflicts with its base — author must resolve before merge label Sep 20, 2026
@dwu96

dwu96 commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

6 similar comments
@dwu96

dwu96 commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@bolichen97

Copy link
Copy Markdown
Contributor

Consolidation: this branch carries an older snapshot of PR #10066; port its last head before this lands

PR #10066 was closed today in favour of this PR. The first commit here, 3976c39ac8 "feat(dev-fleet): pin a worktree to the stable release channel", is #10066's commit as it stood on 2026-09-20 at 20:28Z. #10066 pushed four more heads after that, ending at 4daa885590 (still fetchable as pull/10066/head). None of that later work is on this branch:

  1. At fleet_state.py:1232-1239, row["version"] = st.get("version") runs only inside if res.get("ok"):. When the tip lookup fails, an adopted tree that sits on a published release shows "not on a release". That contradicts the notice this PR adds, which says only the tip check failed. feat(dev-fleet): pin a worktree to the stable release channel #10066 moved the assignment out of the ok branch.
  2. At release_channel_pin.py:622, if not head or not tip: return out skips the tree's own release lookup when the tip is unknown. feat(dev-fleet): pin a worktree to the stable release channel #10066 changed it to if not head: plus if tip and head == tip:.
  3. Two tests pin items 1 and 2: test_an_adopted_row_keeps_its_own_release_when_the_tip_lookup_fails and test_worktree_state_names_the_trees_release_when_the_tip_is_unknown. There is also the "answered independently" row-contract paragraph in dev-fleet.md.
  4. The discard test uses a registered_names() basename helper. It replaces this PR's as_posix() version: test/test_dev_fleet_release_channel_ops.py:1223 and :1236 are 120 and 105 characters long, in a file black does not baseline.
  5. In DevFleetPage.tsx, releaseChannelCreateError becomes a single value (useState<string | null>(null)), createReleaseChannel() loses its lane parameter and dismissReleaseChannelCreateError() is removed. The feature-map row is also completed.

Only this PR has the isAdoptedChannelErr split (DevFleetPage.tsx:2311, :2482), the release_channel_tip_unresolved string, and the matching test and capture assertions.

Suggested path: git rebase --onto 4daa885590 3976c39ac8. A git merge-tree check shows one conflict only, in the discard test (take #10066's side). DevFleetPage.tsx and all the catalogs merge cleanly. After that:

  • Drop the CRLF "Auto-added by github-engineer" .gitignore block (its *.so also matches the vendored libllama.so) and the package-lock.json libc removals.
  • Regenerate en-XA with gen-pseudolocale.mjs. en-XA.json:10768 is hand-written with ŵ, but the generator maps w to ẁ, so the pseudolocale check fails.
  • Add an en.context.json entry and a dev-fleet.md sentence for the new notice, then rebase onto main.

The security-fenced Create TOCTOU finding from #10066's review (deferred to issue #12342) applies unchanged to the same code here. This PR covers only part of issue #12355, so "Closes #12355" overstates what it does.

From a full open-PR audit against origin/main c66f95b (2026-09-25); findings were checked by independent reviewers reading the code. Reply here if this is wrong.

@dwu96

dwu96 commented Sep 25, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

5 similar comments
@dwu96

dwu96 commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

15 similar comments
@dwu96

dwu96 commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 4, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 4, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

Copy link
Copy Markdown
Contributor

Rebase needed: this branch now conflicts with main in 7 files

This branch has not changed since 2026-09-21 (head 91fdf71282). Its merge base ad68b15c5d is 2147 commits behind origin/main a92dde1a6c. Running git merge-tree against current main reports content conflicts in:
.gitignore, docs/feature-map/README.md, docs/system-specs/modules/dev-fleet.md, website/scripts/check-bundle-size.mjs, website/src/i18n/en.context.json, website/src/i18n/locales/en-XA.json and website/src/i18n/locales/en.manual.json.

What I checked on the current head:

Suggested next steps: port #10066's last head as described above, then rebase onto current main and resolve the 7 conflicts. Also note that issue #12355 is only partly addressed here.

From an open-PR triage against origin/main a92dde1 (2026-10-05).

@dwu96

dwu96 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

5 similar comments
@dwu96

dwu96 commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@dwu96

dwu96 commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

👋 Hi! This PR's description is missing some required sections from our PR template. Workflow runs won't be auto-approved until the description is updated.

Missing sections:

  • ## Problem / Motivation
  • ## Why it matters
  • ## What changed
  • ## Tests

Please update your PR description to include these sections, then push or re-save the description. The workflows will be approved on the next cycle.

@bolichen97

Copy link
Copy Markdown
Contributor

@fathirramadhan-web thanks for this PR. It has merge conflicts with main, and the notice text it changes may have moved since. Could you rebase onto current main and fill in the PR template sections?

If there is no activity here or on #12355 by 2026-10-22 (14 days), we will close both as stale. You are welcome to reopen after that.

@iamwhatever

Copy link
Copy Markdown
Contributor

Thank you for picking this up, @fathirramadhan-web. Issue #12355 was closed as not planned on 2026-10-17 because the release-channel rows this notice belongs to came from #10066, which was closed without merging. src/kiro_crew/apps/builtins/dev_fleet/release_channel_pin.py and release_channel_unresolved do not exist on current main, so there is nothing for this change to land on. Closing for that reason. Please reopen if we got it wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fork Pull request from a fork (external contributor) merge conflict Branch has merge conflicts with its base — author must resolve before merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

dev-fleet: differentiate the unresolved-channel notice on an adopted row

4 participants