From b1db6bb5328a4e411e9d81e6f1f9c5083077be02 Mon Sep 17 00:00:00 2001
From: Josh Lambert <josh@kilocode.ai>
Date: Mon, 8 Jun 2026 10:56:54 -0400
Subject: [PATCH 1/2] Revert "Merge pull request #10924 from
 Kilo-Org/fix/temporarily-disable-session-export"

This reverts commit e2e070da2f64aeb57e27e5aee782ca46b26dc372, reversing
changes made to e02efb5ce677161d681f6eda3c154c0744a54475.
---
 packages/opencode/src/kilocode/bootstrap.ts                  | 1 -
 .../opencode/src/kilocode/session-export/session-export.ts   | 2 --
 packages/opencode/src/session/llm.ts                         | 5 ++---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/kilocode/bootstrap.ts b/packages/opencode/src/kilocode/bootstrap.ts
index 2eda96077a0..4a72bbf9030 100644
--- a/packages/opencode/src/kilocode/bootstrap.ts
+++ b/packages/opencode/src/kilocode/bootstrap.ts
@@ -29,7 +29,6 @@ export namespace KilocodeBootstrap {
         yield* sessions.init()
         // kilocode_change start - session export bootstrap
         yield* Effect.gen(function* () {
-          if (!SessionExport.enabled) return
           const anon = yield* EffectBridge.fromPromise(() =>
             Identity.getMachineId().catch((err) => {
               log.warn("session export identity failed", { err })
diff --git a/packages/opencode/src/kilocode/session-export/session-export.ts b/packages/opencode/src/kilocode/session-export/session-export.ts
index 0050e5fd323..1226634b49d 100644
--- a/packages/opencode/src/kilocode/session-export/session-export.ts
+++ b/packages/opencode/src/kilocode/session-export/session-export.ts
@@ -32,8 +32,6 @@ const instances = new Map<string, Instance>()
 
 const maxRespawns = 3
 
-export const enabled = false
-
 export const init = (opts: {
   agentVersion: string
   dbPath: string
diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.ts
index d06813f763f..38103437398 100644
--- a/packages/opencode/src/session/llm.ts
+++ b/packages/opencode/src/session/llm.ts
@@ -392,8 +392,7 @@ const live: Layer.Layer<
       const opencodeProjectID = input.model.providerID.startsWith("opencode") ? instance.project.id : undefined
 
       // kilocode_change start - capture eligible session export request start
-      const exporting = SessionExport.enabled
-      const org = yield* exporting && isKilo && input.model.isFree === true
+      const org = yield* isKilo && input.model.isFree === true
         ? Effect.promise(() => getActiveOrg())
         : Effect.succeed({ type: "unknown" as const })
       const started = Date.now()
@@ -401,7 +400,7 @@ const live: Layer.Layer<
       const found = KiloSession.resolveRoot(input.sessionID)
       const root = parent ? (found === input.sessionID ? parent : found) : input.sessionID
       const exportable =
-        exporting && isKilo && input.model.isFree === true && org.type === "personal" && input.agent.name !== "title"
+        isKilo && input.model.isFree === true && org.type === "personal" && input.agent.name !== "title"
       if (exportable) {
         SessionExport.beforeRequest({
           input: { model: input.model, org },

From 9f072b05d49554648adbaca251a1ec5800b7b0fc Mon Sep 17 00:00:00 2001
From: Josh Lambert <josh@kilocode.ai>
Date: Mon, 8 Jun 2026 10:57:41 -0400
Subject: [PATCH 2/2] chore(cli): add session export changeset

---
 .changeset/restore-session-export.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/restore-session-export.md

diff --git a/.changeset/restore-session-export.md b/.changeset/restore-session-export.md
new file mode 100644
index 00000000000..eea6ce17a8b
--- /dev/null
+++ b/.changeset/restore-session-export.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Re-enable free-model session and Git workspace data export.