march-cli 0.1.21 → 0.1.22

package/src/agent/turn/turn-runner.mjs

@@ -1,196 +1,196 @@
-import { formatRecallHints } from "../../memory/markdown-store.mjs";
-import { resolveImageAttachmentReferences } from "../../session/attachment-references.mjs";
-import { closeAssistantReply, compactAssistantContext, createTurnEventState, handleRunnerSessionEvent } from "./turn-events.mjs";
-
-export async function runRunnerTurn({
-  prompt,
-  userMessage,
-  options = {},
-  sessionBinding,
-  engine,
-  ui,
-  projectMarchDir,
-  memoryStore,
-  setModelCallKind,
-  logger = null,
-  setPhase = null,
-  syncCurrentPiSidecar,
-  autoNameSession,
-  contextMode = "rebuild",
-}) {
-  const {
-    userRecallHints = [],
-    currentProject = "",
-  } = options;
-  const activeSession = sessionBinding.get();
-  const turnState = createTurnEventState();
-  const midTurnRecallHints = [];
-  ui.turnStart();
-  setPhase?.("subscribed");
-  logger?.event("turn.ui.start");
-
-  const unsubscribe = activeSession.subscribe((event) => {
-    logSessionEvent(logger, event);
-    if (event.type === "tool_execution_start") setPhase?.(`tool_running:${event.toolName ?? "unknown"}`);
-    if (event.type === "tool_execution_end") setPhase?.("model_streaming");
-    if (event.type === "auto_retry_start") setPhase?.("retry_wait");
-    if (event.type === "auto_retry_end") setPhase?.("model_streaming");
-    if (event.type === "message_update") setPhase?.("model_streaming");
-    handleRunnerSessionEvent(event, { ui, engine, state: turnState });
-    if (event.type === "tool_execution_start") {
-      const hints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
-      if (hints.length > 0) {
-        midTurnRecallHints.push(...hints);
-        queueMidTurnRecallHints(activeSession, hints, logger);
-        ui.memoryHint?.({ source: "assistant", hints });
-      }
-    }
-  });
-
-  try {
-    const attachmentReferences = resolveImageAttachmentReferences({
-      text: userMessage ?? prompt,
-      projectMarchDir,
-    });
-    logger?.event("turn.attachments.resolved", { imageCount: attachmentReferences.images.length });
-    setModelCallKind("user");
-    setPhase?.("model_request");
-    logger?.event("model.prompt.start", { contextMode });
-    try {
-      if (contextMode === "rebuild") resetPiMessageHistory(activeSession);
-      await activeSession.prompt(
-        contextMode === "continueExistingPiTranscript" ? (userMessage ?? prompt) : prompt,
-        attachmentReferences.images.length > 0 ? { images: attachmentReferences.images } : undefined,
-      );
-    } finally {
-      setModelCallKind("model");
-      logger?.event("model.prompt.end");
-    }
-
-    setPhase?.("finalizing");
-    finalizeTurn({
-      prompt,
-      userMessage,
-      userRecallHints,
-      currentProject,
-      memoryStore,
-      engine,
-      ui,
-      turnState,
-      midTurnRecallHints,
-      syncCurrentPiSidecar,
-      autoNameSession,
-    });
-    return { draft: turnState.draft };
-  } finally {
-    logger?.event("turn.ui.end");
-    ui.turnEnd();
-    unsubscribe();
-  }
-}
-
-function queueMidTurnRecallHints(session, hints, logger) {
-  const content = formatRecallHints("assistant", hints);
-  if (!content) return;
-  const injected = session.sendCustomMessage?.({
-    customType: "march.memory_hint",
-    content,
-    display: false,
-    details: { source: "assistant" },
-  }, { deliverAs: "steer" });
-  void injected?.catch?.((err) => {
-    logger?.debug("memory.mid_turn_recall.inject_failed", { errorMessage: err?.message ?? String(err) });
-  });
-}
-
-function logSessionEvent(logger, event) {
-  if (!logger) return;
-  if (event.type === "message_update") {
-    const messageEvent = event.assistantMessageEvent;
-    logger.debug("session.event", {
-      type: event.type,
-      assistantMessageType: messageEvent?.type,
-      deltaLength: messageEvent?.delta?.length,
-    });
-    return;
-  }
-  logger.event("session.event", {
-    type: event.type,
-    toolName: event.toolName,
-    isError: event.isError,
-    attempt: event.attempt,
-    maxAttempts: event.maxAttempts,
-    delayMs: event.delayMs,
-    success: event.success,
-    errorMessage: event.errorMessage,
-    finalError: event.finalError,
-  });
-}
-
-function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, memoryStore, engine, ui, turnState, midTurnRecallHints, syncCurrentPiSidecar, autoNameSession }) {
-  closeAssistantReply({ ui, state: turnState });
-  const assistantRecallHints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
-  engine.setPendingAssistantRecallHints?.(assistantRecallHints);
-  const recordedAssistantRecallHints = uniqueHints([...midTurnRecallHints, ...assistantRecallHints]);
-
-  engine.recordTurn({
-    userMessage: userMessage ?? prompt.slice(0, 300),
-    assistantMessage: turnState.draft,
-    assistantContext: compactAssistantContext(turnState),
-    userRecallHints,
-    assistantRecallHints: recordedAssistantRecallHints,
-  });
-
-  autoNameSession?.();
-  syncCurrentPiSidecar();
-}
-
-function flushAssistantRecall({ memoryStore, engine, turnState, currentProject }) {
-  if (!memoryStore) return [];
-  const text = assistantRecallDeltaText(turnState);
-  advanceAssistantRecallCursor(turnState);
-  if (!text.trim()) return [];
-  return memoryStore.recallForAssistant(text, {
-    currentProject,
-    excludedIds: engine.getRecentRecallMemoryIds?.() ?? [],
-  });
-}
-
-function assistantRecallDeltaText(turnState) {
-  const cursor = turnState.recallCursor ?? { draftLength: 0, thinkingLength: 0 };
-  const thinking = assistantThinkingText(turnState);
-  return [
-    turnState.draft.slice(cursor.draftLength),
-    thinking.slice(cursor.thinkingLength),
-  ]
-    .filter(Boolean)
-    .join("\n");
-}
-
-function advanceAssistantRecallCursor(turnState) {
-  turnState.recallCursor = {
-    draftLength: turnState.draft.length,
-    thinkingLength: assistantThinkingText(turnState).length,
-  };
-}
-
-function assistantThinkingText(turnState) {
-  return `${turnState.thinkingAccumulator}${turnState.thinkingText}`;
-}
-
-function uniqueHints(hints) {
-  const seen = new Set();
-  const unique = [];
-  for (const hint of hints) {
-    if (!hint?.id || seen.has(hint.id)) continue;
-    seen.add(hint.id);
-    unique.push(hint);
-  }
-  return unique;
-}
-
-function resetPiMessageHistory(session) {
-  if (Array.isArray(session?.agent?.state?.messages)) {
-    session.agent.state.messages = [];
-  }
-}
+import { formatRecallHints } from "../../memory/markdown-store.mjs";
+import { resolveImageAttachmentReferences } from "../../session/attachment-references.mjs";
+import { closeAssistantReply, compactAssistantContext, createTurnEventState, handleRunnerSessionEvent } from "./turn-events.mjs";
+
+export async function runRunnerTurn({
+  prompt,
+  userMessage,
+  options = {},
+  sessionBinding,
+  engine,
+  ui,
+  projectMarchDir,
+  memoryStore,
+  setModelCallKind,
+  logger = null,
+  setPhase = null,
+  syncCurrentPiSidecar,
+  autoNameSession,
+  contextMode = "rebuild",
+}) {
+  const {
+    userRecallHints = [],
+    currentProject = "",
+  } = options;
+  const activeSession = sessionBinding.get();
+  const turnState = createTurnEventState();
+  const midTurnRecallHints = [];
+  ui.turnStart();
+  setPhase?.("subscribed");
+  logger?.event("turn.ui.start");
+
+  const unsubscribe = activeSession.subscribe((event) => {
+    logSessionEvent(logger, event);
+    if (event.type === "tool_execution_start") setPhase?.(`tool_running:${event.toolName ?? "unknown"}`);
+    if (event.type === "tool_execution_end") setPhase?.("model_streaming");
+    if (event.type === "auto_retry_start") setPhase?.("retry_wait");
+    if (event.type === "auto_retry_end") setPhase?.("model_streaming");
+    if (event.type === "message_update") setPhase?.("model_streaming");
+    handleRunnerSessionEvent(event, { ui, engine, state: turnState });
+    if (event.type === "tool_execution_start") {
+      const hints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
+      if (hints.length > 0) {
+        midTurnRecallHints.push(...hints);
+        queueMidTurnRecallHints(activeSession, hints, logger);
+        ui.memoryHint?.({ source: "assistant", hints });
+      }
+    }
+  });
+
+  try {
+    const attachmentReferences = resolveImageAttachmentReferences({
+      text: userMessage ?? prompt,
+      projectMarchDir,
+    });
+    logger?.event("turn.attachments.resolved", { imageCount: attachmentReferences.images.length });
+    setModelCallKind("user");
+    setPhase?.("model_request");
+    logger?.event("model.prompt.start", { contextMode });
+    try {
+      if (contextMode === "rebuild") resetPiMessageHistory(activeSession);
+      await activeSession.prompt(
+        contextMode === "continueExistingPiTranscript" ? (userMessage ?? prompt) : prompt,
+        attachmentReferences.images.length > 0 ? { images: attachmentReferences.images } : undefined,
+      );
+    } finally {
+      setModelCallKind("model");
+      logger?.event("model.prompt.end");
+    }
+
+    setPhase?.("finalizing");
+    finalizeTurn({
+      prompt,
+      userMessage,
+      userRecallHints,
+      currentProject,
+      memoryStore,
+      engine,
+      ui,
+      turnState,
+      midTurnRecallHints,
+      syncCurrentPiSidecar,
+      autoNameSession,
+    });
+    return { draft: turnState.draft };
+  } finally {
+    logger?.event("turn.ui.end");
+    ui.turnEnd();
+    unsubscribe();
+  }
+}
+
+function queueMidTurnRecallHints(session, hints, logger) {
+  const content = formatRecallHints("assistant", hints);
+  if (!content) return;
+  const injected = session.sendCustomMessage?.({
+    customType: "march.memory_hint",
+    content,
+    display: false,
+    details: { source: "assistant" },
+  }, { deliverAs: "steer" });
+  void injected?.catch?.((err) => {
+    logger?.debug("memory.mid_turn_recall.inject_failed", { errorMessage: err?.message ?? String(err) });
+  });
+}
+
+function logSessionEvent(logger, event) {
+  if (!logger) return;
+  if (event.type === "message_update") {
+    const messageEvent = event.assistantMessageEvent;
+    logger.debug("session.event", {
+      type: event.type,
+      assistantMessageType: messageEvent?.type,
+      deltaLength: messageEvent?.delta?.length,
+    });
+    return;
+  }
+  logger.event("session.event", {
+    type: event.type,
+    toolName: event.toolName,
+    isError: event.isError,
+    attempt: event.attempt,
+    maxAttempts: event.maxAttempts,
+    delayMs: event.delayMs,
+    success: event.success,
+    errorMessage: event.errorMessage,
+    finalError: event.finalError,
+  });
+}
+
+function finalizeTurn({ prompt, userMessage, userRecallHints, currentProject, memoryStore, engine, ui, turnState, midTurnRecallHints, syncCurrentPiSidecar, autoNameSession }) {
+  closeAssistantReply({ ui, state: turnState });
+  const assistantRecallHints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
+  engine.setPendingAssistantRecallHints?.(assistantRecallHints);
+  const recordedAssistantRecallHints = uniqueHints([...midTurnRecallHints, ...assistantRecallHints]);
+
+  engine.recordTurn({
+    userMessage: userMessage ?? prompt.slice(0, 300),
+    assistantMessage: turnState.draft,
+    assistantContext: compactAssistantContext(turnState),
+    userRecallHints,
+    assistantRecallHints: recordedAssistantRecallHints,
+  });
+
+  autoNameSession?.();
+  syncCurrentPiSidecar();
+}
+
+function flushAssistantRecall({ memoryStore, engine, turnState, currentProject }) {
+  if (!memoryStore) return [];
+  const text = assistantRecallDeltaText(turnState);
+  advanceAssistantRecallCursor(turnState);
+  if (!text.trim()) return [];
+  return memoryStore.recallForAssistant(text, {
+    currentProject,
+    excludedIds: engine.getRecentRecallMemoryIds?.() ?? [],
+  });
+}
+
+function assistantRecallDeltaText(turnState) {
+  const cursor = turnState.recallCursor ?? { draftLength: 0, thinkingLength: 0 };
+  const thinking = assistantThinkingText(turnState);
+  return [
+    turnState.draft.slice(cursor.draftLength),
+    thinking.slice(cursor.thinkingLength),
+  ]
+    .filter(Boolean)
+    .join("\n");
+}
+
+function advanceAssistantRecallCursor(turnState) {
+  turnState.recallCursor = {
+    draftLength: turnState.draft.length,
+    thinkingLength: assistantThinkingText(turnState).length,
+  };
+}
+
+function assistantThinkingText(turnState) {
+  return `${turnState.thinkingAccumulator}${turnState.thinkingText}`;
+}
+
+function uniqueHints(hints) {
+  const seen = new Set();
+  const unique = [];
+  for (const hint of hints) {
+    if (!hint?.id || seen.has(hint.id)) continue;
+    seen.add(hint.id);
+    unique.push(hint);
+  }
+  return unique;
+}
+
+function resetPiMessageHistory(session) {
+  if (Array.isArray(session?.agent?.state?.messages)) {
+    session.agent.state.messages = [];
+  }
+}

