@oh-my-pi/pi-coding-agent 7.0.0 → 8.0.1

package/src/utils/image-resize.ts

@@ -1,5 +1,5 @@
 import type { ImageContent } from "@oh-my-pi/pi-ai";
-import * as photon from "../vendor/photon";
+import * as photon from "$c/vendor/photon";
 
 export interface ImageResizeOptions {
 	maxWidth?: number; // Default: 2000

package/src/utils/shell.ts

@@ -1,7 +1,7 @@
 import { constants } from "node:fs";
 import { access } from "node:fs/promises";
 import { $ } from "bun";
-import { SettingsManager } from "../core/settings-manager";
+import { SettingsManager } from "$c/config/settings-manager";
 
 export interface ShellConfig {
 	shell: string;

package/src/{core → utils}/title-generator.ts

@@ -5,10 +5,10 @@
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
 import { logger } from "@oh-my-pi/pi-utils";
-import titleSystemPrompt from "../prompts/system/title-system.md" with { type: "text" };
-import type { ModelRegistry } from "./model-registry";
-import { parseModelString, SMOL_MODEL_PRIORITY } from "./model-resolver";
-import { renderPromptTemplate } from "./prompt-templates";
+import type { ModelRegistry } from "$c/config/model-registry";
+import { parseModelString, SMOL_MODEL_PRIORITY } from "$c/config/model-resolver";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import titleSystemPrompt from "$c/prompts/system/title-system.md" with { type: "text" };
 
 const TITLE_SYSTEM_PROMPT = renderPromptTemplate(titleSystemPrompt);
 

package/src/utils/tools-manager.ts

@@ -3,7 +3,7 @@ import { arch, platform } from "node:os";
 import { join } from "node:path";
 import { createTempDir, logger } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
-import { APP_NAME, getBinDir } from "../config";
+import { APP_NAME, getBinDir } from "$c/config";
 
 const TOOLS_DIR = getBinDir();
 

package/src/{core/tools/web-scrapers → web/scrapers}/choosealicense.ts

@@ -1,4 +1,4 @@
-import { parseFrontmatter } from "../../../core/frontmatter";
+import { parseFrontmatter } from "$c/utils/frontmatter";
 import type { RenderResult, SpecialHandler } from "./types";
 import { finalizeOutput, loadPage } from "./types";
 

package/src/{core/tools/web-scrapers → web/scrapers}/twitter.ts

@@ -1,4 +1,5 @@
 import { parse as parseHtml } from "node-html-parser";
+import { ToolAbortError } from "$c/tools/tool-errors";
 import type { RenderResult, SpecialHandler } from "./types";
 import { finalizeOutput, loadPage } from "./types";
 
@@ -73,12 +74,12 @@ export const handleTwitter: SpecialHandler = async (
 		}
 	} catch {
 		if (signal?.aborted) {
-			return null;
+			throw new ToolAbortError();
 		}
 	}
 
 	if (signal?.aborted) {
-		return null;
+		throw new ToolAbortError();
 	}
 
 	// X.com blocks all bots - return a helpful error instead of falling through

package/src/{core/tools/web-scrapers → web/scrapers}/types.ts

@@ -2,6 +2,8 @@
  * Shared types and utilities for web-fetch handlers
  */
 
+import { ToolAbortError } from "$c/tools/tool-errors";
+
 export interface RenderResult {
 	url: string;
 	finalUrl: string;
@@ -109,7 +111,7 @@ export async function loadPage(url: string, options: LoadPageOptions = {}): Prom
 
 	for (let attempt = 0; attempt < USER_AGENTS.length; attempt++) {
 		if (signal?.aborted) {
-			return { content: "", contentType: "", finalUrl: url, ok: false };
+			throw new ToolAbortError();
 		}
 
 		const userAgent = USER_AGENTS[attempt];
@@ -170,7 +172,7 @@ export async function loadPage(url: string, options: LoadPageOptions = {}): Prom
 			return { content, contentType, finalUrl, ok: true, status: response.status };
 		} catch {
 			if (signal?.aborted) {
-				return { content: "", contentType: "", finalUrl: url, ok: false };
+				throw new ToolAbortError();
 			}
 			if (attempt === USER_AGENTS.length - 1) {
 				return { content: "", contentType: "", finalUrl: url, ok: false };

package/src/{core/tools/web-scrapers → web/scrapers}/utils.ts

@@ -3,7 +3,7 @@ import { tmpdir } from "node:os";
 import * as path from "node:path";
 import { ptree } from "@oh-my-pi/pi-utils";
 import { nanoid } from "nanoid";
-import { ensureTool } from "../../../utils/tools-manager";
+import { ensureTool } from "$c/utils/tools-manager";
 import { createRequestSignal } from "./types";
 
 const MAX_BYTES = 50 * 1024 * 1024; // 50MB for binary files

package/src/{core/tools/web-scrapers → web/scrapers}/youtube.ts

@@ -3,7 +3,8 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { cspawn } from "@oh-my-pi/pi-utils";
 import { nanoid } from "nanoid";
-import { ensureTool } from "../../../utils/tools-manager";
+import { throwIfAborted } from "$c/tools/tool-errors";
+import { ensureTool } from "$c/utils/tools-manager";
 import type { RenderResult, SpecialHandler } from "./types";
 import { finalizeOutput } from "./types";
 
@@ -139,13 +140,13 @@ export const handleYouTube: SpecialHandler = async (
 	timeout: number,
 	signal?: AbortSignal,
 ): Promise<RenderResult | null> => {
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 	const yt = parseYouTubeUrl(url);
 	if (!yt) return null;
 
 	// Ensure yt-dlp is available (auto-download if missing)
 	const ytdlp = await ensureTool("yt-dlp", true);
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 	if (!ytdlp) {
 		return {
 			url,
@@ -164,7 +165,7 @@ export const handleYouTube: SpecialHandler = async (
 	const videoUrl = `https://www.youtube.com/watch?v=${yt.videoId}`;
 
 	// Fetch video metadata
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 	const metaResult = await exec(
 		ytdlp,
 		["--dump-json", "--no-warnings", "--no-playlist", "--skip-download", videoUrl],
@@ -173,7 +174,7 @@ export const handleYouTube: SpecialHandler = async (
 			signal,
 		},
 	);
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 
 	let title = "YouTube Video";
 	let channel = "";
@@ -213,7 +214,7 @@ export const handleYouTube: SpecialHandler = async (
 	let transcriptSource = "";
 
 	// First, list available subtitles
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 	const listResult = await exec(
 		ytdlp,
 		["--list-subs", "--no-warnings", "--no-playlist", "--skip-download", videoUrl],
@@ -222,7 +223,7 @@ export const handleYouTube: SpecialHandler = async (
 			signal,
 		},
 	);
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 
 	const hasManualSubs = listResult.stdout.includes("[info] Available subtitles");
 	const hasAutoSubs = listResult.stdout.includes("[info] Available automatic captions");
@@ -234,7 +235,7 @@ export const handleYouTube: SpecialHandler = async (
 	try {
 		// Try manual subtitles first (English preferred)
 		if (hasManualSubs) {
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			const subResult = await exec(
 				ytdlp,
 				[
@@ -255,10 +256,10 @@ export const handleYouTube: SpecialHandler = async (
 
 			if (subResult.ok) {
 				// Find the downloaded subtitle file using glob
-				signal?.throwIfAborted();
+				throwIfAborted(signal);
 				const subFiles = await Array.fromAsync(new Bun.Glob(`${tmpBase}*.vtt`).scan({ absolute: true }));
 				if (subFiles.length > 0) {
-					signal?.throwIfAborted();
+					throwIfAborted(signal);
 					const vttContent = await Bun.file(subFiles[0]).text();
 					transcript = cleanVttToText(vttContent);
 					transcriptSource = "manual";
@@ -269,7 +270,7 @@ export const handleYouTube: SpecialHandler = async (
 
 		// Fall back to auto-generated captions
 		if (!transcript && hasAutoSubs) {
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			const autoResult = await exec(
 				ytdlp,
 				[
@@ -289,10 +290,10 @@ export const handleYouTube: SpecialHandler = async (
 			);
 
 			if (autoResult.ok) {
-				signal?.throwIfAborted();
+				throwIfAborted(signal);
 				const subFiles = await Array.fromAsync(new Bun.Glob(`${tmpBase}*.vtt`).scan({ absolute: true }));
 				if (subFiles.length > 0) {
-					signal?.throwIfAborted();
+					throwIfAborted(signal);
 					const vttContent = await Bun.file(subFiles[0]).text();
 					transcript = cleanVttToText(vttContent);
 					transcriptSource = "auto-generated";

package/src/{core/tools/web-search → web/search}/auth.ts

@@ -12,10 +12,10 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { buildAnthropicHeaders as buildProviderAnthropicHeaders } from "@oh-my-pi/pi-ai";
 import { logger } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath, getConfigDirPaths } from "../../../config";
-import { AgentStorage } from "../../agent-storage";
-import type { AuthCredential, AuthCredentialEntry, AuthStorageData } from "../../auth-storage";
-import { migrateJsonStorage } from "../../storage-migration";
+import { getAgentDbPath, getConfigDirPaths } from "$c/config";
+import { AgentStorage } from "$c/session/agent-storage";
+import type { AuthCredential, AuthCredentialEntry, AuthStorageData } from "$c/session/auth-storage";
+import { migrateJsonStorage } from "$c/session/storage-migration";
 import type { AnthropicAuthConfig, AnthropicOAuthCredential, ModelsJson } from "./types";
 
 const DEFAULT_BASE_URL = "https://api.anthropic.com";

package/src/{core/tools/web-search → web/search}/index.ts

@@ -15,15 +15,16 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
 import { Type } from "@sinclair/typebox";
-import type { Theme } from "../../../modes/interactive/theme/theme";
-import webSearchDescription from "../../../prompts/tools/web-search.md" with { type: "text" };
-import type { CustomTool, CustomToolContext, RenderResultOptions } from "../../custom-tools/types";
-import { renderPromptTemplate } from "../../prompt-templates";
-import { callExaTool, findApiKey as findExaKey, formatSearchResults, isSearchResponse } from "../exa/mcp-client";
-import { renderExaCall, renderExaResult } from "../exa/render";
-import type { ExaRenderDetails } from "../exa/types";
-import type { ToolSession } from "../index";
-import { formatAge } from "../render-utils";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import { callExaTool, findApiKey as findExaKey, formatSearchResults, isSearchResponse } from "$c/exa/mcp-client";
+import { renderExaCall, renderExaResult } from "$c/exa/render";
+import type { ExaRenderDetails } from "$c/exa/types";
+import type { CustomTool, CustomToolContext, RenderResultOptions } from "$c/extensibility/custom-tools/types";
+import type { Theme } from "$c/modes/theme/theme";
+import webSearchSystemPrompt from "$c/prompts/system/web-search.md" with { type: "text" };
+import webSearchDescription from "$c/prompts/tools/web-search.md" with { type: "text" };
+import type { ToolSession } from "$c/tools/index";
+import { formatAge } from "$c/tools/render-utils";
 import { findAnthropicAuth } from "./auth";
 import { searchAnthropic } from "./providers/anthropic";
 import { searchExa } from "./providers/exa";
@@ -34,70 +35,25 @@ import { WebSearchProviderError } from "./types";
 
 /** Web search parameters schema */
 export const webSearchSchema = Type.Object({
-	// Common
 	query: Type.String({ description: "Search query" }),
 	provider: Type.Optional(
 		StringEnum(["auto", "exa", "anthropic", "perplexity"], {
-			description: "Search provider (auto-detected if omitted or set to auto)",
+			description: "Search provider (default: auto)",
 		}),
 	),
-	num_results: Type.Optional(Type.Number({ description: "Maximum number of results to return" })),
-
-	// Common (Anthropic & Perplexity)
-	system_prompt: Type.Optional(
-		Type.String({
-			description: "System prompt to guide response style",
-		}),
-	),
-	max_tokens: Type.Optional(
-		Type.Number({
-			description: "Maximum tokens in response, 1-16384, default 4096 (Anthropic only)",
-			minimum: 1,
-			maximum: 16384,
-		}),
-	),
-
-	// Perplexity-specific
-	model: Type.Optional(
-		StringEnum(["sonar", "sonar-pro"], {
-			description: "Perplexity model - sonar (fast) or sonar-pro (comprehensive research)",
-		}),
-	),
-	search_recency_filter: Type.Optional(
+	recency: Type.Optional(
 		StringEnum(["day", "week", "month", "year"], {
-			description: "Filter results by recency (Perplexity only)",
-		}),
-	),
-	search_domain_filter: Type.Optional(
-		Type.Array(Type.String(), {
-			description: "Domain filter - include domains, prefix with - to exclude (Perplexity only)",
-		}),
-	),
-	search_context_size: Type.Optional(
-		StringEnum(["low", "medium", "high"], {
-			description: "Context size for cost control (Perplexity only)",
-		}),
-	),
-	return_related_questions: Type.Optional(
-		Type.Boolean({
-			description: "Include follow-up question suggestions, default true (Perplexity only)",
+			description: "Recency filter (Perplexity)",
 		}),
 	),
+	limit: Type.Optional(Type.Number({ description: "Max results to return" })),
 });
 
 export type WebSearchParams = {
 	query: string;
 	provider?: "auto" | "exa" | "anthropic" | "perplexity";
-	num_results?: number;
-	// Anthropic
-	system_prompt?: string;
-	max_tokens?: number;
-	// Perplexity
-	model?: "sonar" | "sonar-pro";
-	search_recency_filter?: "day" | "week" | "month" | "year";
-	search_domain_filter?: string[];
-	search_context_size?: "low" | "medium" | "high";
-	return_related_questions?: boolean;
+	recency?: "day" | "week" | "month" | "year";
+	limit?: number;
 };
 
 /** Preferred provider set via settings (default: auto) */
@@ -284,25 +240,20 @@ async function executeWebSearch(
 			if (provider === "exa") {
 				response = await searchExa({
 					query: params.query,
-					num_results: params.num_results,
+					num_results: params.limit,
 				});
 			} else if (provider === "anthropic") {
 				response = await searchAnthropic({
 					query: params.query,
-					system_prompt: params.system_prompt,
-					max_tokens: params.max_tokens,
-					num_results: params.num_results,
+					system_prompt: webSearchSystemPrompt,
+					num_results: params.limit,
 				});
 			} else {
 				response = await searchPerplexity({
 					query: params.query,
-					model: params.model,
-					system_prompt: params.system_prompt,
-					search_recency_filter: params.search_recency_filter,
-					search_domain_filter: params.search_domain_filter,
-					search_context_size: params.search_context_size,
-					return_related_questions: params.return_related_questions,
-					num_results: params.num_results,
+					system_prompt: webSearchSystemPrompt,
+					search_recency_filter: params.recency,
+					num_results: params.limit,
 				});
 			}
 

package/src/{core/tools/web-search → web/search}/providers/anthropic.ts

@@ -6,7 +6,7 @@
  */
 
 import { applyClaudeToolPrefix, buildAnthropicSystemBlocks, stripClaudeToolPrefix } from "@oh-my-pi/pi-ai";
-import { buildAnthropicHeaders, buildAnthropicUrl, findAnthropicAuth, getEnv } from "../auth";
+import { buildAnthropicHeaders, buildAnthropicUrl, findAnthropicAuth, getEnv } from "$c/web/search/auth";
 import type {
 	AnthropicApiResponse,
 	AnthropicAuthConfig,
@@ -14,8 +14,8 @@ import type {
 	WebSearchCitation,
 	WebSearchResponse,
 	WebSearchSource,
-} from "../types";
-import { WebSearchProviderError } from "../types";
+} from "$c/web/search/types";
+import { WebSearchProviderError } from "$c/web/search/types";
 
 const DEFAULT_MODEL = "claude-haiku-4-5";
 const DEFAULT_MAX_TOKENS = 4096;
@@ -35,7 +35,6 @@ const applySearchToolPrefix = (name: string, isOAuth: boolean): string => {
 export interface AnthropicSearchParams {
 	query: string;
 	system_prompt?: string;
-	max_tokens?: number;
 	num_results?: number;
 }
 
@@ -51,7 +50,7 @@ async function getModel(): Promise<string> {
  * Builds system instruction blocks for the Anthropic API request.
  * @param auth - Authentication configuration
  * @param model - Model identifier (affects whether Claude Code instruction is included)
- * @param systemPrompt - Optional custom system prompt
+ * @param systemPrompt - Optional system prompt for guiding response style
  * @returns Array of system blocks for the API request
  */
 function buildSystemBlocks(
@@ -73,8 +72,7 @@ function buildSystemBlocks(
  * @param auth - Authentication configuration (API key or OAuth)
  * @param model - Model identifier to use
  * @param query - Search query from the user
- * @param systemPrompt - Optional custom system prompt
- * @param maxTokens - Maximum tokens for the response
+ * @param systemPrompt - Optional system prompt for guiding response style
  * @returns Raw API response from Anthropic
  * @throws {WebSearchProviderError} If the API request fails
  */
@@ -83,7 +81,6 @@ async function callWebSearch(
 	model: string,
 	query: string,
 	systemPrompt?: string,
-	maxTokens?: number,
 ): Promise<AnthropicApiResponse> {
 	const url = buildAnthropicUrl(auth);
 	const headers = buildAnthropicHeaders(auth);
@@ -92,7 +89,7 @@ async function callWebSearch(
 
 	const body: Record<string, unknown> = {
 		model,
-		max_tokens: maxTokens ?? DEFAULT_MAX_TOKENS,
+		max_tokens: DEFAULT_MAX_TOKENS,
 		messages: [{ role: "user", content: query }],
 		tools: [
 			{
@@ -240,7 +237,7 @@ export async function searchAnthropic(params: AnthropicSearchParams): Promise<We
 	}
 
 	const model = await getModel();
-	const response = await callWebSearch(auth, model, params.query, params.system_prompt, params.max_tokens);
+	const response = await callWebSearch(auth, model, params.query, params.system_prompt);
 
 	const result = parseResponse(response);
 

package/src/{core/tools/web-search → web/search}/providers/exa.ts

@@ -7,8 +7,8 @@
 
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import type { WebSearchResponse, WebSearchSource } from "../types";
-import { WebSearchProviderError } from "../types";
+import type { WebSearchResponse, WebSearchSource } from "$c/web/search/types";
+import { WebSearchProviderError } from "$c/web/search/types";
 
 const EXA_API_URL = "https://api.exa.ai/search";
 

package/src/{core/tools/web-search → web/search}/providers/perplexity.ts

@@ -12,19 +12,15 @@ import type {
 	WebSearchCitation,
 	WebSearchResponse,
 	WebSearchSource,
-} from "../types";
-import { WebSearchProviderError } from "../types";
+} from "$c/web/search/types";
+import { WebSearchProviderError } from "$c/web/search/types";
 
 const PERPLEXITY_API_URL = "https://api.perplexity.ai/chat/completions";
 
 export interface PerplexitySearchParams {
 	query: string;
-	model?: "sonar" | "sonar-pro";
 	system_prompt?: string;
 	search_recency_filter?: "day" | "week" | "month" | "year";
-	search_domain_filter?: string[];
-	search_context_size?: "low" | "medium" | "high";
-	return_related_questions?: boolean;
 	num_results?: number;
 }
 
@@ -171,22 +167,14 @@ export async function searchPerplexity(params: PerplexitySearchParams): Promise<
 	messages.push({ role: "user", content: params.query });
 
 	const request: PerplexityRequest = {
-		model: params.model ?? "sonar",
+		model: "sonar",
 		messages,
-		// Default to true for related questions (unlike original which hardcoded false)
-		return_related_questions: params.return_related_questions ?? true,
+		return_related_questions: true,
 	};
 
-	// Add optional parameters
 	if (params.search_recency_filter) {
 		request.search_recency_filter = params.search_recency_filter;
 	}
-	if (params.search_domain_filter && params.search_domain_filter.length > 0) {
-		request.search_domain_filter = params.search_domain_filter;
-	}
-	if (params.search_context_size) {
-		request.search_context_size = params.search_context_size;
-	}
 
 	const response = await callPerplexity(apiKey, request);
 	const result = parseResponse(response);

package/src/{core/tools/web-search → web/search}/render.ts

@@ -6,8 +6,8 @@
 
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import type { Theme } from "../../../modes/interactive/theme/theme";
-import type { RenderResultOptions } from "../../custom-tools/types";
+import type { RenderResultOptions } from "$c/extensibility/custom-tools/types";
+import type { Theme } from "$c/modes/theme/theme";
 import {
 	formatAge,
 	formatCount,
@@ -19,7 +19,7 @@ import {
 	PREVIEW_LIMITS,
 	TRUNCATE_LENGTHS,
 	truncate,
-} from "../render-utils";
+} from "$c/tools/render-utils";
 import type { WebSearchResponse } from "./types";
 
 const MAX_COLLAPSED_ANSWER_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;

package/tsconfig.json

@@ -0,0 +1,25 @@
+{
+	"compilerOptions": {
+		"target": "ES2024",
+		"module": "ESNext",
+		"lib": ["ES2024"],
+		"strict": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"forceConsistentCasingInFileNames": true,
+		"moduleResolution": "Bundler",
+		"resolveJsonModule": true,
+		"allowImportingTsExtensions": true,
+		"experimentalDecorators": true,
+		"emitDecoratorMetadata": true,
+		"useDefineForClassFields": false,
+		"types": ["bun", "node"],
+		"noEmit": true,
+		"baseUrl": ".",
+		"paths": {
+			"$c/*": ["./src/*"]
+		}
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["node_modules", "dist", "**/*.test.ts", "test/**"]
+}

package/scripts/migrate-sessions.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# Migrate sessions from ~/.omp/agent/*.jsonl to proper session directories.
-# This fixes sessions created by the bug in v0.30.0 where sessions were
-# saved to ~/.omp/agent/ instead of ~/.omp/agent/sessions/<encoded-cwd>/.
-#
-# Usage: ./migrate-sessions.sh [--dry-run]
-#
-
-set -e
-
-AGENT_DIR="${OMP_AGENT_DIR:-$HOME/.omp/agent}"
-DRY_RUN=false
-
-if [[ "$1" == "--dry-run" ]]; then
-    DRY_RUN=true
-    echo "Dry run mode - no files will be moved"
-    echo
-fi
-
-# Find all .jsonl files directly in agent dir (not in subdirectories)
-shopt -s nullglob
-files=("$AGENT_DIR"/*.jsonl)
-shopt -u nullglob
-
-if [[ ${#files[@]} -eq 0 ]]; then
-    echo "No session files found in $AGENT_DIR"
-    exit 0
-fi
-
-echo "Found ${#files[@]} session file(s) to migrate"
-echo
-
-migrated=0
-failed=0
-
-for file in "${files[@]}"; do
-    filename=$(basename "$file")
-    
-    # Read first line and extract cwd using jq
-    if ! first_line=$(head -1 "$file" 2>/dev/null); then
-        echo "SKIP: $filename - cannot read file"
-        ((failed++))
-        continue
-    fi
-    
-    # Parse JSON and extract cwd
-    if ! cwd=$(echo "$first_line" | jq -r '.cwd // empty' 2>/dev/null); then
-        echo "SKIP: $filename - invalid JSON"
-        ((failed++))
-        continue
-    fi
-    
-    if [[ -z "$cwd" ]]; then
-        echo "SKIP: $filename - no cwd in session header"
-        ((failed++))
-        continue
-    fi
-    
-    # Encode cwd: remove leading slash, replace slashes with dashes, wrap with --
-    encoded=$(echo "$cwd" | sed 's|^/||' | sed 's|[/:\\]|-|g')
-    encoded="--${encoded}--"
-    
-    target_dir="$AGENT_DIR/sessions/$encoded"
-    target_file="$target_dir/$filename"
-    
-    if [[ -e "$target_file" ]]; then
-        echo "SKIP: $filename - target already exists"
-        ((failed++))
-        continue
-    fi
-    
-    echo "MIGRATE: $filename"
-    echo "    cwd: $cwd"
-    echo "    to:  $target_dir/"
-    
-    if [[ "$DRY_RUN" == false ]]; then
-        mkdir -p "$target_dir"
-        mv "$file" "$target_file"
-    fi
-    
-    ((migrated++))
-    echo
-done
-
-echo "---"
-echo "Migrated: $migrated"
-echo "Skipped:  $failed"
-
-if [[ "$DRY_RUN" == true && $migrated -gt 0 ]]; then
-    echo
-    echo "Run without --dry-run to perform the migration"
-fi