fourmis-agents-sdk 0.2.1 → 0.2.2

package/dist/api.js

@@ -2927,9 +2927,11 @@ class TaskManager {
 import { readFileSync as readFileSync4, appendFileSync, mkdirSync as mkdirSync3, readdirSync, statSync } from "fs";
 import { join as join4 } from "path";
 import { homedir as homedir2 } from "os";
+function sanitizeCwd(cwd) {
+  return cwd.replace(/[/.]/g, "-");
+}
 function sessionsDir(cwd) {
-  const sanitized = cwd.replace(/^\//, "").replace(/\//g, "-");
-  return join4(homedir2(), ".claude", "projects", sanitized);
+  return join4(homedir2(), ".claude", "projects", sanitizeCwd(cwd));
 }
 function ensureDir(dir) {
   mkdirSync3(dir, { recursive: true });
@@ -2940,11 +2942,15 @@ function logMessage(dir, sessionId, entry) {
   appendFileSync(filePath, JSON.stringify(entry) + `
 `);
 }
-function createSessionLogger(cwd, sessionId) {
+function createSessionLogger(cwd, sessionId, model) {
   const dir = sessionsDir(cwd);
   let lastUuid = null;
   return (role, content, parentUuid) => {
     const entryUuid = uuid();
+    let normalizedContent = content;
+    if (role === "user" && typeof content === "string") {
+      normalizedContent = [{ type: "text", text: content }];
+    }
     const entry = {
       type: role,
       uuid: entryUuid,
@@ -2952,7 +2958,14 @@ function createSessionLogger(cwd, sessionId) {
       sessionId,
       timestamp: new Date().toISOString(),
       cwd,
-      message: { role, content }
+      isSidechain: false,
+      userType: "external",
+      message: {
+        role,
+        content: normalizedContent,
+        ...role === "assistant" && model ? { model } : {}
+      },
+      ...role === "user" ? { permissionMode: "default" } : {}
     };
     logMessage(dir, sessionId, entry);
     lastUuid = entryUuid;
@@ -2991,10 +3004,23 @@ function loadSessionMessages(cwd, sessionId) {
   for (const line of lines) {
     try {
       const entry = JSON.parse(line);
-      messages.push({
-        role: entry.type === "user" ? "user" : "assistant",
-        content: entry.message.content
-      });
+      if (entry.type !== "user" && entry.type !== "assistant")
+        continue;
+      if (entry.isMeta === true)
+        continue;
+      const message = entry.message;
+      if (!message)
+        continue;
+      const role = entry.type === "user" ? "user" : "assistant";
+      let content;
+      if (typeof message.content === "string") {
+        content = message.content;
+      } else if (Array.isArray(message.content)) {
+        content = message.content.filter((c) => c.type === "text" || c.type === "tool_use" || c.type === "tool_result").map((c) => c);
+      } else {
+        continue;
+      }
+      messages.push({ role, content });
     } catch {}
   }
   return messages;
@@ -3064,7 +3090,7 @@ function query(params) {
     }
   }
   const persistSession = options.persistSession !== false;
-  const sessionLogger = persistSession ? createSessionLogger(cwd, sessionId) : undefined;
+  const sessionLogger = persistSession ? createSessionLogger(cwd, sessionId, model) : undefined;
   const abortController = new AbortController;
   if (options.signal) {
     options.signal.addEventListener("abort", () => abortController.abort(), { once: true });

package/dist/index.js

@@ -2927,9 +2927,11 @@ class TaskManager {
 import { readFileSync as readFileSync4, appendFileSync, mkdirSync as mkdirSync3, readdirSync, statSync } from "fs";
 import { join as join4 } from "path";
 import { homedir as homedir2 } from "os";
+function sanitizeCwd(cwd) {
+  return cwd.replace(/[/.]/g, "-");
+}
 function sessionsDir(cwd) {
-  const sanitized = cwd.replace(/^\//, "").replace(/\//g, "-");
-  return join4(homedir2(), ".claude", "projects", sanitized);
+  return join4(homedir2(), ".claude", "projects", sanitizeCwd(cwd));
 }
 function ensureDir(dir) {
   mkdirSync3(dir, { recursive: true });
@@ -2940,11 +2942,15 @@ function logMessage(dir, sessionId, entry) {
   appendFileSync(filePath, JSON.stringify(entry) + `
 `);
 }
-function createSessionLogger(cwd, sessionId) {
+function createSessionLogger(cwd, sessionId, model) {
   const dir = sessionsDir(cwd);
   let lastUuid = null;
   return (role, content, parentUuid) => {
     const entryUuid = uuid();
+    let normalizedContent = content;
+    if (role === "user" && typeof content === "string") {
+      normalizedContent = [{ type: "text", text: content }];
+    }
     const entry = {
       type: role,
       uuid: entryUuid,
@@ -2952,7 +2958,14 @@ function createSessionLogger(cwd, sessionId) {
       sessionId,
       timestamp: new Date().toISOString(),
       cwd,
-      message: { role, content }
+      isSidechain: false,
+      userType: "external",
+      message: {
+        role,
+        content: normalizedContent,
+        ...role === "assistant" && model ? { model } : {}
+      },
+      ...role === "user" ? { permissionMode: "default" } : {}
     };
     logMessage(dir, sessionId, entry);
     lastUuid = entryUuid;
@@ -2991,10 +3004,23 @@ function loadSessionMessages(cwd, sessionId) {
   for (const line of lines) {
     try {
       const entry = JSON.parse(line);
-      messages.push({
-        role: entry.type === "user" ? "user" : "assistant",
-        content: entry.message.content
-      });
+      if (entry.type !== "user" && entry.type !== "assistant")
+        continue;
+      if (entry.isMeta === true)
+        continue;
+      const message = entry.message;
+      if (!message)
+        continue;
+      const role = entry.type === "user" ? "user" : "assistant";
+      let content;
+      if (typeof message.content === "string") {
+        content = message.content;
+      } else if (Array.isArray(message.content)) {
+        content = message.content.filter((c) => c.type === "text" || c.type === "tool_use" || c.type === "tool_result").map((c) => c);
+      } else {
+        continue;
+      }
+      messages.push({ role, content });
     } catch {}
   }
   return messages;
@@ -3064,7 +3090,7 @@ function query(params) {
     }
   }
   const persistSession = options.persistSession !== false;
-  const sessionLogger = persistSession ? createSessionLogger(cwd, sessionId) : undefined;
+  const sessionLogger = persistSession ? createSessionLogger(cwd, sessionId, model) : undefined;
   const abortController = new AbortController;
   if (options.signal) {
     options.signal.addEventListener("abort", () => abortController.abort(), { once: true });

package/dist/utils/session-store.d.ts

@@ -3,8 +3,18 @@
  *
  * Sessions are stored as one JSON object per line in:
  *   ~/.claude/projects/{sanitized-cwd}/{sessionId}.jsonl
+ *
+ * Path sanitization matches Claude SDK: replace `/` and `.` with `-`.
+ *   /root/.fourmis/workspaces/doremi → -root--fourmis-workspaces-doremi
  */
 import type { NormalizedMessage, NormalizedContent } from "../providers/types.js";
+/**
+ * JSONL entry — compatible with Claude SDK session format.
+ *
+ * Claude SDK entries include additional fields (isSidechain, userType, version,
+ * gitBranch, permissionMode, message.model, message.usage, requestId, etc.)
+ * that we include for compatibility. When loading, we only need type + message.
+ */
 export type SessionEntry = {
     type: "user" | "assistant";
     uuid: string;
@@ -12,11 +22,22 @@ export type SessionEntry = {
     sessionId: string;
     timestamp: string;
     cwd: string;
+    isSidechain: boolean;
+    userType: string;
     message: {
         role: string;
         content: NormalizedContent[] | string;
+        model?: string;
     };
+    permissionMode?: string;
 };
+/**
+ * Sanitize a cwd path to a directory name, matching Claude SDK convention.
+ * Replaces `/` and `.` with `-`.
+ *   /root/dev/fourmis → -root-dev-fourmis
+ *   /root/.fourmis/workspaces/doremi → -root--fourmis-workspaces-doremi
+ */
+export declare function sanitizeCwd(cwd: string): string;
 /**
  * Returns the sessions directory for a given cwd.
  * Path: ~/.claude/projects/{sanitized-cwd}/
@@ -28,8 +49,9 @@ export declare function sessionsDir(cwd: string): string;
 export declare function logMessage(dir: string, sessionId: string, entry: SessionEntry): void;
 /**
  * Create a session logger function for use in the agent loop.
+ * Returns a function that logs messages and returns the entry UUID.
  */
-export declare function createSessionLogger(cwd: string, sessionId: string): (role: "user" | "assistant", content: NormalizedContent[] | string, parentUuid: string | null) => string;
+export declare function createSessionLogger(cwd: string, sessionId: string, model?: string): (role: "user" | "assistant", content: NormalizedContent[] | string, parentUuid: string | null) => string;
 /**
  * Find the most recent session file in the sessions directory for a cwd.
  * Returns the sessionId (filename without .jsonl) or null.
@@ -37,6 +59,7 @@ export declare function createSessionLogger(cwd: string, sessionId: string): (ro
 export declare function findLatestSession(cwd: string): string | null;
 /**
  * Load messages from a session JSONL file and reconstruct NormalizedMessage[].
+ * Skips non-message entries (file-history-snapshot, queue-operation, system, progress).
  */
 export declare function loadSessionMessages(cwd: string, sessionId: string): NormalizedMessage[];
 //# sourceMappingURL=session-store.d.ts.map

package/dist/utils/session-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/utils/session-store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAKlF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;KACvC,CAAC;CACH,CAAC;AAIF;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C;AAWD;;GAEG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,YAAY,GAClB,IAAI,CAIN;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAChB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAmB1G;AAID;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqB5D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAChB,iBAAiB,EAAE,CA0BrB"}
+{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/utils/session-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAKlF;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;QACtC,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAIF;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AAWD;;GAEG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,YAAY,GAClB,IAAI,CAIN;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAkC1G;AAID;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqB5D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAChB,iBAAiB,EAAE,CAgDrB"}

package/dist/utils/session-store.js

@@ -37,9 +37,11 @@ function mergeUsage(a, b) {
 import { readFileSync, appendFileSync, mkdirSync, readdirSync, statSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
+function sanitizeCwd(cwd) {
+  return cwd.replace(/[/.]/g, "-");
+}
 function sessionsDir(cwd) {
-  const sanitized = cwd.replace(/^\//, "").replace(/\//g, "-");
-  return join(homedir(), ".claude", "projects", sanitized);
+  return join(homedir(), ".claude", "projects", sanitizeCwd(cwd));
 }
 function ensureDir(dir) {
   mkdirSync(dir, { recursive: true });
@@ -50,11 +52,15 @@ function logMessage(dir, sessionId, entry) {
   appendFileSync(filePath, JSON.stringify(entry) + `
 `);
 }
-function createSessionLogger(cwd, sessionId) {
+function createSessionLogger(cwd, sessionId, model) {
   const dir = sessionsDir(cwd);
   let lastUuid = null;
   return (role, content, parentUuid) => {
     const entryUuid = uuid();
+    let normalizedContent = content;
+    if (role === "user" && typeof content === "string") {
+      normalizedContent = [{ type: "text", text: content }];
+    }
     const entry = {
       type: role,
       uuid: entryUuid,
@@ -62,7 +68,14 @@ function createSessionLogger(cwd, sessionId) {
       sessionId,
       timestamp: new Date().toISOString(),
       cwd,
-      message: { role, content }
+      isSidechain: false,
+      userType: "external",
+      message: {
+        role,
+        content: normalizedContent,
+        ...role === "assistant" && model ? { model } : {}
+      },
+      ...role === "user" ? { permissionMode: "default" } : {}
     };
     logMessage(dir, sessionId, entry);
     lastUuid = entryUuid;
@@ -101,16 +114,30 @@ function loadSessionMessages(cwd, sessionId) {
   for (const line of lines) {
     try {
       const entry = JSON.parse(line);
-      messages.push({
-        role: entry.type === "user" ? "user" : "assistant",
-        content: entry.message.content
-      });
+      if (entry.type !== "user" && entry.type !== "assistant")
+        continue;
+      if (entry.isMeta === true)
+        continue;
+      const message = entry.message;
+      if (!message)
+        continue;
+      const role = entry.type === "user" ? "user" : "assistant";
+      let content;
+      if (typeof message.content === "string") {
+        content = message.content;
+      } else if (Array.isArray(message.content)) {
+        content = message.content.filter((c) => c.type === "text" || c.type === "tool_use" || c.type === "tool_result").map((c) => c);
+      } else {
+        continue;
+      }
+      messages.push({ role, content });
     } catch {}
   }
   return messages;
 }
 export {
   sessionsDir,
+  sanitizeCwd,
   logMessage,
   loadSessionMessages,
   findLatestSession,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fourmis-agents-sdk",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Multi-provider AI agent SDK with direct API access and in-process tool execution",
   "type": "module",
   "main": "dist/index.js",