History

fix: reconcile main's round-18 features after the rebase

Adopts the round's main features into the v2 architecture: the #9023 media rework (streamed videos, media-file assets, protocol-relative links), #9098 shared live-activity row folded into the v2 working and thinking rows, the #9084/#9078 Claude model catalog for v2 consumers, a native #9005 OpenCode child-session abort in the v2 adapter, #9013's landed LegendList patch, and per-environment sidebar provider entries. For #8600 the server-side pieces land, but auto-settle evaluation stays client-side (reading the new server-owned settings) until the v2 orchestrator grows its own settlement reactor; main's v1-only reactor and coalescer additions are dropped with the rest of the v1 path.

Julius Marminge committed 2 months ago

Commit 7b13bca1 parent 786a25847 files · +1855 −2616Browse files

Showing the changes to packages/client-runtime/src/work-log (2 of 47 files). Show all

Unified · Split

2 files
  1. packages/client-runtime/src/work-log/presentation.test.ts +1 −1
  2. packages/client-runtime/src/work-log/presentation.ts +2 −2
packages/client-runtime/src/work-log/presentation.test.ts+1−1
@@ -444,7 +444,7 @@ describe("resolveViewedImageAsset", () => { · 443 unmodified lines
444 }),444 }),
445 ).toEqual({445 ).toEqual({
446 resource: {446 resource: {
447 _tag: "workspace-file",447 _tag: "media-file",
448 threadId,448 threadId,
449 path: "/workspace/screens/logo.svg",449 path: "/workspace/screens/logo.svg",
450 },450 },
packages/client-runtime/src/work-log/presentation.ts+2−2
@@ -135,7 +135,7 @@ export function workEntryViewedImagePath(entry: WorkLogPresentationEntry): strin · 134 unmodified lines
135}135}
136 136
137export interface ViewedImageAsset {137export interface ViewedImageAsset {
138 readonly resource: Extract<AssetResource, { readonly _tag: "attachment" | "workspace-file" }>;138 readonly resource: Extract<AssetResource, { readonly _tag: "attachment" | "media-file" }>;
139 readonly alt: string;139 readonly alt: string;
140 readonly srcFragment: string;140 readonly srcFragment: string;
141}141}
@@ -165,7 +165,7 @@ export function resolveViewedImageAsset( · 23 unmodified lines
165 return {165 return {
166 resource: attachmentId166 resource: attachmentId
167 ? { _tag: "attachment", attachmentId }167 ? { _tag: "attachment", attachmentId }
168 : { _tag: "workspace-file", threadId: input.threadId, path },168 : { _tag: "media-file", threadId: input.threadId, path },
169 alt: path.split(/[\\/]/).at(-1) ?? "image",169 alt: path.split(/[\\/]/).at(-1) ?? "image",
170 srcFragment: markdownImageSourceFragment(source),170 srcFragment: markdownImageSourceFragment(source),
171 };171 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t