@opencode/core 2.0.31 → 2.1.0

package/dist/chunks/{location-5a4fa56b.js → shell-g4qztyvf.js}

@@ -1,59 +1,59 @@
+import {
+  Service85,
+  node89
+} from "./shell-trg827xp.js";
 import {
   Service84,
   node88
-} from "./location-wapmwjpk.js";
-import {
-  Service69,
-  node72
-} from "./location-z0pkcfr2.js";
+} from "./shell-x95qaydz.js";
 import {
-  Service77,
-  node80
-} from "./location-gp4grenw.js";
+  Service79,
+  node83
+} from "./shell-03p3wnad.js";
 import {
-  Ref4,
-  Service76,
-  node79
-} from "./location-a3kydf8v.js";
+  Ref3,
+  Service78,
+  node82
+} from "./shell-bj7p7j85.js";
 import {
   canonical3
-} from "./location-fykrrrct.js";
+} from "./shell-q41jq0qr.js";
 import {
   SessionEvent2
-} from "./location-ec1grn59.js";
+} from "./shell-ec1grn59.js";
 import {
-  Service71,
-  node74
-} from "./location-0k8emadn.js";
+  Service73,
+  node77
+} from "./shell-envzrdm3.js";
 import {
-  Service24,
-  node27
-} from "./location-sk8ngeq0.js";
+  Service71,
+  node75
+} from "./shell-kcz1zv3y.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/location-lifecycle.ts
 var exports_location_lifecycle = {};
 __export(exports_location_lifecycle, {
   LocationLifecycle: () => exports_location_lifecycle,
-  Service: () => Service21,
-  node: () => node23
+  Service: () => Service70,
+  node: () => node74
 });
 import { Context, Deferred, Effect, Layer, Schema } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { LocationEvent } from "@opencode/schema/location-event";
 var isSessionEvent = Schema.is(SessionEvent2.Durable);
 
