@opencode-ai/core 0.0.0-beta-18593 → 0.0.0-beta-18684

package/dist/chunks/state-gpxba9vf.js

@@ -0,0 +1,120 @@
+import {
+  exports_supervisor_service
+} from "./state-s33fw6zm.js";
+import {
+  exports_snapshot
+} from "./state-mhk3rrcb.js";
+import {
+  MessageNotFoundError
+} from "./state-cgqn2mrm.js";
+import {
+  SessionMessageTable
+} from "./state-q606pcse.js";
+import {
+  SessionMessage
+} from "./state-8rpfd2h6.js";
+import {
+  SessionEvent
+} from "./state-a83yvq99.js";
+import {
+  RelativePath
+} from "./state-j07kk359.js";
+import {
+  exports_bus
+} from "./state-cgy4zpa6.js";
+import {
+  exports_database
+} from "./state-vpac0x8g.js";
+import {
+  __export
+} from "./state-rvfvac9x.js";
+
+// src/session/revert.ts
+var exports_revert = {};
+__export(exports_revert, {
+  make: () => make,
+  layer: () => layer,
+  commit: () => commit,
+  SessionRevert: () => exports_revert,
+  Service: () => Service,
+  MessageNotFoundError: () => MessageNotFoundError
+});
+import { and, asc, eq, gt } from "drizzle-orm";
+import { Context, Effect, Layer, Schema } from "effect";
+class Service extends Context.Service()("@opencode/SessionRevert") {
+}
+var make = Effect.fn("SessionRevert.make")(function* () {
+  const database = yield* exports_database.Service;
+  const bus = yield* exports_bus.Service;
+  const plugins = yield* exports_supervisor_service.Service;
+  const snapshot = yield* exports_snapshot.Service;
+  const stage = Effect.fn("SessionRevert.stage")(function* (input) {
+    yield* plugins.flush;
+    const original = input.session.revert?.snapshot ? exports_snapshot.ID.make(input.session.revert.snapshot) : yield* snapshot.capture();
+    const next = yield* plan(database.db, { sessionID: input.session.id, messageID: input.messageID });
+    const restore = new Map;
+    if (original) {
+      for (const file of input.session.revert?.files ?? [])
+        restore.set(RelativePath.make(file.file), original);
+    }
+    if (input.files !== false)
+      for (const [file, tree] of next)
+        restore.set(file, tree);
+    if (restore.size)
+      yield* snapshot.restore({ files: restore });
+    const paths = input.files === false ? [] : Array.from(next.keys());
+    const files = original ? yield* snapshot.diff({ from: original, to: (yield* snapshot.capture()) ?? original, paths }) : [];
+    const revert = {
+      messageID: input.messageID,
+      snapshot: original,
+      files
+    };
+    yield* bus.publish(SessionEvent.RevertEvent.Staged, {
+      sessionID: input.session.id,
+      revert
+    });
+    return revert;
+  });
+  const clear = Effect.fn("SessionRevert.clear")(function* (session) {
+    yield* plugins.flush;
+    if (!session.revert)
+      return;
+    const original = session.revert.snapshot ? exports_snapshot.ID.make(session.revert.snapshot) : undefined;
+    if (original)
+      yield* snapshot.restore({
+        files: new Map((session.revert.files ?? []).map((file) => [RelativePath.make(file.file), original]))
+      });
+    yield* bus.publish(SessionEvent.RevertEvent.Cleared, {
+      sessionID: session.id
+    });
+  });
+  return { stage, clear };
+});
+var layer = Layer.effect(Service, make());
+var commit = Effect.fn("SessionRevert.commit")(function* (bus, session) {
+  if (!session.revert)
+    return;
+  yield* bus.publish(SessionEvent.RevertEvent.Committed, {
+    sessionID: session.id,
+    to: session.revert.messageID
+  });
+});
+var plan = Effect.fn("SessionRevert.plan")(function* (db, input) {
+  const boundary = yield* db.select({ seq: SessionMessageTable.seq }).from(SessionMessageTable).where(and(eq(SessionMessageTable.session_id, input.sessionID), eq(SessionMessageTable.id, input.messageID))).get().pipe(Effect.orDie);
+  if (!boundary)
+    return yield* new MessageNotFoundError(input);
+  const rows = yield* db.select().from(SessionMessageTable).where(and(eq(SessionMessageTable.session_id, input.sessionID), eq(SessionMessageTable.type, "assistant"), gt(SessionMessageTable.seq, boundary.seq))).orderBy(asc(SessionMessageTable.seq)).all().pipe(Effect.orDie);
+  const decode = Schema.decodeUnknownEffect(SessionMessage.Info);
+  const files = new Map;
+  for (const row of rows) {
+    const message = yield* decode({ ...row.data, id: row.id, type: row.type }).pipe(Effect.orDie);
+    if (message.type !== "assistant" || !message.snapshot?.start)
+      continue;
+    for (const file of message.snapshot.files ?? [])
+      if (!files.has(file))
+        files.set(file, exports_snapshot.ID.make(message.snapshot.start));
+  }
+  return files;
+});
+
+export { Service, make, layer, commit, exports_revert };

