Repository navigation
chore(fork): retain 0.15.2 basket carry on 0.16.0-beta.2 - #29
Conversation
Multiple profiles extending the same provider have been supported in config.json for a while, but the only way to create one was editing the file by hand. The daemon already accepted full profile writes over set_daemon_config, so this is client surface only. App: the provider row actions menu gains "Add account" for built-in providers, opening a form for label, provider id, description, and environment variables. The glossary reserves "profile" for HostProfile, so the UI says account. CLI: paseo provider add/rm, with client-side validation mirroring ProviderOverridesSchema so errors name the offending flag instead of arriving from the daemon. provider ls gains a SOURCE column. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The providers-section unit test mocks its heavy children, so importing the real account sheet pulled in react-native-reanimated and failed the suite at parse time. Stub the sheet the way the catalog list is already stubbed, and cover the new menu item. canAddProviderAccount required source === "builtin", but source is optional on the wire, so daemons predating it hid the action entirely. Reject only an explicit "custom": the daemon reports builtin ids as "builtin" regardless of overrides, so no custom row can reach here. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Custom provider accounts now carry an optional baseProviderId on provider snapshot entries. Model/provider pickers group each account immediately after its base provider and reuse the base provider's icon, matching the Settings providers list. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Renaming a provider account previously orphaned every chat that used it: persisted agents kept the old provider id, dropped out of listings, and failed to load. The config patch gains an optional renameProviders map; the daemon repoints live agents and rewrites stored records (provider, runtimeInfo.provider, persistence.provider) to the new id, then rebroadcasts config so clients refresh. The capability is advertised as the providerConfigRename feature; when a connected daemon lacks it, the edit sheet warns that changing the ID will orphan existing chats. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Icon call sites that render straight from an agent's provider id (agent list, schedules, panels, and the sidebar's per-workspace provider glyphs) fell back to the generic bot icon for second accounts like "claude-work", because the static icon lists can't know user-chosen account ids. Register each snapshot entry's baseProviderId as an icon alias wherever snapshot entries land on the client, and let resolveProviderIconName consult those aliases before giving up, so every getProviderIcon caller shows the real provider logo without threading snapshot data through each call site. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Korean landed upstream after this branch forked.
An assembly merge reintroduced main's bare ProviderUsageService construction after this branch's injected assignment, so the configured instance was overwritten and no provider-account usage fetcher ever ran: second accounts silently lost their usage rows. A clean merge shows no conflict, so nothing surfaced until the daemon served usage. Assert that the server keeps the instance it was handed; the test fails the moment a duplicate assignment reappears. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
# Conflicts: # packages/server/src/server/plugins/usage-sources/index.test.ts # packages/server/src/server/plugins/usage-sources/index.ts # plugins/claude-usage-source/server/usage.ts # plugins/claude-usage-source/shared/input.ts # plugins/codex-usage-source/server/usage.ts # plugins/codex-usage-source/shared/input.ts # plugins/copilot-usage-source/server/usage.ts # plugins/copilot-usage-source/shared/input.ts
Keep account discovery on the keyed usage contract and narrow routed inputs for the Codex and Copilot plugins.
Preserve source file links, fork-first PR lookup, desktop quit confirmation, nested package scripts, comparison-base mutation and project PR CI facts. Extend upstream PR listing and keep upstream script status broadcasting. Source-IP01: cabbc69 Source-IP02: 6373605 Source-IP03: 0d4161b Source-IP04: 1967db5 Source-IP07: 06b79b7 Source-IP13: f3a66c4
# Conflicts: # packages/app/src/agent-stream/view.tsx
…uting test(terminal): Isolate packaged zsh prompt startup directory
fix(terminal): Own managed zsh command completion
…ture test(cli): Use current terminal worker protocol in upgrade fixture
Merge origin/upgrade/basket-0.15.2 (531b041) into the assembled 0.16 beta source, preserving TMAD-derived carry per the owner clarification. Resolved 38 conflicted paths with explicit ownership decisions: - keep strict invalid-ACP-model rejection in production and tests - restamp finish/error attention on each later outcome while protecting pending permission attention - port chat find onto upstream combined history/live LegendList rows with sourceId aliases, disclosure-hold/bottom-anchor detach, one animation-frame jump delay, latest-index lookup and cancellation - keep menu-owned package script discovery with screen-owned restart actions - keep retained history-go behavior in the beta keyboard pipeline and fork Cmd/Ctrl+[ ] bindings, workspace on Cmd/Ctrl+Alt+[ ] Recovered round-8 resolution patch applied once; all conflict markers cleared, git diff --check clean. Native message-scroll helper and focused tests included. Not yet formatted, built, typechecked or gated.
Bring the latest validated custom head (298af48, including 465e16 shared-usage and model-preference fixes plus the Claude close fixture adaptation) onto the retained basket branch. Automatic merge, no conflicts.
- drop the stale getCommitFileDiff import: upstream moved commit file reads behind CheckoutDiffManager.readCommitFile, which the resolved handler uses - pass viewMatch through the local fork PR lookup, matching the upstream resolver signature - remove the unused durableTimelineHasRows destructure; the flag still reaches initialRecordFields through params
- workspace draft tab: keep the beta dock structure; drop the stale basket dock content, local capability override and dead imports - plan handoff: carry agent.options as draft providerOptions; adapt fixture - project PR overlay: use beta useGlobalOverlayLayer and useOverlayRegistration with Escape registration - compact tab switcher: pass the artifact and find-in-chat handlers - workspace scripts test: complete the typed start response fixture - remove the pre-beta use-keyboard-shortcuts hook; its history-go behavior and bindings live in the beta keyboard pipeline
Add the direct fixture the independent PR28 review flagged as P3: a nonrestoring provider reports a canonical alias distinct from the requested model, config keeps the requested alias across refreshes while the observed name is unchanged, and adopts once the observed model genuinely changes. Includes formatter output for the reconciled overlay and agent-manager seams.
- split fork-aware PR resolution into focused helpers, preserving lookup order and the viewMatch union - extract supported config patch preparation from applySupportedPatch - remove a duplicate switcher render in the compact header and add the artifact/find handlers to the single switcher - extract agent panel dock content/overlay so complexity stays under the project threshold - drop duplicate AgentStorage import, duplicate clientCapabilities key, and the shadowed setup identifier
|
Important Review skippedToo many files! This PR contains 426 files, which is 126 over the limit of 300. To get a review, reduce the PR to 300 files or fewer by splitting it into smaller PRs or changing its base branch. Usage-priced reviews support at most 300 files.
|
- footer timing grows with its wrapped second line when the retained pin adds a third control at a narrow transcript width - pinned-prompt helper scrolls the prompt row wrapper clear of the reading line, not just the bubble inside it - host-channel flow-control test holds a bounded timeline page and paginates the remaining pages instead of waiting for an oversized binary chunk
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
Independent review (GLM): PASS for Reviewer: GLM (jcode/glm-5.3-flash), independent of the authoring DeepSeek release lane (cf2c). Review round 1 for this reviewer; verdict deferred across pins 9989643 → d2114d2 → ed1ccb6/a257b7a → 287e394 → 5b1b7cb as the author pushed fixes, per the coordinating lead. The verdict covers only the exact SHA in the header line. Scope and methodThe PR's base branch is CI and census at the exact head
Fix-window verification (each failure → fix → verified causal)
Non-blocking observations (P3)
Residual risks
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 5b1b7cbda3
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if (candidate.attempts >= DELIVERY_ATTEMPT_LIMIT) { | ||
| return { ...candidate, deliveryState: "failed", lastError: message }; | ||
| } | ||
| return { ...candidate, deliveryState: "pending", lastError: message }; |
There was a problem hiding this comment.
Hold ambiguous dispatch failures as uncertain
If a provider accepts a prompt but run-start confirmation times out, or writing the completed receipt fails, this catch returns the item to pending even though delivery may have succeeded. MessageReceipts.sendOnce() deliberately retains a pending receipt for such failures, but the next queue attempt increments attemptSeq and uses a new receipt key, bypassing that protection and potentially executing the prompt again. Only confirmed pre-dispatch failures should become automatically retryable; ambiguous outcomes should become uncertain and require an explicit retry.
Useful? React with 👍 / 👎.
| this.publish(result); | ||
| return toAgentQueueSnapshot(result.queue); |
There was a problem hiding this comment.
Resume draining after removing a blocking queue head
When an idle agent's queue is blocked by a failed or uncertain head, discarding that item leaves the next pending prompt stranded: remove() publishes the snapshot but never schedules a drain. There is no running-to-idle transition to wake it, and the session mutation subscriber only broadcasts updates. The same issue occurs when reorder() moves a pending item ahead of a blocked head. Schedule a drain after these mutations so unblocked work runs without another enqueue or manually started turn.
Useful? React with 👍 / 👎.
| if (item.origin === "voice" && this.receipts) { | ||
| await this.receipts.recordRemoved({ | ||
| agentId, | ||
| messageId: itemId, | ||
| attachmentId: itemId.split(":", 1)[0], |
There was a problem hiding this comment.
Retain deletion tombstones for typed queue items
If an enqueue reaches the daemon but its acknowledgement is lost, the originating device retains it in its durable outbox. Another device can then delete that queued prompt, but this code records a removal tombstone only for voice items and does not add the deleted ID to drainedIds. On reconnect, flushQueueOutboxForServer() resends the original typed enqueue, and enqueue() admits it again, allowing a prompt the user explicitly discarded to execute. Persist deletion deduplication state for typed items as well as voice items.
Useful? React with 👍 / 👎.
| agent.artifacts = collection.artifacts; | ||
| this.touchUpdatedAt(agent); | ||
| this.emitState(agent); |
There was a problem hiding this comment.
Discard artifact scan results for replaced agent instances
If an agent is reloaded while its end-of-turn artifact scan is walking the directory, this continuation still updates and emits the old ActiveManagedAgent object. prepareAgentForClosure() removes that instance without changing its lifecycle, and emitState() unconditionally persists and broadcasts it, so the completed scan can overwrite the reloaded agent's stored configuration and publish stale state with a fresh timestamp. Cancelling the collector does not stop a finishTurn() already in progress. Before applying the result, verify that this.agents.get(agent.id) is still the same instance; apply the same protection to the explicit scan path.
Useful? React with 👍 / 👎.
| const surplus = entries.length - COMPANION_ENTRY_LIMIT; | ||
| let remaining = surplus; |
There was a problem hiding this comment.
Exclude manual entries when calculating captured-entry surplus
Once a conversation has 50 manual pins or tracked Q&A entries, every newly captured permission, question, or outcome is immediately evicted. The surplus is calculated from all entries, but the eviction loop removes only captured entries, so manual entries consume the entire captured-moment allowance despite having a separate limit of 100. Count only non-manual entries when calculating the surplus so saving notes does not disable the Stream's automatic capture and Needs a reply cards.
Useful? React with 👍 / 👎.
| (agentId: string) => { | ||
| setFindOpen(normalizedServerId, agentId, true); |
There was a problem hiding this comment.
Switch to Chat before opening native chat search
On native, selecting Find in chat while the agent's Stream view is selected only sets findOpen; it never changes selectedViews back to chat. ChatAgentReadyContent consequently keeps the chat's RetainedPanel hidden, and the search overlay mounted inside AgentStreamView is hidden with it. The tab-menu action therefore leaves the user on Stream without a visible search field. Select the Chat view before requesting Find so this entry point works regardless of the previously selected view.
Useful? React with 👍 / 👎.
| if (metadata.seq <= this.fallbackSeq) return; | ||
| this.fallbackEpoch = metadata.epoch; | ||
| this.fallbackSeq = metadata.seq; | ||
| this.visibleReply = (this.visibleReply + event.item.text).slice(0, 4000); |
There was a problem hiding this comment.
Retain the final response rather than early narration for voice
For a turn that does not invoke speak, every assistant message is concatenated into visibleReply, including commentary before tool calls, and only the first 4,000 characters survive. If that commentary fills the buffer, the actual final answer is discarded completely and fallback playback reads only the earlier narration. handleAgentEvent() currently ignores tool-call boundaries instead of resetting the response buffer. Track the final contiguous assistant response and apply the length bound to that response so voice users hear the result rather than superseded progress text.
Useful? React with 👍 / 👎.
What this is
Retained fork carry (origin/upgrade/basket-0.15.2 at
531b041e) merged onto thesynced custom source for upstream
v0.16.0-beta.2(peeled source23bae61535542a45ade7196a7b3c152705f16de3). This is the full retainedcandidate branch for the 0.16 beta Desvio build: it keeps the TMAD-derived
basket carry per the owner clarification, and is not a wholesale removal.
Custom is included through the reviewed promotion merge
c0c6ad9, whichcontains
298af48b(PR #28, independent GLM PASS at that head).Conflict resolution decisions
38 conflicted paths were resolved with explicit ownership decisions preserved
in
basket-owner-decisions.md:permission attention stays protected; custom's repeated-error path remains.
sourceIdaliases, disclosure-hold and bottom-anchor detach, oneanimation-frame jump delay, latest-index lookup, cancellation on new request
or unmount. The new
native-message-scrollmodule owns that behavior and hasfocused tests.
screen-owned so a pending restart survives menu teardown.
goHistoryport)with fork
Cmd/Ctrl+[]bindings; workspace-relative navigation moves toCmd/Ctrl+Alt+[]. BrowserAlt+[]is unchanged.narrowed runtime canonical-model alias adoption, Claude graceful-close
fixture alignment with upstream fix(claude): preserve restart recovery during graceful shutdown getpaseo/paseo#8686.
The independent PR #28 review also flagged a P3 test gap on the nonrestoring
refresh-alias cell. This PR adds that direct fixture: config keeps the
requested alias while the observed canonical name is unchanged and adopts
after a genuine observed change.
Merge-seam repairs
Beyond conflict resolution, the first full build exposed real union defects,
fixed here: stale checkout import after upstream moved commit-file reads behind
CheckoutDiffManager.readCommitFile; missingviewMatchin fork PR lookup;app seams for draft tabs, plan handoff provider options, PR overlay
registration, compact tab switcher handlers; duplicate switcher render;
duplicate test imports/keys; and complexity/lint regressions from the union.
Gates at this head
results attached in the rollout receipts.
v0.16.0-beta.2; no publication or deployment from this PR.