[Pawl-Patrol]

Merges upstream's main up to d890e5c40 into fork (331 new commits). Sync run

Everything is green; the sync merges this itself.

Conflicts

• README.md
• apps/desktop/src/main.ts
• apps/mobile/src/features/threads/ThreadFeed.tsx
• apps/server/src/mcp/OrchestratorMcpService.ts
• apps/server/src/mcp/toolkits/pullRequests/tools.ts
• apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
• apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
• apps/server/src/scheduledTasks/ScheduledTaskService.ts
• apps/server/src/usage/UsageService.ts
• apps/web/src/components/ChatView.tsx
• apps/web/src/components/CommandPalette.tsx
• apps/web/src/components/ThreadNotificationCoordinator.tsx
• apps/web/src/components/settings/ScheduledTasksSettings.tsx
• apps/web/src/components/sidebar/SidebarThreadRow.tsx
• knip.jsonc
• packages/client-runtime/src/state/threads.ts
• packages/contracts/src/index.ts
• packages/contracts/src/orchestratorMcp.ts
• packages/contracts/src/scheduledTask.ts
• packages/shared/src/markdownPipeline.ts

Copilot's summary

Upstream sync summary

Merged upstream d890e5c40120769badcf18bff6d1ac983c8f40c7 into fork base
c1244b9385cac3d7dbec0058aa23c03e40371d6b.

Commits

• 6401f9a8e chore: merge upstream/main (d890e5c40)
• 8e837d86f fix(fork): adapt integrations to upstream policy changes
• cccec4784 chore(fork): preserve audited fork source
• 6573adfa2 fix(fork): pass upstream merge verification

Conflict resolutions

• README.md: retained the esveo code fork identity and feature documentation while accepting upstream documentation changes.
• apps/desktop/src/main.ts: retained the fork update wrapper and integrated upstream's desktop managed/update policy layers.
• apps/mobile/src/features/threads/ThreadFeed.tsx: kept the fork's thread-feed behavior on top of upstream's revised mobile feed.
• apps/server/src/mcp/OrchestratorMcpService.ts: retained fork MCP behavior and adopted the upstream service/toolkit APIs.
• apps/server/src/mcp/toolkits/pullRequests/tools.ts: kept the fork pull-request tools while adopting upstream's rewritten toolkit contracts.
• apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts: retained esveo branding expectations in upstream's rewritten ACP adapter tests.
• apps/server/src/orchestration-v2/ThreadLaunchService.test.ts: combined fork launch coverage with upstream managed-policy dependencies and behavior.
• apps/server/src/scheduledTasks/ScheduledTaskService.ts: retained fork scheduling behavior while integrating upstream managed runtime policy enforcement.
• apps/server/src/usage/UsageService.ts: preserved fork usage/session handling on upstream's revised service implementation.
• apps/web/src/components/ChatView.tsx: retained fork side-chat integration using the new shared sideChatParentPanel structure.
• apps/web/src/components/CommandPalette.tsx: kept fork commands and adopted upstream command-palette changes.
• apps/web/src/components/ThreadNotificationCoordinator.tsx: retained fork notifications while accepting upstream coordinator changes.
• apps/web/src/components/settings/ScheduledTasksSettings.tsx: retained fork scheduled-task controls on upstream's updated settings UI.
• apps/web/src/components/sidebar/SidebarThreadRow.tsx: kept fork row behavior and adopted upstream's sidebar changes.
• knip.jsonc: accepted stricter upstream checks and added narrow exceptions for intentional fork-only exports.
• packages/client-runtime/src/state/threads.ts: retained fork thread state behavior on upstream's revised client state.
• packages/contracts/src/index.ts: exported both upstream additions and fork contracts.
• packages/contracts/src/orchestratorMcp.ts: retained fork MCP contracts while adopting upstream schema changes.
• packages/contracts/src/scheduledTask.ts: combined fork scheduling fields with upstream policy/schema updates.
• packages/shared/src/markdownPipeline.ts: retained fork markdown behavior on upstream's revised pipeline.
• pnpm-lock.yaml: took the fork side as required and regenerated it with vp install --no-frozen-lockfile.

Follow-up fixes