package/dist/chunks/{persistent-pty-b7tctcvf.js → state-grxebm7t.js}

@@ -1,12 +1,12 @@
 import {
   foldSettings
-} from "./persistent-pty-ym92bbkh.js";
+} from "./state-zqpaf5g0.js";
 import {
   exports_config
-} from "./persistent-pty-a25nnbkb.js";
+} from "./state-rrqrf7hs.js";
 import {
   exports_model
-} from "./persistent-pty-r13w8t0w.js";
+} from "./state-r13w8t0w.js";
 
 // src/plugin/provider/ollama.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";

package/dist/chunks/{persistent-pty-kxet89mv.js → state-gysjbt8f.js}

@@ -3,15 +3,15 @@ import {
   EffectSQLiteDatabase,
   make,
   makeWithDefaults
-} from "./persistent-pty-xkdg511d.js";
+} from "./state-74v4zq76.js";
 import {
   EffectSQLiteSession,
   EffectSQLiteTransaction,
   managesTransactionsNatively
-} from "./persistent-pty-g2tg9rrx.js";
+} from "./state-af29esbf.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/database/drizzle/index.ts
 var exports_drizzle = {};

package/dist/chunks/{persistent-pty-h12kt9pa.js → state-h12kt9pa.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./persistent-pty-krsqcmnj.js";
+} from "./state-krsqcmnj.js";
 import {
   __require
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/plugin/provider/anthropic.ts
 import { Effect } from "effect";

package/dist/chunks/{persistent-pty-4s2xwh5d.js → state-h5wnyjzw.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./persistent-pty-v9bfv94f.js";
+} from "./state-v9bfv94f.js";
 import {
   PositiveInt
-} from "./persistent-pty-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/v1/config/agent.ts
 var exports_agent = {};
@@ -46,24 +46,7 @@ var AgentSchema = Schema.StructWithRest(Schema.Struct({
   maxSteps: Schema.optional(PositiveInt).annotate({ description: "@deprecated Use 'steps' field instead." }),
   permission: Schema.optional(exports_permission.Info)
 }), [Schema.Record(Schema.String, Schema.Any)]);
-var KNOWN_KEYS = new Set([
-  "name",
-  "model",
-  "variant",
-  "prompt",
-  "description",
-  "temperature",
-  "top_p",
-  "mode",
-  "hidden",
-  "color",
-  "steps",
-  "maxSteps",
-  "options",
-  "permission",
-  "disable",
-  "tools"
-]);
+var KNOWN_KEYS = new Set(["name", ...Object.keys(AgentSchema.schema.fields)]);
 var normalize = (agent) => {
   const options = { ...agent.options };
   for (const [key, value] of Object.entries(agent)) {

package/dist/chunks/{persistent-pty-0tya1wfq.js → state-h8499ys5.js}

@@ -1,12 +1,12 @@
 import {
   exports_environment1 as exports_environment
-} from "./persistent-pty-q22ck3r9.js";
+} from "./state-546qm8gr.js";
 import {
   exports_keyed_mutex
-} from "./persistent-pty-0kvmztkf.js";
+} from "./state-0kvmztkf.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/file-mutation.ts
 var exports_file_mutation = {};

package/dist/chunks/{persistent-pty-h94zdhz8.js → state-h94zdhz8.js}

@@ -1,9 +1,9 @@
 import {
   AbsolutePath
-} from "./persistent-pty-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/project/schema.ts
 var exports_schema = {};

package/dist/chunks/{persistent-pty-tcptxgyq.js → state-hgr9y616.js}

@@ -2,7 +2,7 @@ import {
   getTableColumnsRuntime,
   mapUpdateSet,
   orderSelectedFields
-} from "./persistent-pty-k8b45nas.js";
+} from "./state-k8b45nas.js";
 
 // src/database/drizzle/sqlite-core/effect/insert.ts
 import { applyEffectWrapper } from "drizzle-orm/effect-core/query-effect";
@@ -40,13 +40,11 @@ class SQLiteEffectInsertBuilder {
 }
 
 class SQLiteEffectInsertBase {
-  table;
   effectSession;
   effectDialect;
   static [entityKind] = "SQLiteEffectInsert";
   config;
   constructor(table, values, effectSession, effectDialect, withList, select) {
-    this.table = table;
     this.effectSession = effectSession;
     this.effectDialect = effectDialect;
     this.config = { table, values, withList, select };

package/dist/chunks/{persistent-pty-t4x64zgs.js → state-hjcbr714.js}

@@ -1,3 +1,6 @@
+import {
+  DiffError
+} from "./state-fd8j0005.js";
 import {
   MAX_PATCH_BYTES,
   MAX_TOTAL_PATCH_BYTES,
@@ -7,13 +10,13 @@ import {
   countPatch,
   deletePatch,
   emptyPatch
-} from "./persistent-pty-vz89hfgr.js";
+} from "./state-vz89hfgr.js";
 import {
   exports_location
-} from "./persistent-pty-d88p9jy9.js";
+} from "./state-qph0wk53.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/plugin/vcs/hg.ts
 var exports_hg = {};
@@ -47,7 +50,7 @@ var Plugin = define({
         info: () => adapter.info(),
         branches: (input) => adapter.branches({ search: input.search, limit: input.limit }),
         status: () => adapter.status(),
-        diff: (input) => adapter.diff(input.mode, { context: input.context })
+        diff: (input) => adapter.diff(input.mode, { context: input.context, base: input.base })
       });
     });
   })
@@ -111,6 +114,11 @@ function make(proc, fs, input) {
     diff: Effect.fn("VcsHg.diff")(function* (mode, options) {
       if (mode === "working")
         return yield* diffAgainst(undefined, options);
+      if (mode === "committed" || options?.base !== undefined) {
+        return yield* new DiffError({
+          message: "The Mercurial provider does not support committed reviews or explicit bases"
+        });
+      }
       const branch = yield* hg.branch();
       if (!branch || branch === "default")
         return [];

package/dist/chunks/{persistent-pty-hp6rpdnc.js → state-hp6rpdnc.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/file-retention.ts
 var exports_file_retention = {};

package/dist/chunks/{persistent-pty-ext14ctb.js → state-hptxbmcw.js}

@@ -1,70 +1,70 @@
+import {
+  MAX_STEPS_PROMPT
+} from "./state-qaarhjrp.js";
 import {
   exports_step
-} from "./persistent-pty-n8twstac.js";
+} from "./state-dx3ash2a.js";
 import {
   exports_retry
-} from "./persistent-pty-tqf07m3e.js";
+} from "./state-2pd1mgzx.js";
 import {
   exports_title
-} from "./persistent-pty-xqzpjgmh.js";
-import {
-  MAX_STEPS_PROMPT
-} from "./persistent-pty-qaarhjrp.js";
+} from "./state-8ee4ayyt.js";
 import {
   exports_context
-} from "./persistent-pty-z6p4m7fm.js";
+} from "./state-8qrx9cj0.js";
 import {
   exports_model_request
-} from "./persistent-pty-mdbd9v7n.js";
+} from "./state-a9rzcc94.js";
 import {
   exports_supervisor
-} from "./persistent-pty-dmnn2ttb.js";
+} from "./state-9cb4yhpj.js";
 import {
   exports_compaction
-} from "./persistent-pty-3mn74f4q.js";
+} from "./state-efb59s13.js";
 import {
   DrainResult,
   Service
-} from "./persistent-pty-2m0hgr65.js";
+} from "./state-2m0hgr65.js";
 import {
   exports_inbox
-} from "./persistent-pty-ayrkq19e.js";
+} from "./state-pbrq9pmc.js";
 import {
   exports_model_transport
-} from "./persistent-pty-tjrfm0xh.js";
+} from "./state-tjrfm0xh.js";
 import {
   llmClient
-} from "./persistent-pty-393a352g.js";
+} from "./state-393a352g.js";
 import {
   exports_snapshot
-} from "./persistent-pty-w6dbrh59.js";
+} from "./state-mhk3rrcb.js";
 import {
-  exports_store
-} from "./persistent-pty-bk1nj3vy.js";
+  exports_tool_output
+} from "./state-7ccgh94t.js";
 import {
-  exports_instruction_state
-} from "./persistent-pty-0687t5rp.js";
+  exports_store
+} from "./state-tfd8n8cn.js";
 import {
   StepFailedError
-} from "./persistent-pty-fb7nfzf2.js";
+} from "./state-cgqn2mrm.js";
+import {
+  exports_instruction_state
+} from "./state-hxcd35r2.js";
 import {
   SessionMessage
-} from "./persistent-pty-8rpfd2h6.js";
+} from "./state-8rpfd2h6.js";
 import {
   SessionEvent
-} from "./persistent-pty-a83yvq99.js";
-import {
-  exports_tool_output
-} from "./persistent-pty-f7q7a28y.js";
+} from "./state-a83yvq99.js";
 import {
   exports_bus
-} from "./persistent-pty-8dqs26x1.js";
+} from "./state-cgy4zpa6.js";
 import {
   exports_database
-} from "./persistent-pty-agy32ytt.js";
+} from "./state-vpac0x8g.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/session/runner/llm.ts
 var exports_llm = {};
