Skip to content

chore(server): port upstream Claude and stability fixes (2026-10-08) - #262

Merged
TheDarkPhantom merged 5 commits into
mainfrom
chore/upstream-server-fixes-2026-10-08
Oct 8, 2026
Merged

TheDarkPhantom merged 5 commits into
mainfrom
chore/upstream-server-fixes-2026-10-08

Conversation

@TheDarkPhantom

Copy link
Copy Markdown
Owner

The fork hasn't merged upstream since 2026-07-30, so it was missing several Claude and server stability fixes. This PR ports them by hand into the fork's V1 orchestration and ClaudeAdapter, one commit per fix, along with the upstream tests for each.

Ported

Skipped

Verification

  • vp test run on ClaudeAdapter, OrchestrationEngine, ClaudeSkills, DrainableWorker and shared model.test.ts: 121/121 pass.
  • Confirmed that the new fix(server): stop a second server from resending Claude turns pingdotgg/t3code#13295 test fails without the engine fix.
  • ProviderRegistry: all 26 Claude tests pass. The non-Claude failures (codex binaryPath re-probe, OpenCode removals, cursor merged snapshot) are flaky and also fail on unmodified main on Windows.
  • DrainableWorker consumers (5 reactor suites plus AgentAwarenessRelay): all pass except one CheckpointReactor test, which fails the same way on the old worker because of a Windows CRLF ('v2\r\n') mismatch.
  • tsgo --noEmit for server, contracts, shared and web: no errors. vp lint and vp fmt are clean (one existing warning in ClaudeAdapter.test.ts). vp run check:avicode and vp run test:avicode (7/7) pass.

🤖 Generated with Claude Code

TheDarkPhantom and others added 5 commits October 8, 2026 20:37
…ad busy (pingdotgg#14497)

Ported from upstream 9da066d. A result for a Claude-initiated turn (a
resumed session reporting a leftover background task, a peer wake-up) no
longer completes the user's queued turn. New turns now send their turn id as
the prompt uuid so newer CLIs can echo it back in `user_message_uuids`.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…tgg#13295)

Ported from upstream e0db2a5. When a dispatch fails and the engine
reconciles from the event store, it now republishes only the events that
dispatch appended. A shared state directory can hold events another server
already handled, and republishing them started a second provider turn.

The test helper gains a file-backed database option, and the test subscribes
with a start-immediately fork since the fork exposes `streamDomainEvents`
rather than upstream's `subscribeDomainEvents`.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Ported from upstream b3b6ae2. Claude Code accepts SKILL.md frontmatter
whose plain scalars contain `: ` (for example a description like
"via kane-cli: run browser objectives"), but strict YAML rejects them, so
those skills vanished from the `$` picker. A failed parse now retries with
just those scalars quoted, leaving comments and YAML structure alone.

The test drops upstream's invocation-flag fields, which the fork's skill
model does not carry.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#16223)

Ported from upstream 24e4b62. An item whose effect failed or died used to
end the worker fiber, so every later item queued forever and `drain` never
resolved. Failures are now logged and skipped, a closed scope drops queued
items so `drain` resolves, and a refused offer is no longer counted.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…6903)

Ported from upstream 588d32e, re-expressed against the fork's hardcoded
Claude model list (upstream moved to model-manifest.json). Haiku 5.5 offers
effort low..max (medium default) plus ultrathink, keeps Extra High, opens on
the 1M context window by default with 200k opt-in, and is gated on Claude
Code 2.1.293 with an upgrade nudge at the top of the ladder. Its slug aliases
are added and the picker marks it New.

Not ported: upstream also retired Sonnet 5 and Opus 5 to legacy and moved the
bare "sonnet" and "haiku" shortcuts to the 5.5 models. The fork keeps Sonnet 5
as its default, and "haiku" stays on Haiku 4.5, which needs no minimum CLI
version and is the default text generation model.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L labels Oct 8, 2026
@TheDarkPhantom
TheDarkPhantom merged commit 5b5e654 into main Oct 8, 2026
12 checks passed
@TheDarkPhantom
TheDarkPhantom deleted the chore/upstream-server-fixes-2026-10-08 branch October 8, 2026 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant