march-cli 0.1.24 → 0.1.26

package/src/agent/screen-tools/screen-tool.mjs

@@ -1,49 +1,49 @@
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { currentModelImageInputError } from "../vision-capability.mjs";
-import { captureScreenWindows } from "./windows-screen.mjs";
-
-export function createScreenTool({ getCurrentModel = null, captureScreenImpl = captureScreenWindows } = {}) {
-  return defineTool({
-    name: "screen",
-    label: "Screen Capture",
-    description: "Capture the current desktop or a visible window and send it to the model as an image attachment.",
-    parameters: Type.Object({
-      target: Type.Optional(Type.String({ description: "desktop (default) or window" })),
-      windowId: Type.Optional(Type.String({ description: "Window id from list_windows when target is window" })),
-    }),
-    execute: async (_toolCallId, params = {}) => captureScreenTool({ getCurrentModel, captureScreenImpl, ...params }),
-  });
-}
-
-export function captureScreenTool({ getCurrentModel = null, captureScreenImpl = captureScreenWindows, target = "desktop", windowId = null } = {}) {
-  const capabilityError = currentModelImageInputError(getCurrentModel);
-  if (capabilityError) return screenError(capabilityError, { unsupportedModel: true });
-  const normalizedTarget = target === "window" ? "window" : "desktop";
-  const result = captureScreenImpl({ target: normalizedTarget, windowId });
-  if (!result?.ok) return screenError(`Error capturing screen: ${result?.message || "unknown error"}`, { target: normalizedTarget, windowId });
-
-  const bounds = result.bounds ?? {};
-  const label = normalizedTarget === "window" ? `window ${result.windowId || windowId}` : "desktop";
-  return {
-    content: [
-      { type: "text", text: `Captured ${label} screenshot\nMIME: ${result.mimeType || "image/png"}\nBounds: ${formatBounds(bounds)}` },
-      { type: "image", data: result.data, mimeType: result.mimeType || "image/png" },
-    ],
-    details: {
-      target: normalizedTarget,
-      windowId: result.windowId ?? windowId ?? undefined,
-      bounds,
-      mimeType: result.mimeType || "image/png",
-    },
-  };
-}
-
-function screenError(text, details = {}) {
-  return { content: [{ type: "text", text }], details: { ...details, error: true } };
-}
-
-function formatBounds(bounds) {
-  const { x = 0, y = 0, width = 0, height = 0 } = bounds ?? {};
-  return `${width}x${height} at ${x},${y}`;
-}
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { currentModelImageInputError } from "../vision-capability.mjs";
+import { captureScreenWindows } from "./windows-screen.mjs";
+
+export function createScreenTool({ getCurrentModel = null, captureScreenImpl = captureScreenWindows } = {}) {
+  return defineTool({
+    name: "screen",
+    label: "Screen Capture",
+    description: "Capture the current desktop or a visible window and send it to the model as an image attachment.",
+    parameters: Type.Object({
+      target: Type.Optional(Type.String({ description: "desktop (default) or window" })),
+      windowId: Type.Optional(Type.String({ description: "Window id from list_windows when target is window" })),
+    }),
+    execute: async (_toolCallId, params = {}) => captureScreenTool({ getCurrentModel, captureScreenImpl, ...params }),
+  });
+}
+
+export function captureScreenTool({ getCurrentModel = null, captureScreenImpl = captureScreenWindows, target = "desktop", windowId = null } = {}) {
+  const capabilityError = currentModelImageInputError(getCurrentModel);
+  if (capabilityError) return screenError(capabilityError, { unsupportedModel: true });
+  const normalizedTarget = target === "window" ? "window" : "desktop";
+  const result = captureScreenImpl({ target: normalizedTarget, windowId });
+  if (!result?.ok) return screenError(`Error capturing screen: ${result?.message || "unknown error"}`, { target: normalizedTarget, windowId });
+
+  const bounds = result.bounds ?? {};
+  const label = normalizedTarget === "window" ? `window ${result.windowId || windowId}` : "desktop";
+  return {
+    content: [
+      { type: "text", text: `Captured ${label} screenshot\nMIME: ${result.mimeType || "image/png"}\nBounds: ${formatBounds(bounds)}` },
+      { type: "image", data: result.data, mimeType: result.mimeType || "image/png" },
+    ],
+    details: {
+      target: normalizedTarget,
+      windowId: result.windowId ?? windowId ?? undefined,
+      bounds,
+      mimeType: result.mimeType || "image/png",
+    },
+  };
+}
+
+function screenError(text, details = {}) {
+  return { content: [{ type: "text", text }], details: { ...details, error: true } };
+}
+
+function formatBounds(bounds) {
+  const { x = 0, y = 0, width = 0, height = 0 } = bounds ?? {};
+  return `${width}x${height} at ${x},${y}`;
+}