@@ -73,7 +73,7 @@ __export(exports_llm, {
   SessionRunnerLLM: () => exports_llm
 });
 import { Message } from "@opencode-ai/ai";
-import { Cause, Effect, Exit, FiberMap, Layer, Pull, Schedule } from "effect";
+import { Cause, Effect, Exit, FiberMap, Layer } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 var CONTINUE_AFTER_INCOMPLETE_STREAM = "The previous response was interrupted. Continue from where you left off without repeating completed content.";
 var layer = Layer.effect(Service, Effect.gen(function* () {
@@ -188,7 +188,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const runStep = Effect.fn("SessionRunner.runStep")(function* (first, step) {
     const sessionID = first.session.id;
     let assistantMessageID = SessionMessage.ID.create();
-    const retry = yield* Schedule.toStepWithSleep(exports_retry.schedule(bus, sessionID));
+    const retry = yield* exports_retry.make(bus, sessionID);
     let initial = first;
     let recoverOverflow = true;
     let recoverContinuation = true;
@@ -231,14 +231,30 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         agent: loaded.agent.id,
         model: loaded.model,
         prepared,
+        retry: (cause, error, proposed) => retry.decide({
+          cause,
+          error,
+          agent: loaded.agent.id,
+          model: loaded.model.ref,
+          hook: prepared.retry,
+          retry: proposed
+        }),
         recoverContinuation,
         recoverOverflow: Effect.suspend(() => recoverOverflow && compaction.enabled() ? compaction.compact(compactionInput).pipe(Effect.map((result) => result.status === "completed")) : Effect.succeed(false))
       });
       const completed = yield* exports_step.Outcome.$match(outcome, {
         Completed: (outcome2) => Effect.succeed(outcome2.needsContinuation),
-        Retry: (outcome2) => retry({ cause: outcome2.cause, error: outcome2.error, assistantMessageID }).pipe(Pull.catchDone(() => bus.publish(SessionEvent.Step.Failed, { sessionID, assistantMessageID, error: outcome2.error }).pipe(Effect.andThen(outcome2.cause))), Effect.asVoid),
+        Retry: (outcome2) => retry.wait({
+          decision: outcome2.decision,
+          error: outcome2.error,
+          assistantMessageID
+        }),
         Continue: Effect.fnUntraced(function* (outcome2) {
-          yield* retry({ cause: outcome2.cause, error: outcome2.error, assistantMessageID }).pipe(Pull.catchDone(() => outcome2.cause));
+          yield* retry.wait({
+            decision: outcome2.decision,
+            error: outcome2.error,
+            assistantMessageID
+          });
           yield* bus.publish(SessionEvent.Synthetic, { sessionID, text: CONTINUE_AFTER_INCOMPLETE_STREAM });
           assistantMessageID = SessionMessage.ID.create();
         }),

package/dist/chunks/{persistent-pty-0687t5rp.js → state-hxcd35r2.js}

@@ -1,16 +1,16 @@
 import {
   InstructionBlobTable,
   InstructionStateTable
-} from "./persistent-pty-q606pcse.js";
-import {
-  SessionEvent
-} from "./persistent-pty-a83yvq99.js";
+} from "./state-q606pcse.js";
 import {
   exports_instructions
-} from "./persistent-pty-ec8vrfw5.js";
+} from "./state-ec8vrfw5.js";
+import {
+  SessionEvent
+} from "./state-a83yvq99.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/session/instruction-state.ts
 var exports_instruction_state = {};

package/dist/chunks/{persistent-pty-zxcy6vhn.js → state-j0feex7e.js}

@@ -4,7 +4,7 @@ import {
   getViewSelectedFieldsRuntime,
   mapUpdateSet,
   orderSelectedFields
-} from "./persistent-pty-k8b45nas.js";
+} from "./state-k8b45nas.js";
 
 // src/database/drizzle/sqlite-core/effect/update.ts
 import { applyEffectWrapper } from "drizzle-orm/effect-core/query-effect";
@@ -53,7 +53,7 @@ class SQLiteEffectUpdateBase {
       }
       if (typeof on === "function") {
         const from = this.config.from ? is(table, SQLiteTable) ? getTableColumnsRuntime(table) : is(table, Subquery) ? table._.selectedFields : is(table, SQLiteViewBase) ? getViewSelectedFieldsRuntime(table).selectedFields : undefined : undefined;
-        on = on(new Proxy(this.config.table._.columns, new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })), from && new Proxy(from, new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })));
+        on = on(new Proxy(getTableColumnsRuntime(this.config.table), new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })), from && new Proxy(from, new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })));
       }
       this.config.joins.push({ on, table, joinType, alias: tableName });
       return this;