package/src/agent/vision-capability.mjs

@@ -1,14 +1,14 @@
-export function modelSupportsImageInput(model) {
-  if (!model || typeof model !== "object") return false;
-  if (Array.isArray(model.input) && model.input.includes("image")) return true;
-  if (model.capabilities?.images === true || model.capabilities?.vision === true) return true;
-  return false;
-}
-
-export function currentModelImageInputError(getCurrentModel) {
-  if (typeof getCurrentModel !== "function") return null;
-  const model = getCurrentModel();
-  if (modelSupportsImageInput(model)) return null;
-  const label = model ? `${model.name || model.id || "unknown"} (${model.provider || "unknown provider"})` : "unknown";
-  return `Current model does not support image input: ${label}. Switch to a vision-capable model before using read_image or screen.`;
-}
+export function modelSupportsImageInput(model) {
+  if (!model || typeof model !== "object") return false;
+  if (Array.isArray(model.input) && model.input.includes("image")) return true;
+  if (model.capabilities?.images === true || model.capabilities?.vision === true) return true;
+  return false;
+}
+
+export function currentModelImageInputError(getCurrentModel) {
+  if (typeof getCurrentModel !== "function") return null;
+  const model = getCurrentModel();
+  if (modelSupportsImageInput(model)) return null;
+  const label = model ? `${model.name || model.id || "unknown"} (${model.provider || "unknown provider"})` : "unknown";
+  return `Current model does not support image input: ${label}. Switch to a vision-capable model before using read_image or screen.`;
+}

