Skip to content

Commit 3b6e10f

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-28163
2 parents b022f0d + 15fe283 commit 3b6e10f

5 files changed

Lines changed: 24 additions & 5 deletions

File tree

‎apps/web/src/components/chat/ComposerModelEffort.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,14 @@ function ColumnRow(props: {
171171
const content = (
172172
<>
173173
<span className="min-w-0 flex-1 truncate">{props.label}</span>
174-
{props.isDefault ? <span className="text-muted-foreground/70 text-xs">Default</span> : null}
175-
<CheckIcon aria-hidden="true" className={cn("size-3.5", !props.selected && "invisible")} />
174+
{props.selected ? (
175+
<>
176+
{props.isDefault ? <span className="sr-only">Default</span> : null}
177+
<CheckIcon aria-hidden="true" className="size-3.5" />
178+
</>
179+
) : props.isDefault ? (
180+
<span className="text-muted-foreground/70 text-xs">Default</span>
181+
) : null}
176182
</>
177183
);
178184
if (!props.description) return <button {...rowProps}>{content}</button>;

‎packages/contracts/src/model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export const DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER: Partial<
160160
[ProviderDriverKind.make("antigravity")]: ANTIGRAVITY_DEFAULT_MODEL,
161161
[CLAUDE_DRIVER_KIND]: "claude-haiku-5-5",
162162
[CURSOR_DRIVER_KIND]: "composer-2",
163-
[OPENCODE_DRIVER_KIND]: "openai/gpt-5",
163+
[OPENCODE_DRIVER_KIND]: "opencode/big-pickle",
164164
};
165165

166166
export const MODEL_SLUG_ALIASES_BY_PROVIDER: Partial<

‎packages/provider-opencode/src/server/textGeneration.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@ export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration"
190190
client.session.create(
191191
{
192192
title: `T3 Code ${input.operation}`,
193-
permission: [{ permission: "*", pattern: "*", action: "deny" }],
193+
// OpenCode Zen refuses free-model requests that carry no tools, so keep read.
194+
permission: [
195+
{ permission: "*", pattern: "*", action: "deny" },
196+
{ permission: "read", pattern: "*", action: "allow" },
197+
],
194198
},
195199
{ signal },
196200
),

‎packages/shared/src/serverSettings.test.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ const decodeServerSettingsPatch = Schema.decodeUnknownSync(ServerSettingsPatch);
3232
const FOLDED_SERVER_SETTINGS = { ...DEFAULT_SERVER_SETTINGS, projectSettingsFolded: true };
3333

3434
describe("fallbackTextGenerationModelSelection", () => {
35+
it("uses Big Pickle when only OpenCode is enabled", () => {
36+
expect(
37+
fallbackTextGenerationModelSelection({}, (instanceId) => instanceId === "opencode"),
38+
).toEqual({ instanceId: "opencode", model: "opencode/big-pickle" });
39+
});
40+
3541
it("replaces and clears the fallback without carrying model options", () => {
3642
const fallbackModelSelection = { instanceId: ProviderInstanceId.make("codex"), model: "new" };
3743
const settings = applyServerSettingsPatch(

‎scripts/build-desktop-artifact.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,10 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
11501150
});
11511151

11521152
assert.isFalse(
1153-
commands.some((command) => command.options.env?.ELECTRON_RUN_AS_NODE === "1"),
1153+
commands.some(
1154+
(command) =>
1155+
command.command === NodePath.join(fixture.packagedAppDir, fixture.appExecutableName),
1156+
),
11541157
);
11551158
assert.isTrue(
11561159
commands.some(

0 commit comments

Comments
 (0)