Skip to content

fix(core): add fallback for JSON parse errors in models-dev #29385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SpencerJung wants to merge 2 commits into from
+10 −4
Closed

fix(core): add fallback for JSON parse errors in models-dev #29385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef680b8
fix(snapshot): use worktree root as cwd for git operations
SpencerJung May 26, 2026
f6918ce
fix(core): add fallback for JSON parse errors in models-dev
SpencerJung May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/core/src/models-dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,13 @@ export const layer = Layer.effect(
return yield* fetchAndWrite()
}),
)
return JSON.parse(text) as Record<string, Provider>
return yield* Effect.try({
try: () => JSON.parse(text) as Record<string, Provider>,
catch: () => new Error(`Failed to parse models JSON from ${source}`),
}).pipe(
Effect.tapError((e) => Effect.logWarning(e.message)),
Effect.orElse(() => Effect.succeed({} as Record<string, Provider>)),
)
}).pipe(Effect.withSpan("ModelsDev.populate"), Effect.orDie)

const [cachedGet, invalidate] = yield* Effect.cachedInvalidateWithTTL(populate, Duration.infinity)
Expand Down
6 changes: 3 additions & 3 deletions packages/opencode/src/snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | AppProce
"-z",
],
{
cwd: state.directory,
cwd: state.worktree,
stdin: feed(files),
},
)
Expand All @@ -138,7 +138,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | AppProce
...args(["rm", "--cached", "-f", "--ignore-unmatch", "--pathspec-from-file=-", "--pathspec-file-nul"]),
],
{
cwd: state.directory,
cwd: state.worktree,
stdin: feed(files),
},
)
Expand All @@ -149,7 +149,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | AppProce
const result = yield* git(
[...cfg, ...args(["add", "--all", "--sparse", "--pathspec-from-file=-", "--pathspec-file-nul"])],
{
cwd: state.directory,
cwd: state.worktree,
stdin: feed(files),
},
)
Expand Down
Loading