package/src/auth/login-command.mjs

@@ -1,90 +1,90 @@
-import { createInterface } from "node:readline";
-import { homedir } from "node:os";
-import { AuthStorage } from "@earendil-works/pi-coding-agent";
-import { getMarchAuthPath } from "./storage.mjs";
-
-export async function runLoginCommand({
-  providerId,
-  homeDir = homedir(),
-  authPath = getMarchAuthPath(homeDir),
-  authStorage = AuthStorage.create(authPath),
-  input = process.stdin,
-  output = process.stdout,
-} = {}) {
-  const providers = authStorage.getOAuthProviders?.() ?? [];
-  const selectedProvider = providerId || await selectProvider({ providers, input, output });
-  if (!selectedProvider) {
-    output.write("Login cancelled.\n");
-    return 1;
-  }
-
-  if (!providers.some((provider) => provider.id === selectedProvider)) {
-    output.write(`Unknown OAuth provider: ${selectedProvider}\n`);
-    output.write(formatProviderList(providers));
-    return 1;
-  }
-
-  const rl = createInterface({ input, output });
-  try {
-    output.write(`Logging in to ${selectedProvider}...\n`);
-    await authStorage.login(selectedProvider, {
-      onAuth: (info) => {
-        output.write(`\nOpen this URL in your browser:\n${info.url}\n`);
-        if (info.instructions) output.write(`${info.instructions}\n`);
-        output.write("\n");
-      },
-      onPrompt: (prompt) => ask(rl, `${prompt.message}${prompt.placeholder ? ` (${prompt.placeholder})` : ""}: `),
-      onManualCodeInput: () => ask(rl, "Paste redirect URL or code: "),
-      onProgress: (message) => output.write(`${message}\n`),
-      onSelect: async (prompt) => selectOption({ prompt, rl, output }),
-    });
-    output.write(`\nCredentials saved to ${authPath}\n`);
-    return 0;
-  } finally {
-    rl.close();
-  }
-}
-
-export function formatProviderList(providers) {
-  if (!providers.length) return "No OAuth providers are available.\n";
-  const lines = ["Available OAuth providers:"];
-  for (const provider of providers) {
-    lines.push(`  ${provider.id.padEnd(20)} ${provider.name}`);
-  }
-  return `${lines.join("\n")}\n`;
-}
-
-async function selectProvider({ providers, input, output }) {
-  if (providers.length === 1) return providers[0].id;
-  output.write(`${formatProviderList(providers)}\n`);
-  const rl = createInterface({ input, output });
-  try {
-    const answer = await ask(rl, `Enter provider id or number (1-${providers.length}): `);
-    return resolveSelection(answer, providers.map((provider) => ({ id: provider.id, label: provider.name })));
-  } finally {
-    rl.close();
-  }
-}
-
-async function selectOption({ prompt, rl, output }) {
-  output.write(`${prompt.message}\n`);
-  for (let i = 0; i < prompt.options.length; i++) {
-    const option = prompt.options[i];
-    output.write(`  ${i + 1}. ${option.label} (${option.id})\n`);
-  }
-  const answer = await ask(rl, `Enter option id or number (1-${prompt.options.length}): `);
-  return resolveSelection(answer, prompt.options);
-}
-
-function resolveSelection(answer, options) {
-  const trimmed = answer.trim();
-  const index = Number.parseInt(trimmed, 10);
-  if (Number.isInteger(index) && String(index) === trimmed && index >= 1 && index <= options.length) {
-    return options[index - 1].id;
-  }
-  return options.some((option) => option.id === trimmed) ? trimmed : undefined;
-}
-
-function ask(rl, question) {
-  return new Promise((resolve) => rl.question(question, resolve));
-}
+import { createInterface } from "node:readline";
+import { homedir } from "node:os";
+import { AuthStorage } from "@earendil-works/pi-coding-agent";
+import { getMarchAuthPath } from "./storage.mjs";
+
+export async function runLoginCommand({
+  providerId,
+  homeDir = homedir(),
+  authPath = getMarchAuthPath(homeDir),
+  authStorage = AuthStorage.create(authPath),
+  input = process.stdin,
+  output = process.stdout,
+} = {}) {
+  const providers = authStorage.getOAuthProviders?.() ?? [];
+  const selectedProvider = providerId || await selectProvider({ providers, input, output });
+  if (!selectedProvider) {
+    output.write("Login cancelled.\n");
+    return 1;
+  }
+
+  if (!providers.some((provider) => provider.id === selectedProvider)) {
+    output.write(`Unknown OAuth provider: ${selectedProvider}\n`);
+    output.write(formatProviderList(providers));
+    return 1;
+  }
+
+  const rl = createInterface({ input, output });
+  try {
+    output.write(`Logging in to ${selectedProvider}...\n`);
+    await authStorage.login(selectedProvider, {
+      onAuth: (info) => {
+        output.write(`\nOpen this URL in your browser:\n${info.url}\n`);
+        if (info.instructions) output.write(`${info.instructions}\n`);
+        output.write("\n");
+      },
+      onPrompt: (prompt) => ask(rl, `${prompt.message}${prompt.placeholder ? ` (${prompt.placeholder})` : ""}: `),
+      onManualCodeInput: () => ask(rl, "Paste redirect URL or code: "),
+      onProgress: (message) => output.write(`${message}\n`),
+      onSelect: async (prompt) => selectOption({ prompt, rl, output }),
+    });
+    output.write(`\nCredentials saved to ${authPath}\n`);
+    return 0;
+  } finally {
+    rl.close();
+  }
+}
+
+export function formatProviderList(providers) {
+  if (!providers.length) return "No OAuth providers are available.\n";
+  const lines = ["Available OAuth providers:"];
+  for (const provider of providers) {
+    lines.push(`  ${provider.id.padEnd(20)} ${provider.name}`);
+  }
+  return `${lines.join("\n")}\n`;
+}
+
+async function selectProvider({ providers, input, output }) {
+  if (providers.length === 1) return providers[0].id;
+  output.write(`${formatProviderList(providers)}\n`);
+  const rl = createInterface({ input, output });
+  try {
+    const answer = await ask(rl, `Enter provider id or number (1-${providers.length}): `);
+    return resolveSelection(answer, providers.map((provider) => ({ id: provider.id, label: provider.name })));
+  } finally {
+    rl.close();
+  }
+}
+
+async function selectOption({ prompt, rl, output }) {
+  output.write(`${prompt.message}\n`);
+  for (let i = 0; i < prompt.options.length; i++) {
+    const option = prompt.options[i];
+    output.write(`  ${i + 1}. ${option.label} (${option.id})\n`);
+  }
+  const answer = await ask(rl, `Enter option id or number (1-${prompt.options.length}): `);
+  return resolveSelection(answer, prompt.options);
+}
+
+function resolveSelection(answer, options) {
+  const trimmed = answer.trim();
+  const index = Number.parseInt(trimmed, 10);
+  if (Number.isInteger(index) && String(index) === trimmed && index >= 1 && index <= options.length) {
+    return options[index - 1].id;
+  }
+  return options.some((option) => option.id === trimmed) ? trimmed : undefined;
+}
+
+function ask(rl, question) {
+  return new Promise((resolve) => rl.question(question, resolve));
+}