march-cli 0.1.21 → 0.1.22

package/src/session/attachments.mjs

@@ -1,140 +1,140 @@
-import { randomUUID } from "node:crypto";
-import { mkdirSync, writeFileSync } from "node:fs";
-import { basename, join, relative, resolve } from "node:path";
-
-export const ATTACHMENT_STORE_VERSION = 1;
-
-const IMAGE_EXTENSIONS = Object.freeze({
-  "image/gif": "gif",
-  "image/jpeg": "jpg",
-  "image/png": "png",
-  "image/webp": "webp",
-});
-
-export function getAttachmentRoot(projectMarchDir) {
-  if (!projectMarchDir) throw new Error("projectMarchDir is required");
-  return join(projectMarchDir, "attachments");
-}
-
-export function getSessionAttachmentDir({ projectMarchDir, sessionId }) {
-  return join(getAttachmentRoot(projectMarchDir), sanitizePathSegment(sessionId || "session"));
-}
-
-export function saveImageAttachment({
-  projectMarchDir,
-  sessionId,
-  data,
-  mimeType,
-  source = "unknown",
-  now = new Date(),
-  id = randomUUID().slice(0, 8),
-} = {}) {
-  const ext = imageExtensionForMime(mimeType);
-  const buffer = toBuffer(data);
-  if (buffer.length === 0) throw new Error("attachment data is empty");
-
-  const dir = getSessionAttachmentDir({ projectMarchDir, sessionId });
-  mkdirSync(dir, { recursive: true });
-
-  const createdAt = now.toISOString();
-  const stem = `${formatTimestampForFile(createdAt)}_${sanitizePathSegment(id)}`;
-  const path = assertInsideRoot(resolve(dir, `${stem}.${ext}`), getAttachmentRoot(projectMarchDir));
-  const metadataPath = assertInsideRoot(resolve(dir, `${stem}.json`), getAttachmentRoot(projectMarchDir));
-  writeFileSync(path, buffer);
-
-  const metadata = {
-    version: ATTACHMENT_STORE_VERSION,
-    sessionId: sessionId || null,
-    source,
-    mimeType,
-    sizeBytes: buffer.length,
-    createdAt,
-    filename: basename(path),
-    relativePath: toProjectMarchRelative(projectMarchDir, path),
-  };
-  writeFileSync(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
-  return {
-    path,
-    metadataPath,
-    relativePath: metadata.relativePath,
-    metadata,
-  };
-}
-
-export function saveGeneratedImageAttachment({
-  projectMarchDir,
-  data,
-  mimeType,
-  now = new Date(),
-  id = randomUUID().slice(0, 8),
-} = {}) {
-  const ext = imageExtensionForMime(mimeType);
-  const buffer = toBuffer(data);
-  if (buffer.length === 0) throw new Error("attachment data is empty");
-
-  const dir = assertInsideRoot(resolve(getAttachmentRoot(projectMarchDir), "generated"), getAttachmentRoot(projectMarchDir));
-  mkdirSync(dir, { recursive: true });
-
-  const createdAt = now.toISOString();
-  const stem = `${formatTimestampForFile(createdAt)}_${sanitizePathSegment(id)}`;
-  const path = assertInsideRoot(resolve(dir, `${stem}.${ext}`), getAttachmentRoot(projectMarchDir));
-  const metadataPath = assertInsideRoot(resolve(dir, `${stem}.json`), getAttachmentRoot(projectMarchDir));
-  writeFileSync(path, buffer);
-
-  const metadata = {
-    version: ATTACHMENT_STORE_VERSION,
-    sessionId: null,
-    source: "image_generate",
-    mimeType,
-    sizeBytes: buffer.length,
-    createdAt,
-    filename: basename(path),
-    relativePath: toProjectMarchRelative(projectMarchDir, path),
-  };
-  writeFileSync(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
-  return {
-    path,
-    metadataPath,
-    relativePath: metadata.relativePath,
-    marker: `@.march/${metadata.relativePath}`,
-    metadata,
-  };
-}
-
-export function imageExtensionForMime(mimeType) {
-  const ext = IMAGE_EXTENSIONS[String(mimeType || "").toLowerCase()];
-  if (!ext) throw new Error(`unsupported image mime type: ${mimeType || "unknown"}`);
-  return ext;
-}
-
-export function sanitizePathSegment(value) {
-  return String(value || "value")
-    .replace(/[^A-Za-z0-9._-]+/g, "-")
-    .replace(/^[._-]+|[._-]+$/g, "")
-    .slice(0, 80) || "value";
-}
-
-function toBuffer(data) {
-  if (Buffer.isBuffer(data)) return data;
-  if (data instanceof Uint8Array) return Buffer.from(data);
-  if (typeof data === "string") return Buffer.from(data, "base64");
-  throw new Error("attachment data must be a Buffer, Uint8Array, or base64 string");
-}
-
-function formatTimestampForFile(isoString) {
-  return isoString.replace(/[:.]/g, "-");
-}
-
-function assertInsideRoot(path, root) {
-  const resolvedRoot = resolve(root);
-  const resolvedPath = resolve(path);
-  const rel = relative(resolvedRoot, resolvedPath);
-  if (rel.startsWith("..") || rel === "" || resolve(resolvedRoot, rel) !== resolvedPath) {
-    throw new Error("attachment path escaped attachments root");
-  }
-  return resolvedPath;
-}
-
-function toProjectMarchRelative(projectMarchDir, path) {
-  return relative(resolve(projectMarchDir), resolve(path)).replace(/\\/g, "/");
-}
+import { randomUUID } from "node:crypto";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { basename, join, relative, resolve } from "node:path";
+
+export const ATTACHMENT_STORE_VERSION = 1;
+
+const IMAGE_EXTENSIONS = Object.freeze({
+  "image/gif": "gif",
+  "image/jpeg": "jpg",
+  "image/png": "png",
+  "image/webp": "webp",
+});
+
+export function getAttachmentRoot(projectMarchDir) {
+  if (!projectMarchDir) throw new Error("projectMarchDir is required");
+  return join(projectMarchDir, "attachments");
+}
+
+export function getSessionAttachmentDir({ projectMarchDir, sessionId }) {
+  return join(getAttachmentRoot(projectMarchDir), sanitizePathSegment(sessionId || "session"));
+}
+
+export function saveImageAttachment({
+  projectMarchDir,
+  sessionId,
+  data,
+  mimeType,
+  source = "unknown",
+  now = new Date(),
+  id = randomUUID().slice(0, 8),
+} = {}) {
+  const ext = imageExtensionForMime(mimeType);
+  const buffer = toBuffer(data);
+  if (buffer.length === 0) throw new Error("attachment data is empty");
+
+  const dir = getSessionAttachmentDir({ projectMarchDir, sessionId });
+  mkdirSync(dir, { recursive: true });
+
+  const createdAt = now.toISOString();
+  const stem = `${formatTimestampForFile(createdAt)}_${sanitizePathSegment(id)}`;
+  const path = assertInsideRoot(resolve(dir, `${stem}.${ext}`), getAttachmentRoot(projectMarchDir));
+  const metadataPath = assertInsideRoot(resolve(dir, `${stem}.json`), getAttachmentRoot(projectMarchDir));
+  writeFileSync(path, buffer);
+
+  const metadata = {
+    version: ATTACHMENT_STORE_VERSION,
+    sessionId: sessionId || null,
+    source,
+    mimeType,
+    sizeBytes: buffer.length,
+    createdAt,
+    filename: basename(path),
+    relativePath: toProjectMarchRelative(projectMarchDir, path),
+  };
+  writeFileSync(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
+  return {
+    path,
+    metadataPath,
+    relativePath: metadata.relativePath,
+    metadata,
+  };
+}
+
+export function saveGeneratedImageAttachment({
+  projectMarchDir,
+  data,
+  mimeType,
+  now = new Date(),
+  id = randomUUID().slice(0, 8),
+} = {}) {
+  const ext = imageExtensionForMime(mimeType);
+  const buffer = toBuffer(data);
+  if (buffer.length === 0) throw new Error("attachment data is empty");
+
+  const dir = assertInsideRoot(resolve(getAttachmentRoot(projectMarchDir), "generated"), getAttachmentRoot(projectMarchDir));
+  mkdirSync(dir, { recursive: true });
+
+  const createdAt = now.toISOString();
+  const stem = `${formatTimestampForFile(createdAt)}_${sanitizePathSegment(id)}`;
+  const path = assertInsideRoot(resolve(dir, `${stem}.${ext}`), getAttachmentRoot(projectMarchDir));
+  const metadataPath = assertInsideRoot(resolve(dir, `${stem}.json`), getAttachmentRoot(projectMarchDir));
+  writeFileSync(path, buffer);
+
+  const metadata = {
+    version: ATTACHMENT_STORE_VERSION,
+    sessionId: null,
+    source: "image_generate",
+    mimeType,
+    sizeBytes: buffer.length,
+    createdAt,
+    filename: basename(path),
+    relativePath: toProjectMarchRelative(projectMarchDir, path),
+  };
+  writeFileSync(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
+  return {
+    path,
+    metadataPath,
+    relativePath: metadata.relativePath,
+    marker: `@.march/${metadata.relativePath}`,
+    metadata,
+  };
+}
+
+export function imageExtensionForMime(mimeType) {
+  const ext = IMAGE_EXTENSIONS[String(mimeType || "").toLowerCase()];
+  if (!ext) throw new Error(`unsupported image mime type: ${mimeType || "unknown"}`);
+  return ext;
+}
+
+export function sanitizePathSegment(value) {
+  return String(value || "value")
+    .replace(/[^A-Za-z0-9._-]+/g, "-")
+    .replace(/^[._-]+|[._-]+$/g, "")
+    .slice(0, 80) || "value";
+}
+
+function toBuffer(data) {
+  if (Buffer.isBuffer(data)) return data;
+  if (data instanceof Uint8Array) return Buffer.from(data);
+  if (typeof data === "string") return Buffer.from(data, "base64");
+  throw new Error("attachment data must be a Buffer, Uint8Array, or base64 string");
+}
+
+function formatTimestampForFile(isoString) {
+  return isoString.replace(/[:.]/g, "-");
+}
+
+function assertInsideRoot(path, root) {
+  const resolvedRoot = resolve(root);
+  const resolvedPath = resolve(path);
+  const rel = relative(resolvedRoot, resolvedPath);
+  if (rel.startsWith("..") || rel === "" || resolve(resolvedRoot, rel) !== resolvedPath) {
+    throw new Error("attachment path escaped attachments root");
+  }
+  return resolvedPath;
+}
+
+function toProjectMarchRelative(projectMarchDir, path) {
+  return relative(resolve(projectMarchDir), resolve(path)).replace(/\\/g, "/");
+}

package/src/session/persist.mjs

@@ -1 +1 @@
-// Legacy session persistence removed. All sessions use pi JSONL format.
+// Legacy session persistence removed. All sessions use pi JSONL format.

package/src/session/pi-manager.mjs

@@ -1,34 +1,34 @@
-import { mkdirSync } from "node:fs";
-import { join } from "node:path";
-import { SessionManager } from "@earendil-works/pi-coding-agent";
-
-export function getPiSessionDir(projectMarchDir) {
-  return join(projectMarchDir, "pi-sessions");
-}
-
-export function createPiSessionManager({ cwd, projectMarchDir }) {
-  const sessionDir = getPiSessionDir(projectMarchDir);
-  mkdirSync(sessionDir, { recursive: true });
-  return SessionManager.create(cwd, sessionDir);
-}
-
-export function resolvePiSessionManager({ cwd, projectMarchDir, enabled = false }) {
-  if (!enabled) return null;
-  return createPiSessionManager({ cwd, projectMarchDir });
-}
-
-export async function listPiSessionInfos({ cwd, projectMarchDir }) {
-  const sessionDir = getPiSessionDir(projectMarchDir);
-  const sessions = await SessionManager.list(cwd, sessionDir);
-  return sessions.map((session) => ({
-    id: session.id,
-    path: session.path,
-    savedAt: session.modified?.toISOString?.() ?? "",
-    createdAt: session.created?.toISOString?.() ?? "",
-    cwd: session.cwd,
-    name: session.name,
-    turnCount: session.messageCount,
-    firstMessage: session.firstMessage,
-    parentSessionPath: session.parentSessionPath ?? null,
-  }));
-}
+import { mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { SessionManager } from "@earendil-works/pi-coding-agent";
+
+export function getPiSessionDir(projectMarchDir) {
+  return join(projectMarchDir, "pi-sessions");
+}
+
+export function createPiSessionManager({ cwd, projectMarchDir }) {
+  const sessionDir = getPiSessionDir(projectMarchDir);
+  mkdirSync(sessionDir, { recursive: true });
+  return SessionManager.create(cwd, sessionDir);
+}
+
+export function resolvePiSessionManager({ cwd, projectMarchDir, enabled = false }) {
+  if (!enabled) return null;
+  return createPiSessionManager({ cwd, projectMarchDir });
+}
+
+export async function listPiSessionInfos({ cwd, projectMarchDir }) {
+  const sessionDir = getPiSessionDir(projectMarchDir);
+  const sessions = await SessionManager.list(cwd, sessionDir);
+  return sessions.map((session) => ({
+    id: session.id,
+    path: session.path,
+    savedAt: session.modified?.toISOString?.() ?? "",
+    createdAt: session.created?.toISOString?.() ?? "",
+    cwd: session.cwd,
+    name: session.name,
+    turnCount: session.messageCount,
+    firstMessage: session.firstMessage,
+    parentSessionPath: session.parentSessionPath ?? null,
+  }));
+}

package/src/session/session-utils.mjs

@@ -1,16 +1,16 @@
-/**
- * Shared session utility functions.
- */
-export function formatSessionId(namespace, sessionName) {
-  if (!namespace && !sessionName) return "default";
-  if (!sessionName) return namespace;
-  if (!namespace) return sessionName;
-  return `${namespace}/${sessionName}`;
-}
-
-export function parseSessionId(sessionId) {
-  if (!sessionId || sessionId === "default") return { namespace: "", sessionName: "default" };
-  const idx = sessionId.indexOf("/");
-  if (idx === -1) return { namespace: "", sessionName: sessionId };
-  return { namespace: sessionId.slice(0, idx), sessionName: sessionId.slice(idx + 1) };
-}
+/**
+ * Shared session utility functions.
+ */
+export function formatSessionId(namespace, sessionName) {
+  if (!namespace && !sessionName) return "default";
+  if (!sessionName) return namespace;
+  if (!namespace) return sessionName;
+  return `${namespace}/${sessionName}`;
+}
+
+export function parseSessionId(sessionId) {
+  if (!sessionId || sessionId === "default") return { namespace: "", sessionName: "default" };
+  const idx = sessionId.indexOf("/");
+  if (idx === -1) return { namespace: "", sessionName: sessionId };
+  return { namespace: sessionId.slice(0, idx), sessionName: sessionId.slice(idx + 1) };
+}

package/src/session/sidecar-sync.mjs

@@ -1,19 +1,19 @@
-import { savePiSessionSidecar } from "./sidecar.mjs";
-
-export function syncPiSessionSidecar({ enabled = false, projectMarchDir, engine, sessionStats, metadata = {} }) {
-  if (!enabled || !projectMarchDir || !sessionStats?.persisted || !sessionStats.sessionFile) {
-    return null;
-  }
-
-  return savePiSessionSidecar({
-    projectMarchDir,
-    sessionRef: sessionStats.sessionFile,
-    engine,
-    metadata: {
-      sessionId: sessionStats.sessionId,
-      sessionFile: sessionStats.sessionFile,
-      runtimeHost: Boolean(sessionStats.runtimeHost),
-      ...metadata,
-    },
-  });
-}
+import { savePiSessionSidecar } from "./sidecar.mjs";
+
+export function syncPiSessionSidecar({ enabled = false, projectMarchDir, engine, sessionStats, metadata = {} }) {
+  if (!enabled || !projectMarchDir || !sessionStats?.persisted || !sessionStats.sessionFile) {
+    return null;
+  }
+
+  return savePiSessionSidecar({
+    projectMarchDir,
+    sessionRef: sessionStats.sessionFile,
+    engine,
+    metadata: {
+      sessionId: sessionStats.sessionId,
+      sessionFile: sessionStats.sessionFile,
+      runtimeHost: Boolean(sessionStats.runtimeHost),
+      ...metadata,
+    },
+  });
+}

package/src/session/sidecar.mjs

@@ -1,69 +1,69 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, join } from "node:path";
-
-export const PI_SIDECAR_VERSION = 1;
-
-export function getPiSidecarDir(projectMarchDir) {
-  return join(projectMarchDir, "pi-sidecars");
-}
-
-export function getPiSidecarPath(projectMarchDir, sessionRef) {
-  return join(getPiSidecarDir(projectMarchDir), `${normalizeSessionRef(sessionRef)}.json`);
-}
-
-export function captureContextSidecar(engine, metadata = {}) {
-  return {
-    version: PI_SIDECAR_VERSION,
-    savedAt: new Date().toISOString(),
-    ...metadata,
-    cwd: engine.cwd,
-    modelId: engine.modelId,
-    provider: engine.provider,
-    sessionName: engine.sessionName ?? "",
-    thinkingLevel: engine.thinkingLevel,
-    namespace: engine.namespace,
-    pendingAssistantRecallHints: engine.pendingAssistantRecallHints ?? [],
-    turns: engine.turns,
-  };
-}
-
-export function savePiSessionSidecar({ projectMarchDir, sessionRef, engine, metadata = {} }) {
-  return savePiSessionSidecarState({
-    projectMarchDir,
-    sessionRef,
-    state: captureContextSidecar(engine, metadata),
-  });
-}
-
-export function savePiSessionSidecarState({ projectMarchDir, sessionRef, state }) {
-  const sidecarDir = getPiSidecarDir(projectMarchDir);
-  mkdirSync(sidecarDir, { recursive: true });
-  validateSidecarState(state);
-  const path = getPiSidecarPath(projectMarchDir, sessionRef);
-  writeFileSync(path, JSON.stringify(state, null, 2), "utf8");
-  return { path, state };
-}
-
-export function loadPiSessionSidecar({ projectMarchDir, sessionRef }) {
-  const path = getPiSidecarPath(projectMarchDir, sessionRef);
-  if (!existsSync(path)) return null;
-  const state = JSON.parse(readFileSync(path, "utf8"));
-  if (!isValidSidecarState(state)) {
-    throw new Error("Invalid pi session sidecar");
-  }
-  return { path, state };
-}
-
-function validateSidecarState(state) {
-  if (!isValidSidecarState(state)) throw new Error("Invalid pi session sidecar");
-}
-
-function isValidSidecarState(state) {
-  return state?.version === PI_SIDECAR_VERSION && Boolean(state.cwd) && Array.isArray(state.turns);
-}
-
-function normalizeSessionRef(sessionRef) {
-  const ref = basename(String(sessionRef).trim()).replace(/\.jsonl$/i, "");
-  if (!ref || ref === "." || ref === "..") throw new Error("Invalid pi session reference");
-  return ref.replace(/[^a-zA-Z0-9._-]/g, "_");
-}
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { basename, join } from "node:path";
+
+export const PI_SIDECAR_VERSION = 1;
+
+export function getPiSidecarDir(projectMarchDir) {
+  return join(projectMarchDir, "pi-sidecars");
+}
+
+export function getPiSidecarPath(projectMarchDir, sessionRef) {
+  return join(getPiSidecarDir(projectMarchDir), `${normalizeSessionRef(sessionRef)}.json`);
+}
+
+export function captureContextSidecar(engine, metadata = {}) {
+  return {
+    version: PI_SIDECAR_VERSION,
+    savedAt: new Date().toISOString(),
+    ...metadata,
+    cwd: engine.cwd,
+    modelId: engine.modelId,
+    provider: engine.provider,
+    sessionName: engine.sessionName ?? "",
+    thinkingLevel: engine.thinkingLevel,
+    namespace: engine.namespace,
+    pendingAssistantRecallHints: engine.pendingAssistantRecallHints ?? [],
+    turns: engine.turns,
+  };
+}
+
+export function savePiSessionSidecar({ projectMarchDir, sessionRef, engine, metadata = {} }) {
+  return savePiSessionSidecarState({
+    projectMarchDir,
+    sessionRef,
+    state: captureContextSidecar(engine, metadata),
+  });
+}
+
+export function savePiSessionSidecarState({ projectMarchDir, sessionRef, state }) {
+  const sidecarDir = getPiSidecarDir(projectMarchDir);
+  mkdirSync(sidecarDir, { recursive: true });
+  validateSidecarState(state);
+  const path = getPiSidecarPath(projectMarchDir, sessionRef);
+  writeFileSync(path, JSON.stringify(state, null, 2), "utf8");
+  return { path, state };
+}
+
+export function loadPiSessionSidecar({ projectMarchDir, sessionRef }) {
+  const path = getPiSidecarPath(projectMarchDir, sessionRef);
+  if (!existsSync(path)) return null;
+  const state = JSON.parse(readFileSync(path, "utf8"));
+  if (!isValidSidecarState(state)) {
+    throw new Error("Invalid pi session sidecar");
+  }
+  return { path, state };
+}
+
+function validateSidecarState(state) {
+  if (!isValidSidecarState(state)) throw new Error("Invalid pi session sidecar");
+}
+
+function isValidSidecarState(state) {
+  return state?.version === PI_SIDECAR_VERSION && Boolean(state.cwd) && Array.isArray(state.turns);
+}
+
+function normalizeSessionRef(sessionRef) {
+  const ref = basename(String(sessionRef).trim()).replace(/\.jsonl$/i, "");
+  if (!ref || ref === "." || ref === "..") throw new Error("Invalid pi session reference");
+  return ref.replace(/[^a-zA-Z0-9._-]/g, "_");
+}