package/src/agent/screen-tools/windows-screen.mjs

@@ -1,133 +1,133 @@
-import { execFileSync } from "node:child_process";
-
-const POWERSHELL = process.env.SystemRoot ? `${process.env.SystemRoot}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` : "powershell.exe";
-const MAX_BUFFER = 80 * 1024 * 1024;
-
-export function listWindowsWindows() {
-  return runJson(LIST_WINDOWS_SCRIPT);
-}
-
-export function captureScreenWindows({ target = "desktop", windowId = null } = {}) {
-  if (target === "window") {
-    if (!windowId) return { ok: false, message: "windowId is required when target is window" };
-    return runJson(CAPTURE_WINDOW_SCRIPT.replace("__WINDOW_ID__", escapePowershellString(windowId)));
-  }
-  return runJson(CAPTURE_DESKTOP_SCRIPT);
-}
-
-function runJson(script) {
-  if (process.platform !== "win32") return { ok: false, message: `screen tools are not supported on ${process.platform}` };
-  try {
-    const output = execFileSync(POWERSHELL, ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script], {
-      encoding: "utf8",
-      maxBuffer: MAX_BUFFER,
-      windowsHide: true,
-    }).trim();
-    return JSON.parse(output);
-  } catch (err) {
-    return { ok: false, message: `failed to run Windows screen capture: ${err.stderr || err.message}` };
-  }
-}
-
-function escapePowershellString(value) {
-  return String(value).replaceAll("'", "''");
-}
-
-const WIN32_TYPE = String.raw`
-using System;
-using System.Text;
-using System.Runtime.InteropServices;
-public static class MarchWin32 {
-  public delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
-  [StructLayout(LayoutKind.Sequential)] public struct RECT { public int Left; public int Top; public int Right; public int Bottom; }
-  [DllImport("user32.dll")] public static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
-  [DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr hWnd);
-  [DllImport("user32.dll")] public static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
-  [DllImport("user32.dll")] public static extern int GetWindowTextLength(IntPtr hWnd);
-  [DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr hWnd, out RECT rect);
-  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
-  [DllImport("user32.dll")] public static extern bool IsIconic(IntPtr hWnd);
-}
-`;
-
-const LIST_WINDOWS_SCRIPT = String.raw`
-Add-Type -TypeDefinition @'
-${WIN32_TYPE}
-'@
-$items = New-Object System.Collections.Generic.List[object]
-[MarchWin32]::EnumWindows({ param($hwnd, $lparam)
-  if (-not [MarchWin32]::IsWindowVisible($hwnd)) { return $true }
-  $length = [MarchWin32]::GetWindowTextLength($hwnd)
-  if ($length -le 0) { return $true }
-  $builder = New-Object System.Text.StringBuilder ($length + 1)
-  [void][MarchWin32]::GetWindowText($hwnd, $builder, $builder.Capacity)
-  $rect = New-Object MarchWin32+RECT
-  if (-not [MarchWin32]::GetWindowRect($hwnd, [ref]$rect)) { return $true }
-  $width = $rect.Right - $rect.Left
-  $height = $rect.Bottom - $rect.Top
-  if ($width -le 0 -or $height -le 0) { return $true }
-  $pidValue = 0
-  [void][MarchWin32]::GetWindowThreadProcessId($hwnd, [ref]$pidValue)
-  $processName = $null
-  try { $processName = (Get-Process -Id $pidValue -ErrorAction Stop).ProcessName } catch {}
-  $items.Add([ordered]@{
-    id = ("0x{0:x}" -f $hwnd.ToInt64())
-    title = $builder.ToString()
-    process = $processName
-    pid = $pidValue
-    bounds = [ordered]@{ x = $rect.Left; y = $rect.Top; width = $width; height = $height }
-    minimized = [MarchWin32]::IsIconic($hwnd)
-  }) | Out-Null
-  return $true
-}, [IntPtr]::Zero) | Out-Null
-[ordered]@{ ok = $true; windows = $items } | ConvertTo-Json -Compress -Depth 5
-`;
-
-const CAPTURE_DESKTOP_SCRIPT = String.raw`
-Add-Type -AssemblyName System.Windows.Forms
-Add-Type -AssemblyName System.Drawing
-$bounds = [System.Windows.Forms.SystemInformation]::VirtualScreen
-$bitmap = New-Object System.Drawing.Bitmap $bounds.Width, $bounds.Height
-$graphics = [System.Drawing.Graphics]::FromImage($bitmap)
-$graphics.CopyFromScreen($bounds.Left, $bounds.Top, 0, 0, $bounds.Size)
-$stream = New-Object System.IO.MemoryStream
-$bitmap.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
-$graphics.Dispose(); $bitmap.Dispose()
-[ordered]@{
-  ok = $true; data = [Convert]::ToBase64String($stream.ToArray()); mimeType = "image/png";
-  target = "desktop"; bounds = [ordered]@{ x = $bounds.Left; y = $bounds.Top; width = $bounds.Width; height = $bounds.Height }
-} | ConvertTo-Json -Compress -Depth 5
-`;
-
-const CAPTURE_WINDOW_SCRIPT = String.raw`
-Add-Type -AssemblyName System.Drawing
-Add-Type -TypeDefinition @'
-${WIN32_TYPE}
-'@
-$rawId = '__WINDOW_ID__'
-$hex = $rawId -replace '^0x',''
-try { $hwnd = [IntPtr]::new([Convert]::ToInt64($hex, 16)) } catch {
-  [ordered]@{ ok = $false; message = "invalid windowId: $rawId" } | ConvertTo-Json -Compress; exit 0
-}
-if ([MarchWin32]::IsIconic($hwnd)) {
-  [ordered]@{ ok = $false; message = "window is minimized and cannot be captured" } | ConvertTo-Json -Compress; exit 0
-}
-$rect = New-Object MarchWin32+RECT
-if (-not [MarchWin32]::GetWindowRect($hwnd, [ref]$rect)) {
-  [ordered]@{ ok = $false; message = "window not found: $rawId" } | ConvertTo-Json -Compress; exit 0
-}
-$width = $rect.Right - $rect.Left; $height = $rect.Bottom - $rect.Top
-if ($width -le 0 -or $height -le 0) {
-  [ordered]@{ ok = $false; message = "window has empty bounds: $rawId" } | ConvertTo-Json -Compress; exit 0
-}
-$bitmap = New-Object System.Drawing.Bitmap $width, $height
-$graphics = [System.Drawing.Graphics]::FromImage($bitmap)
-$graphics.CopyFromScreen($rect.Left, $rect.Top, 0, 0, (New-Object System.Drawing.Size $width, $height))
-$stream = New-Object System.IO.MemoryStream
-$bitmap.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
-$graphics.Dispose(); $bitmap.Dispose()
-[ordered]@{
-  ok = $true; data = [Convert]::ToBase64String($stream.ToArray()); mimeType = "image/png";
-  target = "window"; windowId = $rawId; bounds = [ordered]@{ x = $rect.Left; y = $rect.Top; width = $width; height = $height }
-} | ConvertTo-Json -Compress -Depth 5
-`;
+import { execFileSync } from "node:child_process";
+
+const POWERSHELL = process.env.SystemRoot ? `${process.env.SystemRoot}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` : "powershell.exe";
+const MAX_BUFFER = 80 * 1024 * 1024;
+
+export function listWindowsWindows() {
+  return runJson(LIST_WINDOWS_SCRIPT);
+}
+
+export function captureScreenWindows({ target = "desktop", windowId = null } = {}) {
+  if (target === "window") {
+    if (!windowId) return { ok: false, message: "windowId is required when target is window" };
+    return runJson(CAPTURE_WINDOW_SCRIPT.replace("__WINDOW_ID__", escapePowershellString(windowId)));
+  }
+  return runJson(CAPTURE_DESKTOP_SCRIPT);
+}
+
+function runJson(script) {
+  if (process.platform !== "win32") return { ok: false, message: `screen tools are not supported on ${process.platform}` };
+  try {
+    const output = execFileSync(POWERSHELL, ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script], {
+      encoding: "utf8",
+      maxBuffer: MAX_BUFFER,
+      windowsHide: true,
+    }).trim();
+    return JSON.parse(output);
+  } catch (err) {
+    return { ok: false, message: `failed to run Windows screen capture: ${err.stderr || err.message}` };
+  }
+}
+
+function escapePowershellString(value) {
+  return String(value).replaceAll("'", "''");
+}
+
+const WIN32_TYPE = String.raw`
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+public static class MarchWin32 {
+  public delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+  [StructLayout(LayoutKind.Sequential)] public struct RECT { public int Left; public int Top; public int Right; public int Bottom; }
+  [DllImport("user32.dll")] public static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+  [DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr hWnd);
+  [DllImport("user32.dll")] public static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
+  [DllImport("user32.dll")] public static extern int GetWindowTextLength(IntPtr hWnd);
+  [DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr hWnd, out RECT rect);
+  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
+  [DllImport("user32.dll")] public static extern bool IsIconic(IntPtr hWnd);
+}
+`;
+
+const LIST_WINDOWS_SCRIPT = String.raw`
+Add-Type -TypeDefinition @'
+${WIN32_TYPE}
+'@
+$items = New-Object System.Collections.Generic.List[object]
+[MarchWin32]::EnumWindows({ param($hwnd, $lparam)
+  if (-not [MarchWin32]::IsWindowVisible($hwnd)) { return $true }
+  $length = [MarchWin32]::GetWindowTextLength($hwnd)
+  if ($length -le 0) { return $true }
+  $builder = New-Object System.Text.StringBuilder ($length + 1)
+  [void][MarchWin32]::GetWindowText($hwnd, $builder, $builder.Capacity)
+  $rect = New-Object MarchWin32+RECT
+  if (-not [MarchWin32]::GetWindowRect($hwnd, [ref]$rect)) { return $true }
+  $width = $rect.Right - $rect.Left
+  $height = $rect.Bottom - $rect.Top
+  if ($width -le 0 -or $height -le 0) { return $true }
+  $pidValue = 0
+  [void][MarchWin32]::GetWindowThreadProcessId($hwnd, [ref]$pidValue)
+  $processName = $null
+  try { $processName = (Get-Process -Id $pidValue -ErrorAction Stop).ProcessName } catch {}
+  $items.Add([ordered]@{
+    id = ("0x{0:x}" -f $hwnd.ToInt64())
+    title = $builder.ToString()
+    process = $processName
+    pid = $pidValue
+    bounds = [ordered]@{ x = $rect.Left; y = $rect.Top; width = $width; height = $height }
+    minimized = [MarchWin32]::IsIconic($hwnd)
+  }) | Out-Null
+  return $true
+}, [IntPtr]::Zero) | Out-Null
+[ordered]@{ ok = $true; windows = $items } | ConvertTo-Json -Compress -Depth 5
+`;
+
+const CAPTURE_DESKTOP_SCRIPT = String.raw`
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+$bounds = [System.Windows.Forms.SystemInformation]::VirtualScreen
+$bitmap = New-Object System.Drawing.Bitmap $bounds.Width, $bounds.Height
+$graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+$graphics.CopyFromScreen($bounds.Left, $bounds.Top, 0, 0, $bounds.Size)
+$stream = New-Object System.IO.MemoryStream
+$bitmap.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
+$graphics.Dispose(); $bitmap.Dispose()
+[ordered]@{
+  ok = $true; data = [Convert]::ToBase64String($stream.ToArray()); mimeType = "image/png";
+  target = "desktop"; bounds = [ordered]@{ x = $bounds.Left; y = $bounds.Top; width = $bounds.Width; height = $bounds.Height }
+} | ConvertTo-Json -Compress -Depth 5
+`;
+
+const CAPTURE_WINDOW_SCRIPT = String.raw`
+Add-Type -AssemblyName System.Drawing
+Add-Type -TypeDefinition @'
+${WIN32_TYPE}
+'@
+$rawId = '__WINDOW_ID__'
+$hex = $rawId -replace '^0x',''
+try { $hwnd = [IntPtr]::new([Convert]::ToInt64($hex, 16)) } catch {
+  [ordered]@{ ok = $false; message = "invalid windowId: $rawId" } | ConvertTo-Json -Compress; exit 0
+}
+if ([MarchWin32]::IsIconic($hwnd)) {
+  [ordered]@{ ok = $false; message = "window is minimized and cannot be captured" } | ConvertTo-Json -Compress; exit 0
+}
+$rect = New-Object MarchWin32+RECT
+if (-not [MarchWin32]::GetWindowRect($hwnd, [ref]$rect)) {
+  [ordered]@{ ok = $false; message = "window not found: $rawId" } | ConvertTo-Json -Compress; exit 0
+}
+$width = $rect.Right - $rect.Left; $height = $rect.Bottom - $rect.Top
+if ($width -le 0 -or $height -le 0) {
+  [ordered]@{ ok = $false; message = "window has empty bounds: $rawId" } | ConvertTo-Json -Compress; exit 0
+}
+$bitmap = New-Object System.Drawing.Bitmap $width, $height
+$graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+$graphics.CopyFromScreen($rect.Left, $rect.Top, 0, 0, (New-Object System.Drawing.Size $width, $height))
+$stream = New-Object System.IO.MemoryStream
+$bitmap.Save($stream, [System.Drawing.Imaging.ImageFormat]::Png)
+$graphics.Dispose(); $bitmap.Dispose()
+[ordered]@{
+  ok = $true; data = [Convert]::ToBase64String($stream.ToArray()); mimeType = "image/png";
+  target = "window"; windowId = $rawId; bounds = [ordered]@{ x = $rect.Left; y = $rect.Top; width = $width; height = $height }
+} | ConvertTo-Json -Compress -Depth 5
+`;