-class Service21 extends Context.Service()("@opencode/LocationLifecycle") {
+class Service70 extends Context.Service()("@opencode/LocationLifecycle") {
 }
-var layer = Layer.effect(Service21, Effect.gen(function* () {
-  const bus = yield* Service84;
-  const location = yield* Service76;
-  const permission = yield* Service71;
-  const forms = yield* Service69;
-  const rpc = yield* Service24;
-  const project = yield* Service77;
+var layer = Layer.effect(Service70, Effect.gen(function* () {
+  const bus = yield* Service85;
+  const location = yield* Service78;
+  const permission = yield* Service73;
+  const forms = yield* Service84;
+  const rpc = yield* Service71;
+  const project = yield* Service79;
   const scope = yield* Effect.scope;
   yield* project.activate(location.project.id);
   const unsubscribe = yield* bus.listen((event) => {
@@ -76,19 +76,19 @@ var layer = Layer.effect(Service21, Effect.gen(function* () {
       yield* forms.close;
       yield* rpc.close;
       yield* bus.publish(LocationEvent.Shutdown, {}, {
-        location: Ref4.make({ directory: location.directory, workspaceID: location.workspaceID })
+        location: Ref3.make({ directory: location.directory, workspaceID: location.workspaceID })
       });
     }).pipe(Effect.ensuring(Deferred.succeed(done, undefined)));
   }).pipe(Effect.uninterruptible);
-  return Service21.of({
+  return Service70.of({
     isClosed: () => closed,
     shutdown
   });
 }));
-var node23 = makeLocationNode({
-  service: Service21,
+var node74 = makeLocationNode({
+  service: Service70,
   layer,
-  deps: [node88, node79, node74, node80, node72, node27]
+  deps: [node89, node82, node77, node83, node88, node75]
 });
 
-export { Service21, node23, exports_location_lifecycle };
+export { Service70, node74, exports_location_lifecycle };

package/dist/chunks/{location-604zh56d.js → shell-g6bqk7eb.js}

@@ -1,30 +1,30 @@
 import {
   latest2,
-  Service62
-} from "./location-ptva3pym.js";
+  Service58
+} from "./shell-2exgm5zs.js";
 import {
-  Service59
-} from "./location-e6hpsnvb.js";
+  Service44
+} from "./shell-603vct5e.js";
 import {
   observe2
-} from "./location-qsdy395h.js";
+} from "./shell-qsdy395h.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/config/plugin/snapshot.ts
 var exports_snapshot = {};
 __export(exports_snapshot, {
   ConfigSnapshotPlugin: () => exports_snapshot,
-  Plugin: () => Plugin45
+  Plugin: () => Plugin49
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin45 = define({
+var Plugin49 = define({
   id: "opencode.config.snapshot",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service62;
-    const snapshot = yield* Service59;
+    const config = yield* Service58;
+    const snapshot = yield* Service44;
     const loaded = yield* observe2(config, ctx.event, snapshot.reload());
     yield* snapshot.transform((editor) => {
       const configured = latest2(loaded.entries, "snapshots");
@@ -35,4 +35,4 @@ var Plugin45 = define({
   })
 });
 
-export { Plugin45, exports_snapshot };
+export { Plugin49, exports_snapshot };

package/dist/chunks/{location-gd4qta3r.js → shell-gd4qta3r.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/file-retention.ts
 var exports_file_retention = {};

package/dist/chunks/{location-d2kjhx1e.js → shell-gmbs0yfc.js}

@@ -1,60 +1,60 @@
 import {
   makeUnsafe2
-} from "./location-y71avatq.js";
+} from "./shell-y71avatq.js";
 import {
-  Service84,
-  node88
-} from "./location-wapmwjpk.js";
+  Service85,
+  node89
+} from "./shell-trg827xp.js";
 import {
-  Event14,
-  Service68,
-  node71
-} from "./location-54ekx5ae.js";
+  Event20,
+  Service83,
+  node87
+} from "./shell-rw4jj2rk.js";
 import {
-  Service76,
-  node79
-} from "./location-a3kydf8v.js";
+  Service78,
+  node82
+} from "./shell-bj7p7j85.js";
 import {
-  Service48,
-  node52
-} from "./location-ndxmvpwy.js";
+  Service68,
+  node71
+} from "./shell-w921m42b.js";
 import {
-  ID9,
-  Service69,
-  node72
-} from "./location-z0pkcfr2.js";
+  ID18,
+  Service84,
+  node88
+} from "./shell-x95qaydz.js";
 import {
   reconcile2,
   create3
-} from "./location-rdw6cm16.js";
+} from "./shell-rdw6cm16.js";
 import {
-  ID7,
+  ID16,
   MethodID2,
-  Service67,
-  node70
-} from "./location-m464tetq.js";
+  Service82,
+  node86
+} from "./shell-50d2yybn.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
   NotFoundError: () => NotFoundError4,
-  Options: () => Options3,
+  Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service37,
+  Service: () => Service36,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured3,
+  configured: () => configured4,
   layer: () => layer15,
-  node: () => node40
+  node: () => node39
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -103,21 +103,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service37 extends Context.Service()("@opencode/MCP") {
+class Service36 extends Context.Service()("@opencode/MCP") {
 }
-var Options3 = Schema.Struct({
+var Options4 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
-  const location = yield* Service76;
-  const environment = yield* Service48;
-  const bus = yield* Service84;
-  const forms = yield* Service69;
-  const integration = yield* Service67;
-  const credentials = yield* Service68;
+var layer15 = (options) => Layer.effect(Service36, Effect.gen(function* () {
+  const location = yield* Service78;
+  const environment = yield* Service68;
+  const bus = yield* Service85;
+  const forms = yield* Service84;
+  const integration = yield* Service82;
+  const credentials = yield* Service83;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -129,7 +129,7 @@ var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
       return;
     const remote = entry.config;
     const suffix = "mcp_" + createHash("sha1").update(name + "\x00" + remote.url).digest("hex").slice(0, 16);
-    const integrationID = ID7.make(suffix);
+    const integrationID = ID16.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -145,7 +145,7 @@ var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
         method: { id: methodID, type: "oauth", label: name },
         authorize: () => Effect.gen(function* () {
           const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service68, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service83, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -161,12 +161,12 @@ var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
     if (entry.config.type !== "remote" || !entry.integrationID)
       return;
     const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service68, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service83, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID9.create();
+        const formID = ID18.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -269,7 +269,7 @@ var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const load = McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service48, environment), Scope.provide(scope));
+    const load = McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service68, environment), Scope.provide(scope));
     const result = yield* (entry.config.type === "remote" ? endpointLoads.withLock(entry.config.url)(load) : load).pipe(Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
@@ -394,7 +394,7 @@ var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event14.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event20.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
   const state = create3({
     name: "mcp",
     initial: () => ({
@@ -420,7 +420,7 @@ var layer15 = (options) => Layer.effect(Service37, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service37.of({
+  return Service36.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -530,14 +530,14 @@ function mergeCatalogs(catalogs) {
     templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
   });
 }
-function configured3(options) {
+function configured4(options) {
   return makeLocationNode({
-    service: Service37,
+    service: Service36,
     layer: layer15(options),
-    deps: [node79, node52, node88, node72, node70, node71]
+    deps: [node82, node71, node89, node88, node86, node87]
   });
 }
-var node40 = configured3();
+var node39 = configured4();
 function toElicitationField(key, property, required) {
   const machineTitle = /^(boolean|string|number|integer|array|object)(\s+with\b.*|\s+in\b.*)?$/i;
   const title = property.title && !machineTitle.test(property.title.trim()) ? property.title : property.description ?? key;
@@ -588,4 +588,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError4, ToolCallError2, Service37, Options3, layer15, configured3, node40, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError4, ToolCallError2, Service36, Options4, layer15, configured4, node39, exports_mcp4 };

package/dist/chunks/{location-zbax6w3t.js → shell-gt7zzye3.js}

@@ -1,21 +1,21 @@
 import {
-  Service84,
-  node88
-} from "./location-wapmwjpk.js";
+  Service85,
+  node89
+} from "./shell-trg827xp.js";
 import {
-  Service76,
-  node79
-} from "./location-a3kydf8v.js";
+  Service78,
+  node82
+} from "./shell-bj7p7j85.js";
 import {
   SessionEvent2
-} from "./location-ec1grn59.js";
+} from "./shell-ec1grn59.js";
 import {
-  Service72,
-  node75
-} from "./location-v23zj4w8.js";
+  Service74,
+  node78
+} from "./shell-0dwthkwv.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/session/instructions.ts
 var exports_instructions = {};
@@ -35,10 +35,10 @@ var InjectedMetadata = Schema.Struct({
 class Service5 extends Context.Service()("@opencode/SessionInstructions") {
 }
 var layer = Layer.effect(Service5, Effect.gen(function* () {
-  const bus = yield* Service84;
+  const bus = yield* Service85;
   const fs = yield* FSUtil.Service;
-  const store = yield* Service72;
-  const location = yield* Service76;
+  const store = yield* Service74;
+  const location = yield* Service78;
   const root = yield* fs.resolve(location.project.directory);
   const inFlight = yield* Ref.make(new Map);
   const load = Effect.fn("SessionInstructions.load")(function* (input) {
@@ -98,7 +98,7 @@ function describePath(root, path) {
 var node7 = makeLocationNode({
   name: "session-instructions",
   layer,
-  deps: [node88, FSUtil.node, node79, node75]
+  deps: [node89, FSUtil.node, node82, node78]
 });
 
 export { Service5, node7, exports_instructions };

package/dist/chunks/{location-zrjxanbe.js → shell-h055mtc6.js}

@@ -1,44 +1,44 @@
 import {
   useragent2
-} from "./location-08mhz53j.js";
+} from "./shell-ccbzs5ke.js";
 import {
-  Service84
-} from "./location-wapmwjpk.js";
+  Service85
+} from "./shell-trg827xp.js";
 import {
   OAuth3,
-  Event14
-} from "./location-54ekx5ae.js";
+  Event20
+} from "./shell-rw4jj2rk.js";
 import {
   key2
-} from "./location-k22b66k8.js";
+} from "./shell-3y377wv9.js";
 import {
-  ID7,
+  ID16,
   MethodID2,
   AuthorizationError2
-} from "./location-m464tetq.js";
+} from "./shell-50d2yybn.js";
 import {
-  Service19
-} from "./location-pba85c1x.js";
+  Service14
+} from "./shell-fww2ha2b.js";
 import {
-  ID6,
+  ID8,
   mergeOverlay2,
   mergeHeaders2
-} from "./location-xg3acd94.js";
+} from "./shell-5xghjtfa.js";
 import {
   mergeCapabilities2
-} from "./location-b476w8hy.js";
+} from "./shell-3atk1qyf.js";
 import {
   supports2,
   resolve2
-} from "./location-0p4tcy8x.js";
+} from "./shell-wmxpb99x.js";
 import {
-  ID18,
+  ID4,
   Input14,
   Response2
-} from "./location-ef6w4cys.js";
+} from "./shell-fvgqktbw.js";
 
 // src/plugin/provider/opencode.ts
-import { Duration, Effect, Equal, Option, Schema, SchemaGetter, Scope, Semaphore, Stream } from "effect";
+import { Duration, Effect, Equal, FiberHandle, Option, Schema, SchemaGetter, Scope, Semaphore, Stream } from "effect";
 import { define } from "@opencode/plugin/effect/plugin";
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http";
 import { ConfigPolicy } from "@opencode/schema/config/policy";
@@ -61,7 +61,7 @@ var RemotePolicies = Schema.Array(Schema.Unknown).pipe(Schema.decodeTo(Schema.Un
 var RemoteResponse = Schema.Struct({
   providers: Schema.Record(Schema.String, ConfigProvider.Info),
   websearch: Schema.Struct({
-    providerID: ID18
+    providerID: ID4
   }).pipe(Schema.optional),
   mcp: Schema.Struct({
     servers: Schema.Record(Schema.String, Schema.Struct({ ...Mcp.RemoteConfig.fields, auth: Schema.Literal("console").pipe(Schema.optional) }))
@@ -112,7 +112,7 @@ class SignedOutError extends Schema.TaggedError()("OpencodeConsole.SignedOut", {
 }
 function oauth(http) {
   return {
-    integrationID: ID7.make("opencode"),
+    integrationID: ID16.make("opencode"),
     method: {
       id: methodID,
       type: "oauth",
@@ -176,10 +176,10 @@ function oauth(http) {
 var OpencodePlugin2 = define({
   id: "opencode.provider.opencode",
   effect: Effect.fn(function* (ctx) {
-    const bus = yield* Service84;
+    const bus = yield* Service85;
     const client = yield* HttpClient.HttpClient;
     const http = HttpClient.mapRequest(client, HttpClientRequest.setHeader("User-Agent", useragent2(ctx.app)));
-    const managed = yield* Service19;
+    const managed = yield* Service14;
     const scope = yield* Scope.Scope;
     const loading = Semaphore.makeUnsafe(1);
     let snapshot = { config: undefined, connection: undefined, organization: undefined, mcp: undefined };
@@ -231,7 +231,7 @@ var OpencodePlugin2 = define({
         providers.update(providerID, (provider) => {
           if (source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), { id: provider.id });
-          provider.integrationID = ID7.make("opencode");
+          provider.integrationID = ID16.make("opencode");
           if (item.canonical !== undefined)
             provider.canonical = item.canonical;
           if (item.name !== undefined)
@@ -303,7 +303,7 @@ var OpencodePlugin2 = define({
             sourceConnection: snapshot.connection
           });
       }
-      const item = providers.get(ID6.opencode);
+      const item = providers.get(ID8.opencode);
       if (!item)
         return;
       const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey);
@@ -315,7 +315,7 @@ var OpencodePlugin2 = define({
       });
     });
     yield* ctx.model.transform((models) => {
-      const item = models.provider.get(ID6.opencode);
+      const item = models.provider.get(ID8.opencode);
       if (!item)
         return;
       const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey && item.provider.settings.apiKey !== "public");
@@ -404,11 +404,19 @@ var OpencodePlugin2 = define({
     });
     const guard = Effect.fn("OpencodePlugin.guard")(function* (next) {
       yield* Effect.forEach(explainers, (registration) => registration.dispose, { discard: true });
-      explainers = yield* Effect.forEach(next.connection ? new Set([ID6.opencode, ...Object.keys(next.config?.providers ?? {})]) : [], (providerID) => ctx.session.hook("http.response", explain, { providerID }).pipe(Scope.provide(scope)));
+      explainers = yield* Effect.forEach(next.connection ? new Set([ID8.opencode, ...Object.keys(next.config?.providers ?? {})]) : [], (providerID) => ctx.session.hook("http.response", explain, { providerID }).pipe(Scope.provide(scope)));
     });
     yield* guard(snapshot);
-    yield* bus.subscribe(Event14.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID7.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
-    yield* Effect.sleep(Duration.minutes(1)).pipe(Effect.andThen(check()), Effect.forever, Effect.forkScoped);
+    const polling = yield* FiberHandle.make();
+    const poll = Effect.fnUntraced(function* () {
+      if (!snapshot.connection)
+        return yield* FiberHandle.clear(polling);
+      yield* FiberHandle.run(polling, Effect.sleep(Duration.minutes(1)).pipe(Effect.andThen(check()), Effect.forever), {
+        onlyIfMissing: true
+      });
+    });
+    yield* bus.subscribe(Event20.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID16.make("opencode")), Stream.runForEach(() => refresh().pipe(Effect.andThen(poll()))), Effect.forkScoped({ startImmediately: true }));
+    yield* poll();
   })
 });
 function fetchConfig(http, value) {

package/dist/chunks/{location-bczx5ry5.js → shell-h0bzvw2w.js}

@@ -1,7 +1,9 @@
 import {
-  isCheckpoint2,
-  decode2
-} from "./location-syf57q56.js";
+  kept2
+} from "./shell-8mywswrd.js";
+import {
+  NativeWindow2
+} from "./shell-9jvjhjkm.js";
 
 // src/session/runner/to-llm-message.ts
 import {
@@ -142,7 +144,7 @@ var assistant = (message, model, providerMetadataKey) => {
         {
           type: "text",
           text: item.text,
-          providerMetadata: reuseProviderMetadata ? providerMetadata(providerMetadataKey, item.state) : undefined
+          providerMetadata: reuseProviderMetadata ? providerMetadata(providerMetadataKey, item.native) : undefined
         }
       ];
     if (item.type === "reasoning")
@@ -150,14 +152,14 @@ var assistant = (message, model, providerMetadataKey) => {
         {
           type: "reasoning",
           text: item.text,
-          providerMetadata: providerMetadata(providerMetadataKey, item.state)
+          providerMetadata: providerMetadata(providerMetadataKey, item.native)
         }
       ] : item.text.length > 0 ? [{ type: message.error === undefined && !reasoningInterrupted ? "reasoning" : "text", text: item.text }] : [];
     const reuseToolProviderMetadata = reuseProviderMetadata || sameModel && item.executed === true && (item.state.status === "completed" || item.state.status === "error");
-    const call = toolCall(item, reuseToolProviderMetadata ? providerMetadata(providerMetadataKey, item.providerState) : undefined);
+    const call = toolCall(item, reuseToolProviderMetadata ? providerMetadata(providerMetadataKey, item.native) : undefined);
     if (item.executed !== true)
       return [call];
-    const result = toolResult(item, reuseToolProviderMetadata ? providerMetadata(providerMetadataKey, item.providerResultState ?? item.providerState) : sameProvider && item.providerResultState !== undefined ? providerMetadata(providerMetadataKey, item.providerResultState) : undefined);
+    const result = toolResult(item, sameProvider ? providerMetadata(providerMetadataKey, item.native) : undefined);
     return result ? [call, result] : [call];
   });
   const meaningful = content.filter((part) => {
@@ -167,7 +169,7 @@ var assistant = (message, model, providerMetadataKey) => {
       return true;
     return part.text !== "" || part.providerMetadata !== undefined && Object.keys(part.providerMetadata).length > 0;
   });
-  const results = message.content.filter((item) => item.type === "tool" && item.executed !== true).map((item) => toolResult(item, reuseProviderMetadata ? providerMetadata(providerMetadataKey, item.providerResultState ?? item.providerState) : undefined)).filter((message) => message !== undefined).map(Message.tool);
+  const results = message.content.filter((item) => item.type === "tool" && item.executed !== true).map((item) => toolResult(item, reuseProviderMetadata ? providerMetadata(providerMetadataKey, item.native) : undefined)).filter((message) => message !== undefined).map(Message.tool);
   if (meaningful.length === 0)
     return results;
   return [
@@ -254,11 +256,12 @@ ${message.output?.output ?? ""}`,
       ];
     case "assistant":
       return assistant(message, model, providerMetadataKey);
-    case "compaction":
+    case "compaction": {
       if (message.status !== "completed")
         return [];
-      if (isCheckpoint2(message))
-        return [...decode2(message.providerContext)];
+      if (message.native?.messages !== undefined)
+        return [...Schema.decodeUnknownSync(NativeWindow2)(message.native.messages)];
+      const kept = kept2(message);
       return [
         Message.make({
           id: message.id,
@@ -270,8 +273,8 @@ ${message.output?.output ?? ""}`,
             `<summary>
 ${message.summary}
 </summary>`,
-            ...message.recent ? ["", `<recent-context>
-${message.recent}
+            ...kept ? ["", `<recent-context>
+${kept}
 </recent-context>`] : [],
             "</conversation-checkpoint>"
           ].join(`
@@ -279,6 +282,7 @@ ${message.recent}
           metadata: message.metadata
         })
       ];
+    }
   }
 }
 var toLLMMessages2 = (messages, model, providerMetadataKey = model.providerID) => messages.flatMap((message) => toLLMMessage(message, model, providerMetadataKey));

package/dist/chunks/{location-h6vf3j39.js → shell-h6vf3j39.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/util/token.ts
 var exports_token = {};