• Added managed-policy layers to fork scheduler and analytics tests.
• Adapted the fork desktop updater to upstream's update and managed-policy services.
• Preserved intentional fork exports and source required by the fork audit under upstream's stricter lint/Knip rules.
• Treated Git's invalid-worktree-gitfile diagnostic as a missing repository during storage cleanup.
• Updated the measured fork agent-context budget after the merged MCP text changed.
• Supplied the scheduled-task bound-thread mock required by upstream's policy lookup.
• Updated Cursor adapter assertions for the esveo code instruction headings.
• Updated shell persistence coverage so snapshots contain a real row change; sequence-only updates are intentionally not rewritten by the merged row-identity optimization.

Audit

The final audit reports 49 fork-added lines missing verbatim, below the limit of 50.
They are accounted for as follows:

• PullRequestDetailPanel.tsx: PR summary/detail logic moved into the upstream usePullRequestDetail structure; the fork behavior remains.
• providerRuntime.ts: imports/types were reformatted by upstream; the fork runtime contracts remain.
• UsageService.ts: usage-session behavior remains under upstream's rewritten imports and service structure.
• useSettings.ts: settings code was reformatted/restructured; fork settings remain mounted.
• AcpAdapterV2.test.ts: upstream rewrote the cases; esveo branding assertions remain.
• shell-sync.test.ts: the persistence case now uses changing thread rows and deterministic clock steps to reflect the merged cache optimization.
• ChatView.tsx: the fork side-panel object is represented by shared sideChatParentPanel.
• agentContextBudget.fork.json: all three values were regenerated to the measured merged context sizes.
• AcpMcpStdioBridge.ts: formatting/import restructuring only; the fork bridge behavior remains.
• orchestratorMcp.ts, assistantTextSelection.ts, voiceCallThreadMarks.ts, pull-request tools, and OrchestratorMcpService.ts: upstream formatting or API rewrites replaced the exact lines while preserving their fork behavior.
• apps/desktop/src/main.ts: updater wiring changed structurally to wrap upstream policy layers.
• README.md: obsolete wording/branding was corrected while preserving the fork feature documentation.

Validation

• vp install --no-frozen-lockfile: passed.
• Affected package typechecks: contracts, shared, client-runtime, server, web, desktop, mobile, and provider-cursor passed.
• Focused server tests: 162 passed.
• Client-runtime shell synchronization: 21 passed.
• Cursor adapter: 21 passed.
• Focused web conflict tests: 122 passed.
• Desktop, mobile, contracts, shared, and provider-core related tests passed in verification.
• React Compiler coverage passed.
• Final guards: valid merge commit, no conflict markers, no fork files deleted, no new skipped tests.
• Final audit: passed with 49 missing verbatim lines.

Remaining

No known merge issue remains. The one full verifier run initially reported the fixed server,
client-runtime, and Cursor failures plus a missing Playwright Chromium binary. Chromium was
installed and focused web tests passed afterward. Per the round instructions, the full verifier
was not run a second time.

Checks

• ✅ vp install
• ✅ pnpm-lock.yaml committed
• ✅ electron runtime
• ✅ typecheck
• ✅ tests related to 6 changed files in apps/desktop
• ✅ tests related to 8 changed files in apps/mobile
• ✅ tests related to 64 changed files in apps/server
• ✅ tests related to 47 changed files in apps/web
• ✅ tests related to 5 changed files in packages/client-runtime
• ✅ tests related to 11 changed files in packages/contracts
• ✅ tests related to 2 changed files in packages/provider-core
• ✅ tests related to 2 changed files in packages/provider-cursor
• ✅ tests related to 6 changed files in packages/shared
• ✅ React Compiler coverage in apps/web

Guards

• ✅ merge commit of fork and upstream, no rebase
• ✅ no conflict markers
• ✅ no fork files deleted
• ✅ no new skipped tests

Fork lines not in the result

49 lines the fork added are missing verbatim. Upstream rewrites and reformatting cause some; check that the features still exist.

File	Lines
apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx	7
packages/contracts/src/providerRuntime.ts	6
apps/server/src/usage/UsageService.ts	6
apps/web/src/hooks/useSettings.ts	5
apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts	5
packages/client-runtime/src/state/shell-sync.test.ts	4
apps/web/src/components/ChatView.tsx	3
apps/server/src/provider/agentContextBudget.fork.json	3
apps/server/src/mcp/AcpMcpStdioBridge.ts	3
packages/contracts/src/orchestratorMcp.ts	1
apps/web/src/lib/assistantTextSelection.ts	1
apps/web/src/components/voiceCall/voiceCallThreadMarks.ts	1
apps/server/src/mcp/toolkits/pullRequests/tools.ts	1
apps/server/src/mcp/OrchestratorMcpService.ts	1
apps/desktop/src/main.ts	1
README.md	1