package/dist/chunks/{persistent-pty-krzvywyt.js → state-j0sncrp4.js}

@@ -1,12 +1,12 @@
-import {
-  exports_provider
-} from "./persistent-pty-krsqcmnj.js";
 import {
   exports_app
-} from "./persistent-pty-50jxp3hw.js";
+} from "./state-50jxp3hw.js";
+import {
+  exports_provider
+} from "./state-krsqcmnj.js";
 import {
   __require
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/plugin/provider/gitlab.ts
 import os from "os";

package/dist/chunks/{persistent-pty-t0msbthe.js → state-j281xcgt.js}

@@ -1,13 +1,13 @@
 import {
   DirectoryUnavailableError,
   canonical
-} from "./persistent-pty-mnb85w6b.js";
+} from "./state-mnb85w6b.js";
 import {
   exports_git
-} from "./persistent-pty-kt491qp2.js";
+} from "./state-dyj7wa6j.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/worktree/git.ts
 var exports_git2 = {};

package/dist/chunks/{persistent-pty-7hq60rpc.js → state-j29rhpt4.js}

@@ -1,26 +1,26 @@
+import {
+  exports_catalog
+} from "./state-330v609d.js";
 import {
   exports_aisdk
-} from "./persistent-pty-mankezgy.js";
+} from "./state-zygzxh1b.js";
 import {
   exports_aisdk_native
-} from "./persistent-pty-zs1qer6v.js";
+} from "./state-zs1qer6v.js";
 import {
-  exports_catalog
-} from "./persistent-pty-fbnkj2ks.js";
+  exports_integration
+} from "./state-kse1g3vm.js";
 import {
   ID,
   Ref,
   VariantID
-} from "./persistent-pty-r13w8t0w.js";
-import {
-  exports_integration
-} from "./persistent-pty-tayw3q5q.js";
+} from "./state-r13w8t0w.js";
 import {
   exports_provider
-} from "./persistent-pty-krsqcmnj.js";
+} from "./state-krsqcmnj.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/model-resolver.ts
 var exports_model_resolver = {};

package/dist/chunks/{persistent-pty-eeta29b7.js → state-k828h0dz.js}

@@ -1,15 +1,15 @@
 import {
   exports_repository
-} from "./persistent-pty-y198y2ra.js";
+} from "./state-y198y2ra.js";
 import {
   exports_git
-} from "./persistent-pty-kt491qp2.js";
+} from "./state-dyj7wa6j.js";
 import {
   AbsolutePath
-} from "./persistent-pty-j07kk359.js";
+} from "./state-j07kk359.js";
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/repository-cache.ts
 var exports_repository_cache = {};

package/dist/chunks/{persistent-pty-kg1345f7.js → state-kg1345f7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/filesystem/protected.ts
 var exports_protected = {};

package/dist/chunks/{persistent-pty-kp1t5rcy.js → state-kp1t5rcy.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/config/plugin/entry-observer.ts
 var exports_entry_observer = {};

package/dist/chunks/{persistent-pty-krsqcmnj.js → state-krsqcmnj.js}

@@ -1,7 +1,7 @@
 import {
   __export,
   __require
-} from "./persistent-pty-rvfvac9x.js";
+} from "./state-rvfvac9x.js";
 
 // src/provider.ts
 var exports_provider = {};