cliskill 1.0.9 → 1.1.1

package/dist/bootstrap/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-MM3EHZQQ.js";
+} from "../chunk-PRO7DR3G.js";
 import "../chunk-AJENHWD3.js";
 export {
   runCli

package/dist/{chunk-MM3EHZQQ.js → chunk-PRO7DR3G.js}

@@ -5540,6 +5540,32 @@ var EnhancedMemoryStore = class {
     }
     return result;
   }
+  /**
+   * Get a formatted summary of all memories for injection into system prompt.
+   * Returns empty string if no memories stored.
+   */
+  getSummary() {
+    if (this.entries.size === 0) return "";
+    const sections = [];
+    for (const [topic, entries] of this.entries) {
+      const latest = entries[entries.length - 1];
+      if (!latest) continue;
+      const age = Date.now() - latest.timestamp;
+      const ageDays = Math.floor(age / (1e3 * 60 * 60 * 24));
+      const ageStr = ageDays === 0 ? "today" : ageDays === 1 ? "yesterday" : `${ageDays}d ago`;
+      sections.push(`- **${topic}**: ${latest.content} (${ageStr})`);
+    }
+    if (sections.length === 0) return "";
+    return [
+      "<global-memory>",
+      "The following memories were saved in previous sessions and persist across conversations:",
+      "",
+      ...sections,
+      "",
+      "Use the memory tool to save new facts or search/recall existing memories.",
+      "</global-memory>"
+    ].join("\n");
+  }
   async persist(topic) {
     const entries = this.entries.get(topic);
     if (!entries || entries.length === 0) {
@@ -5555,6 +5581,25 @@ var EnhancedMemoryStore = class {
   }
 };
 
+// src/memory/global-memory.ts
+var cachedSummary = null;
+async function loadGlobalMemorySummary() {
+  if (cachedSummary !== null) return cachedSummary;
+  try {
+    const dir = getGlobalMemoryDir();
+    const store = new EnhancedMemoryStore(dir);
+    await store.init();
+    cachedSummary = store.getSummary();
+    return cachedSummary;
+  } catch {
+    cachedSummary = "";
+    return "";
+  }
+}
+function invalidateGlobalMemoryCache() {
+  cachedSummary = null;
+}
+
 // src/tools/builtins/memory-tool.ts
 var memoryInputSchema = z19.object({
   action: z19.enum(["save", "recall", "search", "list", "delete"]).describe(
@@ -5590,6 +5635,7 @@ var MemoryTool = class extends BaseTool {
           return "Error: topic and content are required for save action";
         }
         await store.addMemory(input.topic, input.content, input.tags ?? [], "agent");
+        invalidateGlobalMemoryCache();
         return `\u2705 Saved to "${input.topic}": ${input.content.slice(0, 100)}${input.content.length > 100 ? "..." : ""}`;
       }
       case "recall": {
@@ -5637,6 +5683,7 @@ var MemoryTool = class extends BaseTool {
           entry.entry.lastAccessed = 0;
         }
         await store.prune();
+        invalidateGlobalMemoryCache();
         return `\u{1F5D1}\uFE0F Deleted ${topicEntries.length} entries from "${input.topic}"`;
       }
       default:
@@ -6401,6 +6448,147 @@ ${m.content}`;
   ].join("\n");
 }
 
+// src/services/session-recovery.ts
+import { readFile as readFile9, readdir as readdir5 } from "fs/promises";
+import { join as join10 } from "path";
+import { existsSync as existsSync5 } from "fs";
+async function recoverSession(filePath) {
+  const raw = await readFile9(filePath, "utf-8");
+  const lines = raw.split("\n").filter((line) => line.trim().length > 0);
+  const entries = [];
+  for (const line of lines) {
+    try {
+      const entry = JSON.parse(line);
+      if (entry.type && entry.content !== void 0) {
+        entries.push(entry);
+      }
+    } catch {
+    }
+  }
+  const messages = reconstructMessages(entries);
+  const firstEntry = entries[0];
+  const timestamp = firstEntry?.timestamp ?? 0;
+  return {
+    sessionId: filePath,
+    filePath,
+    timestamp,
+    messages,
+    entryCount: entries.length
+  };
+}
+async function listSessions(limit = 20) {
+  const dir = getSessionsDir();
+  if (!existsSync5(dir)) return [];
+  const files = await readdir5(dir);
+  const sessionFiles = files.filter((f) => f.startsWith("session-") && f.endsWith(".jsonl"));
+  const sessions = [];
+  for (const fileName of sessionFiles) {
+    const filePath = join10(dir, fileName);
+    try {
+      const raw = await readFile9(filePath, "utf-8");
+      const lines = raw.split("\n").filter((line) => line.trim().length > 0);
+      let lastActivity = 0;
+      let entryCount = 0;
+      for (const line of lines) {
+        try {
+          const entry = JSON.parse(line);
+          if (entry.timestamp && entry.timestamp > lastActivity) {
+            lastActivity = entry.timestamp;
+          }
+          entryCount++;
+        } catch {
+        }
+      }
+      const dateStr = fileName.replace("session-", "").replace(".jsonl", "");
+      const fileTimestamp = Date.parse(dateStr) || lastActivity;
+      sessions.push({
+        fileName,
+        filePath,
+        timestamp: fileTimestamp,
+        entryCount,
+        lastActivity
+      });
+    } catch {
+    }
+  }
+  sessions.sort((a, b) => b.lastActivity - a.lastActivity);
+  return sessions.slice(0, limit);
+}
+async function findLatestSession() {
+  const sessions = await listSessions(1);
+  return sessions[0] ?? null;
+}
+async function getLastSessionSummary() {
+  try {
+    const latest = await findLatestSession();
+    if (!latest) return "";
+    const raw = await readFile9(latest.filePath, "utf-8");
+    const lines = raw.split("\n").filter((line) => line.trim().length > 0);
+    const userMessages = [];
+    const assistantTopics = [];
+    for (const line of lines) {
+      try {
+        const entry = JSON.parse(line);
+        if (entry.type === "user" && entry.content.trim()) {
+          userMessages.push(entry.content.trim());
+        } else if (entry.type === "assistant" && entry.content.trim()) {
+          const preview = entry.content.trim().slice(0, 120);
+          assistantTopics.push(preview);
+        }
+      } catch {
+      }
+    }
+    if (userMessages.length === 0) return "";
+    const date = new Date(latest.lastActivity).toLocaleString();
+    const lastUserMsg = userMessages[userMessages.length - 1];
+    const lastAssistant = assistantTopics.length > 0 ? assistantTopics[assistantTopics.length - 1] : "N/A";
+    return [
+      "<last-session-context>",
+      `Previous session (${date}, ${lines.length} entries):`,
+      `  Last user message: ${lastUserMsg.slice(0, 200)}`,
+      `  Last assistant response: ${lastAssistant.slice(0, 200)}`,
+      `  Total user messages in session: ${userMessages.length}`,
+      "",
+      "Use the memory tool to recall specific details from past interactions.",
+      "</last-session-context>"
+    ].join("\n");
+  } catch {
+    return "";
+  }
+}
+function reconstructMessages(entries) {
+  const messages = [];
+  let i = 0;
+  while (i < entries.length) {
+    const entry = entries[i];
+    if (entry.type === "user") {
+      const content = [{ type: "text", text: entry.content }];
+      messages.push({ role: "user", content });
+      i++;
+    } else if (entry.type === "assistant") {
+      const content = [{ type: "text", text: entry.content }];
+      messages.push({ role: "assistant", content });
+      i++;
+    } else if (entry.type === "tool_use") {
+      const lastMsg = messages[messages.length - 1];
+      if (lastMsg && lastMsg.role === "assistant") {
+      }
+      i++;
+    } else if (entry.type === "tool_result") {
+      const content = [{
+        type: "tool_result",
+        toolUseId: `recovered-${i}`,
+        content: entry.content
+      }];
+      messages.push({ role: "user", content });
+      i++;
+    } else {
+      i++;
+    }
+  }
+  return messages;
+}
+
 // src/core/loop.ts
 var MAX_TURNS = 50;
 var MAX_CONSECUTIVE_TOOL_ERRORS = 3;
@@ -6463,7 +6651,9 @@ ${result.summary}` }]
   });
   const toolDefs = toolRegistry.getToolDefinitions();
   const projectMemory = await loadProjectMemoryPrompt(cwd2);
