chore - merge dev into flex, resolve conflicts in session/llm.ts and session/prompt.ts

[lgarceau768]

Summary

• Merges upstream dev into flex, bringing in all changes from commit 7e576eea4
• Resolves 2 merge conflicts and 1 silent data loss in session/llm.ts and session/prompt.ts

Conflict resolutions

packages/opencode/src/session/llm.ts

• Took dev's conflict block (4-space indent, .tag("session.id", ...))
• Restored flex-specific canTool guard (input.model.capabilities.toolcall) around resolveTools, the noop tool injection, and the tools/activeTools/toolChoice spread in streamText — this was in HEAD's block only and was lost in the initial resolution

packages/opencode/src/session/prompt.ts — conflict 1

• Kept HEAD's (flex) resolvePromptParts function, preserving synthetic: true on the initial text part
• Fixed 2-space over-indent inherited from the flex branch to match the surrounding 4-space context

packages/opencode/src/session/prompt.ts — conflict 2

• Took dev's block: compaction.prune({ sessionID }) + return yield* lastAssistant(sessionID) + proper close of runLoop
• Discarded HEAD's misplaced templateParts/isSubtask/parts block (git had placed command-function code into the runLoop conflict region)

packages/opencode/src/session/prompt.ts — silent data loss (command function)

• Restored the flex commit 9043d924a change lost by git's merge algorithm: { type: "text", text: \Running skill: ${input.command}`, ignored: true }in the non-subtask branch ofcommand's parts` array, which hides skill invocation text from the chat UI

Test Plan

• bun test from packages/opencode: 2023 tests, 0 failures
• Full monorepo bun turbo typecheck: 13/13 packages pass

[github-actions]

This PR doesn't fully meet our contributing guidelines and PR template.

What needs to be fixed:

• PR description is missing required template sections. Please use the PR template.

Please edit this PR description to address the above within 2 hours, or it will be automatically closed.

If you believe this was flagged incorrectly, please let a maintainer know.

[github-actions]

Hey! Your PR title chore - merge dev into flex, resolve conflicts in session/llm.ts and session/prompt.ts doesn't follow conventional commit format.

Please update it to start with one of:

• feat: or feat(scope): new feature
• fix: or fix(scope): bug fix
• docs: or docs(scope): documentation changes
• chore: or chore(scope): maintenance tasks
• refactor: or refactor(scope): code refactoring
• test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.