chainlesschain 0.45.11 → 0.45.19

package/src/lib/ws-session-manager.js

@@ -20,6 +20,8 @@ import {
 } from "./session-manager.js";
 import { buildSystemPrompt } from "./agent-core.js";
 import { SubAgentRegistry } from "./sub-agent-registry.js";
+import { createWorktree, removeWorktree } from "./worktree-isolator.js";
+import { isGitRepo } from "./git-integration.js";
 
 /**
  * @typedef {object} Session
@@ -32,7 +34,11 @@ import { SubAgentRegistry } from "./sub-agent-registry.js";
  * @property {string|null} apiKey
  * @property {string|null} baseUrl
  * @property {string} projectRoot
+ * @property {string} baseProjectRoot
  * @property {string|null} rulesContent
+ * @property {object|null} hostManagedToolPolicy
+ * @property {boolean} worktreeIsolation
+ * @property {object|null} worktree
  * @property {PlanModeManager} planManager
  * @property {CLIContextEngineering|null} contextEngine
  * @property {CLIPermanentMemory|null} permanentMemory
@@ -78,12 +84,13 @@ export class WSSessionManager {
    * @param {string} [options.model]
    * @param {string} [options.apiKey]
    * @param {string} [options.baseUrl]
+   * @param {object} [options.hostManagedToolPolicy]
    * @returns {{ sessionId: string }}
    */
   createSession(options = {}) {
     const sessionId = this._generateId();
     const type = options.type || "agent";
-    const projectRoot = options.projectRoot || this.defaultProjectRoot;
+    const baseProjectRoot = options.projectRoot || this.defaultProjectRoot;
     const cfgLlm = this.config?.llm || {};
     const provider = options.provider || cfgLlm.provider || "ollama";
     const model =
@@ -93,6 +100,16 @@ export class WSSessionManager {
     const baseUrl =
       options.baseUrl || cfgLlm.baseUrl || "http://localhost:11434";
     const apiKey = options.apiKey || cfgLlm.apiKey || null;
+    const worktreeIsolationRequested = options.worktreeIsolation === true;
+    const isolatedWorkspace = this._prepareSessionWorkspace(
+      baseProjectRoot,
+      sessionId,
+      {
+        worktreeIsolation: worktreeIsolationRequested,
+      },
+    );
+    const projectRoot = isolatedWorkspace.projectRoot;
+    const worktree = isolatedWorkspace.worktree;
 
     // Project context (rules.md, persona) is now loaded by buildSystemPrompt()
 
@@ -151,8 +168,12 @@ export class WSSessionManager {
       model,
       apiKey,
       baseUrl,
+      hostManagedToolPolicy: options.hostManagedToolPolicy || null,
       projectRoot,
+      baseProjectRoot,
       rulesContent: null,
+      worktreeIsolation: worktreeIsolationRequested,
+      worktree,
       planManager,
       contextEngine,
       permanentMemory,
@@ -226,8 +247,12 @@ export class WSSessionManager {
         model: dbSession.model || null,
         apiKey: null,
         baseUrl: "http://localhost:11434",
+        hostManagedToolPolicy: null,
         projectRoot: this.defaultProjectRoot,
+        baseProjectRoot: this.defaultProjectRoot,
         rulesContent: null,
+        worktreeIsolation: false,
+        worktree: null,
         planManager,
         contextEngine,
         permanentMemory,
@@ -284,6 +309,16 @@ export class WSSessionManager {
       session.planManager.removeAllListeners();
     }
 
+    if (session.worktree?.path && session.baseProjectRoot) {
+      try {
+        removeWorktree(session.baseProjectRoot, session.worktree.path, {
+          deleteBranch: true,
+        });
+      } catch (_err) {
+        // Best-effort cleanup.
+      }
+    }
+
     this.sessions.delete(sessionId);
   }
 
@@ -304,6 +339,9 @@ export class WSSessionManager {
         provider: session.provider,
         model: session.model,
         messageCount: session.messages.length,
+        baseProjectRoot: session.baseProjectRoot,
+        worktreeIsolation: session.worktreeIsolation === true,
+        worktree: session.worktree || null,
         createdAt: session.createdAt,
         lastActivity: session.lastActivity,
       });
@@ -346,6 +384,22 @@ export class WSSessionManager {
     return this.sessions.get(sessionId) || null;
   }
 
+  /**
+   * Update host-managed tool policy for an active session.
+   *
+   * @param {string} sessionId
+   * @param {object|null} hostManagedToolPolicy
+   * @returns {Session|null}
+   */
+  updateSessionPolicy(sessionId, hostManagedToolPolicy) {
+    const session = this.sessions.get(sessionId);
+    if (!session) return null;
+
+    session.hostManagedToolPolicy = hostManagedToolPolicy || null;
+    session.lastActivity = new Date().toISOString();
+    return session;
+  }
+
   /**
    * Persist current messages for a session.
    */
@@ -361,4 +415,31 @@ export class WSSessionManager {
 
     session.lastActivity = new Date().toISOString();
   }
+
+  _prepareSessionWorkspace(projectRoot, sessionId, options = {}) {
+    if (options.worktreeIsolation !== true) {
+      return {
+        projectRoot,
+        worktree: null,
+      };
+    }
+
+    if (!isGitRepo(projectRoot)) {
+      throw new Error(
+        `Worktree isolation requires a git repository: ${projectRoot}`,
+      );
+    }
+
+    const branchName = `coding-agent/${sessionId}`;
+    const worktree = createWorktree(projectRoot, branchName);
+
+    return {
+      projectRoot: worktree.path,
+      worktree: {
+        branch: worktree.branch,
+        path: worktree.path,
+        baseProjectRoot: projectRoot,
+      },
+    };
+  }
 }

package/src/repl/agent-repl.js

@@ -29,6 +29,14 @@ import {
   saveMessages,
   getSession,
 } from "../lib/session-manager.js";
+import {
+  startSession as jsonlStartSession,
+  appendUserMessage,
+  appendAssistantMessage,
+  appendCompactEvent,
+  rebuildMessages,
+  sessionExists,
+} from "../lib/jsonl-session-store.js";
 import { storeMemory, consolidateMemory } from "../lib/hierarchical-memory.js";
 import { CLIContextEngineering } from "../lib/cli-context-engineering.js";
 import { createChatFn } from "../lib/cowork-adapter.js";
@@ -40,6 +48,7 @@ import { CLIPermanentMemory } from "../lib/permanent-memory.js";
 import { CLIAutonomousAgent, GoalStatus } from "../lib/autonomous-agent.js";
 import { PromptCompressor } from "../lib/prompt-compressor.js";
 import { feature } from "../lib/feature-flags.js";
+import { recordCompressionMetric } from "../lib/compression-telemetry.js";
 import {
   AGENT_TOOLS,
   buildSystemPrompt,
@@ -108,9 +117,9 @@ export async function startAgentRepl(options = {}) {
     // Continue without DB — static prompt fallback
   }
 
-  // Initialize prompt compressor
+  // Initialize prompt compressor (adaptive to model's context window)
   if (feature("PROMPT_COMPRESSOR")) {
-    _compressor = new PromptCompressor({ maxMessages: 20, maxTokens: 8000 });
+    _compressor = new PromptCompressor({ model, provider });
   }
 
   // Initialize permanent memory
@@ -133,7 +142,18 @@ export async function startAgentRepl(options = {}) {
   _hookDb = db;
 
   // Resume existing session or create new one
-  if (db && options.sessionId) {
+  const useJsonl = feature("JSONL_SESSION");
+
+  if (useJsonl && options.sessionId) {
+    // JSONL resume: check if session file exists
+    try {
+      if (sessionExists(options.sessionId)) {
+        sessionId = options.sessionId;
+      }
+    } catch (_err) {
+      // Non-critical
+    }
+  } else if (db && options.sessionId) {
     try {
       const existing = getSession(db, options.sessionId);
       if (existing && existing.messages) {
@@ -144,16 +164,25 @@ export async function startAgentRepl(options = {}) {
     }
   }
 
-  if (db && !sessionId) {
-    try {
-      const session = createSession(db, {
-        title: `Agent ${new Date().toISOString().slice(0, 10)}`,
-        provider,
-        model,
-      });
-      sessionId = session.id;
-    } catch (_err) {
-      // Non-critical
+  if (!sessionId) {
+    const meta = {
+      title: `Agent ${new Date().toISOString().slice(0, 10)}`,
+      provider,
+      model,
+    };
+    if (useJsonl) {
+      try {
+        sessionId = jsonlStartSession(null, meta);
+      } catch (_err) {
+        // Non-critical
+      }
+    } else if (db) {
+      try {
+        const session = createSession(db, meta);
+        sessionId = session.id;
+      } catch (_err) {
+        // Non-critical
+      }
     }
   }
 
@@ -162,16 +191,28 @@ export async function startAgentRepl(options = {}) {
   ];
 
   // Load resumed session messages
-  if (db && options.sessionId && sessionId) {
+  if (options.sessionId && sessionId) {
     try {
-      const existing = getSession(db, sessionId);
-      if (existing && existing.messages) {
-        const parsed =
-          typeof existing.messages === "string"
-            ? JSON.parse(existing.messages)
-            : existing.messages;
-        messages.push(...parsed.filter((m) => m.role !== "system"));
-        logger.info(`Resumed session ${sessionId} (${parsed.length} messages)`);
+      if (useJsonl) {
+        const rebuilt = rebuildMessages(sessionId);
+        if (rebuilt.length > 0) {
+          messages.push(...rebuilt.filter((m) => m.role !== "system"));
+          logger.info(
+            `Resumed JSONL session ${sessionId} (${rebuilt.length} messages)`,
+          );
+        }
+      } else if (db) {
+        const existing = getSession(db, sessionId);
+        if (existing && existing.messages) {
+          const parsed =
+            typeof existing.messages === "string"
+              ? JSON.parse(existing.messages)
+              : existing.messages;
+          messages.push(...parsed.filter((m) => m.role !== "system"));
+          logger.info(
+            `Resumed session ${sessionId} (${parsed.length} messages)`,
+          );
+        }
       }
     } catch (_err) {
       // Non-critical
@@ -386,6 +427,11 @@ export async function startAgentRepl(options = {}) {
           await _compressor.compress(messages);
         messages.length = 0;
         messages.push(...compacted);
+        recordCompressionMetric(stats, {
+          source: "manual-compact",
+          provider,
+          model,
+        });
         logger.info(
           `Compacted: ${stats.originalMessages} → ${stats.compressedMessages} messages, saved ${stats.saved} tokens (${stats.strategy})`,
         );
@@ -434,10 +480,16 @@ export async function startAgentRepl(options = {}) {
       const sessionArg = trimmed.slice(8).trim();
       if (sessionArg.startsWith("resume ")) {
         const resumeId = sessionArg.slice(7).trim();
-        if (!db) {
-          logger.info("No database available for session resume");
-        } else {
-          try {
+        try {
+          if (useJsonl && sessionExists(resumeId)) {
+            const rebuilt = rebuildMessages(resumeId);
+            messages.length = 1; // keep system prompt
+            messages.push(...rebuilt.filter((m) => m.role !== "system"));
+            sessionId = resumeId;
+            logger.info(
+              `Resumed JSONL session ${sessionId} (${rebuilt.length} messages)`,
+            );
+          } else if (db) {
             const existing = getSession(db, resumeId);
             if (existing && existing.messages) {
               const parsed =
@@ -453,9 +505,11 @@ export async function startAgentRepl(options = {}) {
             } else {
               logger.info(`Session not found: ${resumeId}`);
             }
-          } catch (err) {
-            logger.error(`Resume failed: ${err.message}`);
+          } else {
+            logger.info("No session store available");
           }
+        } catch (err) {
+          logger.error(`Resume failed: ${err.message}`);
         }
       } else {
         logger.info(`Session ID: ${sessionId || "none"}`);
@@ -1052,9 +1106,17 @@ export async function startAgentRepl(options = {}) {
       }
 
       // Auto-save session
-      if (db && sessionId) {
+      if (sessionId) {
         try {
-          saveMessages(db, sessionId, messages);
+          if (useJsonl) {
+            // Append incremental events (user + assistant)
+            appendUserMessage(sessionId, trimmed);
+            if (response) {
+              appendAssistantMessage(sessionId, response);
+            }
+          } else if (db) {
+            saveMessages(db, sessionId, messages);
+          }
         } catch (_e) {
           // Non-critical
         }
@@ -1070,10 +1132,22 @@ export async function startAgentRepl(options = {}) {
             await _compressor.compress(messages);
           messages.length = 0;
           messages.push(...compacted);
+          recordCompressionMetric(stats, {
+            source: "auto-compact",
+            provider,
+            model: activeModel,
+          });
           if (stats.saved > 0) {
             logger.verbose(
               `Auto-compacted: ${stats.strategy} (saved ${stats.saved} tokens)`,
             );
+            // Write compact checkpoint to JSONL for crash recovery
+            if (useJsonl && sessionId) {
+              appendCompactEvent(sessionId, {
+                ...stats,
+                messages: compacted,
+              });
+            }
           }
         } catch (_e) {
           // Non-critical — continue with uncompacted messages
@@ -1116,9 +1190,17 @@ export async function startAgentRepl(options = {}) {
 
   rl.on("close", async () => {
     // Save session on exit
-    if (db && sessionId) {
+    if (sessionId) {
       try {
-        saveMessages(db, sessionId, messages);
+        if (useJsonl) {
+          // JSONL: write final compact snapshot for fast rebuild
+          appendCompactEvent(sessionId, {
+            strategy: "session-end",
+            messages,
+          });
+        } else if (db) {
+          saveMessages(db, sessionId, messages);
+        }
       } catch (_e) {
         // Non-critical
       }