-  const effectiveSystemPrompt = systemPrompt + fastMode.getSystemPromptModifier() + (projectMemory ? "\n\n" + projectMemory : "");
+  const globalMemory = await loadGlobalMemorySummary();
+  const lastSessionSummary = await getLastSessionSummary();
+  const effectiveSystemPrompt = systemPrompt + fastMode.getSystemPromptModifier() + (projectMemory ? "\n\n" + projectMemory : "") + (globalMemory ? "\n\n" + globalMemory : "") + (lastSessionSummary ? "\n\n" + lastSessionSummary : "");
   const toolContext = {
     cwd: cwd2,
     abortSignal,
@@ -6531,12 +6721,33 @@ ${result.summary}` }]
         inputTokens: state.totalInputTokens,
         outputTokens: state.totalOutputTokens
       };
+      const currentContextTokens = parser.usage.inputTokens;
       const budget = checkTokenBudget(
-        state.totalInputTokens,
-        state.totalOutputTokens,
+        currentContextTokens,
+        0,
+        // output already included in next turn's input
         contextWindow.getMaxTokens()
       );
       if (budget.shouldBlock) {
+        const compactionInput = state.messages.map((m) => ({
+          role: m.role,
+          content: formatContentBlocks2(m.content)
+        }));
+        try {
+          const compactResult = await compactor.compact(compactionInput, effectiveSystemPrompt);
+          if (compactResult.removedMessages > 0) {
+            const summaryMsg = {
+              role: "user",
+              content: [{ type: "text", text: `[Previous conversation summary]
+${compactResult.summary}` }]
+            };
+            const keptStart = state.messages.length - compactResult.keptMessages;
+            state.messages = [summaryMsg, ...state.messages.slice(keptStart)];
+            yield { type: "context_compacted", summary: compactResult.summary, removedCount: compactResult.removedMessages };
+            continue;
+          }
+        } catch {
+        }
         yield {
           type: "error",
           error: new Error(
@@ -6928,7 +7139,7 @@ function createMissingToolResults(toolCalls, errorMessage) {
 import { useState, useEffect, useCallback, useRef, useMemo, memo } from "react";
 import { Box, Text, render, useInput, useApp, useStdout } from "ink";
 import { readdirSync } from "fs";
-import { join as join10, basename as basename2, dirname as dirname3 } from "path";
+import { join as join11, basename as basename2, dirname as dirname3 } from "path";
 import { exec as exec2, execSync as execSync2 } from "child_process";
 import { jsx, jsxs } from "react/jsx-runtime";
 var C = {
@@ -7522,10 +7733,10 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
         const selected = currentFiles[selectedIdx];
         if (selected) {
           if (selected.isDir) {
-            setFileCwd(join10(fileCwd, selected.name));
+            setFileCwd(join11(fileCwd, selected.name));
             setSelectedIdx(0);
           } else {
-            openInEditor(join10(fileCwd, selected.name));
+            openInEditor(join11(fileCwd, selected.name));
           }
         }
         return;
@@ -8123,109 +8334,6 @@ async function registerMCPTools(mcpManager, registerFn) {
   return registered;
 }
 
-// src/services/session-recovery.ts
-import { readFile as readFile9, readdir as readdir5 } from "fs/promises";
-import { join as join11 } from "path";
-import { existsSync as existsSync5 } from "fs";
-async function recoverSession(filePath) {
-  const raw = await readFile9(filePath, "utf-8");
-  const lines = raw.split("\n").filter((line) => line.trim().length > 0);
-  const entries = [];
-  for (const line of lines) {
-    try {
-      const entry = JSON.parse(line);
-      if (entry.type && entry.content !== void 0) {
-        entries.push(entry);
-      }
-    } catch {
-    }
-  }
-  const messages = reconstructMessages(entries);
-  const firstEntry = entries[0];
-  const timestamp = firstEntry?.timestamp ?? 0;
-  return {
-    sessionId: filePath,
-    filePath,
-    timestamp,
-    messages,
-    entryCount: entries.length
-  };
-}
-async function listSessions(limit = 20) {
-  const dir = getSessionsDir();
-  if (!existsSync5(dir)) return [];
-  const files = await readdir5(dir);
-  const sessionFiles = files.filter((f) => f.startsWith("session-") && f.endsWith(".jsonl"));
-  const sessions = [];
-  for (const fileName of sessionFiles) {
-    const filePath = join11(dir, fileName);
-    try {
-      const raw = await readFile9(filePath, "utf-8");
-      const lines = raw.split("\n").filter((line) => line.trim().length > 0);
-      let lastActivity = 0;
-      let entryCount = 0;
-      for (const line of lines) {
-        try {
-          const entry = JSON.parse(line);
-          if (entry.timestamp && entry.timestamp > lastActivity) {
-            lastActivity = entry.timestamp;
-          }
-          entryCount++;
-        } catch {
-        }
-      }
-      const dateStr = fileName.replace("session-", "").replace(".jsonl", "");
-      const fileTimestamp = Date.parse(dateStr) || lastActivity;
-      sessions.push({
-        fileName,
-        filePath,
-        timestamp: fileTimestamp,
-        entryCount,
-        lastActivity
-      });
-    } catch {
-    }
-  }
-  sessions.sort((a, b) => b.lastActivity - a.lastActivity);
-  return sessions.slice(0, limit);
-}
-async function findLatestSession() {
-  const sessions = await listSessions(1);
-  return sessions[0] ?? null;
-}
-function reconstructMessages(entries) {
-  const messages = [];
-  let i = 0;
-  while (i < entries.length) {
-    const entry = entries[i];
-    if (entry.type === "user") {
-      const content = [{ type: "text", text: entry.content }];
-      messages.push({ role: "user", content });
-      i++;
-    } else if (entry.type === "assistant") {
-      const content = [{ type: "text", text: entry.content }];
-      messages.push({ role: "assistant", content });
-      i++;
-    } else if (entry.type === "tool_use") {
-      const lastMsg = messages[messages.length - 1];
-      if (lastMsg && lastMsg.role === "assistant") {
-      }
-      i++;
-    } else if (entry.type === "tool_result") {
-      const content = [{
-        type: "tool_result",
-        toolUseId: `recovered-${i}`,
-        content: entry.content
-      }];
-      messages.push({ role: "user", content });
-      i++;
-    } else {
-      i++;
-    }
-  }
-  return messages;
-}
-
 // src/ui/repl.ts
 var SessionSaver = class {
   filePath;
@@ -11532,4 +11640,4 @@ export {
   MCPConnectionManager,
   runCli
 };
-//# sourceMappingURL=chunk-MM3EHZQQ.js.map
+//# sourceMappingURL=chunk-PRO7DR3G.js.map