package/src/agent/session/session-auto-name.mjs

@@ -1,41 +1,41 @@
-const MAX_SESSION_NAME_LENGTH = 60;
-
-export function maybeAutoNameSession({ engine, session, setSessionName }) {
-  if (engine?.sessionName || session?.sessionName) return null;
-  if (!Array.isArray(engine?.turns) || engine.turns.length !== 1) return null;
-  if (typeof setSessionName !== "function") return null;
-
-  const title = generateSessionName(engine.turns[0]);
-  if (!title) return null;
-  return setSessionName(title);
-}
-
-export function generateSessionName(turn) {
-  const text = normalizeTitleSource(turn?.userMessage) || normalizeTitleSource(turn?.assistantMessage);
-  if (!text) return "New session";
-  return truncateTitle(stripPromptNoise(text), MAX_SESSION_NAME_LENGTH) || "New session";
-}
-
-function normalizeTitleSource(value) {
-  return String(value ?? "")
-    .replace(/```[\s\S]*?```/g, " ")
-    .replace(/`([^`]+)`/g, "$1")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
-function stripPromptNoise(text) {
-  return text
-    .replace(/^[@#>\-\s]+/, "")
-    .replace(/^(please|pls|can you|could you|help me|帮我|请)\s+/i, "")
-    .replace(/[.。!?！？,:;，：；]+$/g, "")
-    .trim();
-}
-
-function truncateTitle(text, maxLength) {
-  if (text.length <= maxLength) return text;
-  const sliced = text.slice(0, maxLength).trimEnd();
-  const lastSpace = sliced.lastIndexOf(" ");
-  if (lastSpace >= Math.floor(maxLength * 0.6)) return sliced.slice(0, lastSpace);
-  return sliced;
-}
+const MAX_SESSION_NAME_LENGTH = 60;
+
+export function maybeAutoNameSession({ engine, session, setSessionName }) {
+  if (engine?.sessionName || session?.sessionName) return null;
+  if (!Array.isArray(engine?.turns) || engine.turns.length !== 1) return null;
+  if (typeof setSessionName !== "function") return null;
+
+  const title = generateSessionName(engine.turns[0]);
+  if (!title) return null;
+  return setSessionName(title);
+}
+
+export function generateSessionName(turn) {
+  const text = normalizeTitleSource(turn?.userMessage) || normalizeTitleSource(turn?.assistantMessage);
+  if (!text) return "New session";
+  return truncateTitle(stripPromptNoise(text), MAX_SESSION_NAME_LENGTH) || "New session";
+}
+
+function normalizeTitleSource(value) {
+  return String(value ?? "")
+    .replace(/```[\s\S]*?```/g, " ")
+    .replace(/`([^`]+)`/g, "$1")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
+function stripPromptNoise(text) {
+  return text
+    .replace(/^[@#>\-\s]+/, "")
+    .replace(/^(please|pls|can you|could you|help me|帮我|请)\s+/i, "")
+    .replace(/[.。!?！？,:;，：；]+$/g, "")
+    .trim();
+}
+
+function truncateTitle(text, maxLength) {
+  if (text.length <= maxLength) return text;
+  const sliced = text.slice(0, maxLength).trimEnd();
+  const lastSpace = sliced.lastIndexOf(" ");
+  if (lastSpace >= Math.floor(maxLength * 0.6)) return sliced.slice(0, lastSpace);
+  return sliced;
+}

package/src/agent/session/session-binding.mjs

@@ -1,12 +1,12 @@
-export function createSessionBinding(initialSession) {
-  let current = initialSession;
-  return {
-    get() {
-      return current;
-    },
-    set(nextSession) {
-      current = nextSession;
-      return current;
-    },
-  };
-}
+export function createSessionBinding(initialSession) {
+  let current = initialSession;
+  return {
+    get() {
+      return current;
+    },
+    set(nextSession) {
+      current = nextSession;
+      return current;
+    },
+  };
+}

package/src/agent/session/session-options.mjs

@@ -1,47 +1,47 @@
-import { getModel } from "@earendil-works/pi-ai";
-import { MARCH_BASE_TOOL_NAMES } from "../tool-names.mjs";
-import { createMarchCustomTools } from "../tools.mjs";
-
-export function resolveRunnerSessionOptions({
-  cwd,
-  provider,
-  modelId,
-  modelRegistry,
-  engine,
-  ui,
-  memoryTools = [],
-  shellRuntime = null,
-  lspService = null,
-  mcpTools = [],
-  webTools = [],
-  permissionController = null,
-  authStorage = null,
-  projectMarchDir = null,
-  getCurrentModel = null,
-}) {
-  if (engine.cwd !== cwd) {
-    throw new Error(`Runtime session cwd mismatch: engine=${engine.cwd}, session=${cwd}`);
-  }
-
-  const availableModels = modelRegistry.getAvailable?.() ?? [];
-  const model = (provider && modelId ? modelRegistry.find(provider, modelId) : null)
-    ?? availableModels[0]
-    ?? (provider && modelId ? getModel(provider, modelId) : null);
-  if (!model) throw new Error(`Model not found: ${provider}/${modelId}`);
-
-  const customTools = createMarchCustomTools({ cwd, engine, ui, memoryTools, shellRuntime, lspService, mcpTools, webTools, permissionController, authStorage, projectMarchDir, getCurrentModel: () => getCurrentModel?.() ?? model });
-  const customToolNames = customTools.map((tool) => tool.name);
-  const tools = [
-    ...customToolNames.filter((name) => name === "read"),
-    ...MARCH_BASE_TOOL_NAMES,
-    ...customToolNames.filter((name) => name !== "read"),
-  ];
-
-  return {
-    model,
-    thinkingLevel: "medium",
-    customTools,
-    tools,
-    scopedModels: availableModels.map((model) => ({ model })),
-  };
-}
+import { getModel } from "@earendil-works/pi-ai";
+import { MARCH_BASE_TOOL_NAMES } from "../tool-names.mjs";
+import { createMarchCustomTools } from "../tools.mjs";
+
+export function resolveRunnerSessionOptions({
+  cwd,
+  provider,
+  modelId,
+  modelRegistry,
+  engine,
+  ui,
+  memoryTools = [],
+  shellRuntime = null,
+  lspService = null,
+  mcpTools = [],
+  webTools = [],
+  permissionController = null,
+  authStorage = null,
+  projectMarchDir = null,
+  getCurrentModel = null,
+}) {
+  if (engine.cwd !== cwd) {
+    throw new Error(`Runtime session cwd mismatch: engine=${engine.cwd}, session=${cwd}`);
+  }
+
+  const availableModels = modelRegistry.getAvailable?.() ?? [];
+  const model = (provider && modelId ? modelRegistry.find(provider, modelId) : null)
+    ?? availableModels[0]
+    ?? (provider && modelId ? getModel(provider, modelId) : null);
+  if (!model) throw new Error(`Model not found: ${provider}/${modelId}`);
+
+  const customTools = createMarchCustomTools({ cwd, engine, ui, memoryTools, shellRuntime, lspService, mcpTools, webTools, permissionController, authStorage, projectMarchDir, getCurrentModel: () => getCurrentModel?.() ?? model });
+  const customToolNames = customTools.map((tool) => tool.name);
+  const tools = [
+    ...customToolNames.filter((name) => name === "read"),
+    ...MARCH_BASE_TOOL_NAMES,
+    ...customToolNames.filter((name) => name !== "read"),
+  ];
+
+  return {
+    model,
+    thinkingLevel: "medium",
+    customTools,
+    tools,
+    scopedModels: availableModels.map((model) => ({ model })),
+  };
+}

package/src/agent/tool-names.mjs

@@ -1 +1 @@
-export const MARCH_BASE_TOOL_NAMES = ["grep", "find", "ls"];
+export const MARCH_BASE_TOOL_NAMES = ["grep", "find", "ls"];

package/src/agent/tool-result.mjs

@@ -1,3 +1,3 @@
-export function toolText(text, details = {}) {
-  return { content: [{ type: "text", text }], details };
-}
+export function toolText(text, details = {}) {
+  return { content: [{ type: "text", text }], details };
+}