@ekkos/cli 0.2.9 → 0.2.10

package/dist/commands/run.js

@@ -62,9 +62,10 @@ function getConfig(options) {
         postEnterDelayMs: options.postEnterDelayMs ??
             parseInt(process.env.EKKOS_POST_ENTER_DELAY_MS || '300', 10), // was 500
         clearWaitMs: options.clearWaitMs ??
-            parseInt(process.env.EKKOS_CLEAR_WAIT_MS || '2500', 10), // was 5000
+            parseInt(process.env.EKKOS_CLEAR_WAIT_MS || '1111', 10), // 1111 = symbolic ✨
         idlePromptMs: parseInt(process.env.EKKOS_IDLE_PROMPT_MS || '250', 10),
         paletteRetryMs: parseInt(process.env.EKKOS_PALETTE_RETRY_MS || '400', 10), // was 500
+        maxIdleWaitMs: parseInt(process.env.EKKOS_MAX_IDLE_WAIT_MS || '2000', 10), // was 10000
         debugLogPath: options.debugLogPath ??
             process.env.EKKOS_DEBUG_LOG_PATH ??
             path.join(os.homedir(), '.ekkos', 'auto-continue.debug.log')
@@ -167,7 +168,8 @@ async function typeSlowly(shell, text, charDelayMs) {
  * that hasn't changed for idlePromptMs. This prevents injecting while Claude
  * is busy generating ("Channelling...").
  */
-async function waitForIdlePrompt(getOutputBuffer, config, maxWaitMs = 10000) {
+async function waitForIdlePrompt(getOutputBuffer, config) {
+    const maxWaitMs = config.maxIdleWaitMs;
     const startTime = Date.now();
     let lastOutput = '';
     let stableTime = 0;
@@ -380,9 +382,45 @@ async function emergencyCapture(transcriptPath, sessionId) {
         dlog('Warning: Could not capture context');
     }
 }
+/**
+ * Generate a unique instance ID for this run
+ * Used for namespacing storage paths
+ */
+function generateInstanceId() {
+    return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+}
+/**
+ * Write/update instance file
+ */
+function writeInstanceFile(instanceId, data) {
+    const instancesDir = path.join(state_1.EKKOS_DIR, 'instances');
+    if (!fs.existsSync(instancesDir)) {
+        fs.mkdirSync(instancesDir, { recursive: true });
+    }
+    const instanceFile = path.join(instancesDir, `${instanceId}.json`);
+    fs.writeFileSync(instanceFile, JSON.stringify(data, null, 2));
+}
+/**
+ * Clean up instance file on exit
+ */
+function cleanupInstanceFile(instanceId) {
+    try {
+        const instanceFile = path.join(state_1.EKKOS_DIR, 'instances', `${instanceId}.json`);
+        if (fs.existsSync(instanceFile)) {
+            fs.unlinkSync(instanceFile);
+        }
+    }
+    catch {
+        // Ignore cleanup errors
+    }
+}
 async function run(options) {
     const verbose = options.verbose || false;
     const bypass = options.bypass || false;
+    const noInject = options.noInject || false;
+    // Generate instance ID for this run
+    const instanceId = generateInstanceId();
+    process.env.EKKOS_INSTANCE_ID = instanceId;
     // ══════════════════════════════════════════════════════════════════════════
     // PRE-FLIGHT DIAGNOSTICS (--doctor flag)
     // ══════════════════════════════════════════════════════════════════════════
@@ -502,7 +540,7 @@ async function run(options) {
     }
     if (verbose) {
         console.log(chalk_1.default.gray(`  📁 Debug log: ${config.debugLogPath}`));
-        console.log(chalk_1.default.gray(`  ⏱  Timing: slash=${config.slashOpenDelayMs}ms, char=${config.charDelayMs}ms, clear=${config.clearWaitMs}ms`));
+        console.log(chalk_1.default.gray(`  ⏱  Timing: clear=${config.clearWaitMs}ms, idleMax=${config.maxIdleWaitMs}ms (~${Math.round((config.clearWaitMs + config.maxIdleWaitMs * 2 + 1700) / 1000)}s total)`));
     }
     console.log('');
     // Ensure .ekkos directory exists
@@ -511,6 +549,18 @@ async function run(options) {
     (0, state_1.clearAutoClearFlag)();
     // Track state
     let currentSession = options.session || (0, state_1.getCurrentSessionName)();
+    // Write initial instance file
+    const startedAt = new Date().toISOString();
+    writeInstanceFile(instanceId, {
+        pid: process.pid,
+        projectPath: process.cwd(),
+        startedAt,
+        lastHeartbeat: startedAt,
+        sessionName: currentSession || undefined
+    });
+    if (verbose) {
+        console.log(chalk_1.default.gray(`  🆔 Instance: ${instanceId}`));
+    }
     // ════════════════════════════════════════════════════════════════════════════
     // MULTI-SESSION SUPPORT: Register this process as an active session
     // This prevents state collision when multiple Claude Code instances run
@@ -530,7 +580,8 @@ async function run(options) {
     let currentSessionId = null;
     // Stream tailer for mid-turn context capture
     let streamTailer = null;
-    const streamCacheDir = path.join(os.homedir(), '.ekkos', 'cache', 'sessions');
+    // Instance-namespaced cache directory per spec v1.2
+    const streamCacheDir = path.join(os.homedir(), '.ekkos', 'cache', 'sessions', instanceId);
     // Helper to start stream tailer when we have transcript path
     function startStreamTailer(tPath, sId, sName) {
         if (streamTailer)
@@ -604,33 +655,28 @@ async function run(options) {
     // Determine which mode to use
     const usePty = pty !== null;
     // ══════════════════════════════════════════════════════════════════════════
-    // WINDOWS: HARD FAIL WITHOUT PTY
+    // WINDOWS: MONITOR-ONLY MODE WITHOUT PTY (Per Spec v1.2 Addendum)
     // Without node-pty/ConPTY, auto-continue cannot work on Windows.
-    // Claude switches to --print mode without a real PTY, breaking the TUI.
+    // Instead of hard-failing, we enter monitor-only mode.
     // ══════════════════════════════════════════════════════════════════════════
+    const monitorOnlyMode = noInject || (isWindows && !usePty);
     if (isWindows && !usePty) {
         console.log('');
-        console.log(chalk_1.default.red.bold('❌ ekkos run requires PTY support on Windows'));
+        console.log(chalk_1.default.yellow.bold('⚠️  Monitor-only mode (PTY not available)'));
         console.log('');
-        console.log(chalk_1.default.yellow('Without node-pty (ConPTY), Claude Code runs in --print mode'));
-        console.log(chalk_1.default.yellow('which prevents auto-continue from working.'));
+        console.log(chalk_1.default.gray('Without node-pty (ConPTY), auto-continue cannot inject commands.'));
+        console.log(chalk_1.default.gray('ekkOS will monitor context usage and provide instructions when needed.'));
         console.log('');
-        console.log(chalk_1.default.cyan('To fix:'));
-        console.log('');
-        console.log(chalk_1.default.white('  Option 1: Use Node 20 or 22 LTS (recommended)'));
+        console.log(chalk_1.default.cyan('To enable auto-continue:'));
+        console.log(chalk_1.default.white('  Option 1: Use Node 20 or 22 LTS'));
         console.log(chalk_1.default.gray('    winget install OpenJS.NodeJS.LTS'));
-        console.log(chalk_1.default.gray('    npm install -g @ekkos/cli'));
-        console.log('');
-        console.log(chalk_1.default.white('  Option 2: Install prebuilt PTY'));
-        console.log(chalk_1.default.gray('    npm install node-pty-prebuilt-multiarch'));
-        console.log('');
-        console.log(chalk_1.default.white('  Option 3: Build node-pty from source'));
-        console.log(chalk_1.default.gray('    1. Install VS Build Tools (Desktop C++ workload)'));
-        console.log(chalk_1.default.gray('    2. npm rebuild node-pty --build-from-source'));
+        console.log(chalk_1.default.white('  Option 2: npm install node-pty-prebuilt-multiarch'));
         console.log('');
         console.log(chalk_1.default.gray('Run `ekkos doctor` for detailed diagnostics.'));
         console.log('');
-        process.exit(1);
+    }
+    else if (noInject) {
+        console.log(chalk_1.default.yellow('  Monitor-only mode (--no-inject)'));
     }
     if (verbose) {
         console.log(chalk_1.default.gray(`  💻 PTY mode: ${usePty ? 'node-pty' : 'spawn+script (fallback)'}`));
@@ -982,6 +1028,7 @@ async function run(options) {
         (0, state_1.clearAutoClearFlag)();
         stopStreamTailer(); // Stop stream capture
         (0, state_1.unregisterActiveSession)(); // Remove from active sessions registry
+        cleanupInstanceFile(instanceId); // Clean up instance file
         // Restore terminal
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(false);
@@ -996,6 +1043,7 @@ async function run(options) {
         (0, state_1.clearAutoClearFlag)();
         stopStreamTailer(); // Stop stream capture
         (0, state_1.unregisterActiveSession)(); // Remove from active sessions registry
+        cleanupInstanceFile(instanceId); // Clean up instance file
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(false);
         }

package/dist/index.js

@@ -11,6 +11,7 @@ const status_1 = require("./commands/status");
 const run_1 = require("./commands/run");
 const doctor_1 = require("./commands/doctor");
 const stream_1 = require("./commands/stream");
+const hooks_1 = require("./commands/hooks");
 const state_1 = require("./utils/state");
 const chalk_1 = __importDefault(require("chalk"));
 commander_1.program
@@ -46,12 +47,14 @@ commander_1.program
     .option('-b, --bypass', 'Enable bypass permissions mode (dangerously skip all permission checks)')
     .option('-v, --verbose', 'Show debug output')
     .option('-d, --doctor', 'Run diagnostics before starting')
+    .option('--no-inject', 'Monitor-only mode (detect context wall but print instructions instead of auto-inject)')
     .action((options) => {
     (0, run_1.run)({
         session: options.session,
         bypass: options.bypass,
         verbose: options.verbose,
-        doctor: options.doctor
+        doctor: options.doctor,
+        noInject: options.noInject
     });
 });
 // Doctor command - check system prerequisites
@@ -86,6 +89,44 @@ streamCmd
     .action(() => {
     (0, stream_1.streamList)();
 });
+// Hooks command - install, verify, status
+const hooksCmd = commander_1.program
+    .command('hooks')
+    .description('Manage ekkOS hooks (install, verify, status)');
+hooksCmd
+    .command('install')
+    .description('Install ekkOS hooks to ~/.claude/hooks/ (global) or project')
+    .option('-g, --global', 'Install globally (default)')
+    .option('-p, --project', 'Install to current project only')
+    .option('-v, --verbose', 'Show detailed output')
+    .action((options) => {
+    (0, hooks_1.hooksInstall)({
+        global: options.global !== false && !options.project,
+        project: options.project,
+        verbose: options.verbose
+    });
+});
+hooksCmd
+    .command('verify')
+    .description('Verify hook installation and checksums')
+    .option('-g, --global', 'Verify global installation (default)')
+    .option('-p, --project', 'Verify project installation')
+    .option('-v, --verbose', 'Show detailed output')
+    .action(async (options) => {
+    const result = await (0, hooks_1.hooksVerify)({
+        global: options.global !== false && !options.project,
+        project: options.project,
+        verbose: options.verbose
+    });
+    process.exit(result.status === 'FAIL' ? 1 : 0);
+});
+hooksCmd
+    .command('status')
+    .description('Show hook installation status and enablement')
+    .option('-v, --verbose', 'Show detailed output')
+    .action((options) => {
+    (0, hooks_1.hooksStatus)({ verbose: options.verbose });
+});
 // Sessions command - list active Claude Code sessions (swarm support)
 commander_1.program
     .command('sessions')

package/dist/restore/RestoreOrchestrator.d.ts

@@ -1,21 +1,31 @@
 /**
- * ekkOS Fast /continue - Restore Orchestrator
+ * ekkOS Fast /continue - Restore Orchestrator (Instance-Aware)
  *
  * Implements the 3-tier restore chain for near-zero context loss:
+ * - Tier -1: Stream log (real-time, has mid-turn content)
  * - Tier 0: Local JSONL cache (~20ms)
  * - Tier 1: Redis hot cache (~150ms)
  * - Tier 2: Supabase cold store (~500ms)
  *
+ * Per ekkOS Onboarding Spec v1.2 FINAL + ADDENDUM:
+ * - All Tier 0 cache paths MUST be: ~/.ekkos/cache/sessions/{instanceId}/{sessionId}.jsonl
+ * - All persisted records MUST include: instanceId, sessionId, sessionName
+ *
  * Falls back through tiers on miss, tracks which tier succeeded.
  */
 import { RestorePayload, RestoreOptions, CacheResult } from '../cache/types.js';
 /**
- * RestoreOrchestrator - Tiered restore for /continue
+ * RestoreOrchestrator - Tiered restore for /continue (Instance-Aware)
  */
 export declare class RestoreOrchestrator {
     private localStore;
     private authToken;
-    constructor();
+    private instanceId;
+    constructor(instanceId?: string);
+    /**
+     * Get the current instance ID
+     */
+    getInstanceId(): string;
     /**
      * Main restore function - attempts tiers in order
      */
@@ -24,6 +34,8 @@ export declare class RestoreOrchestrator {
      * Tier -1: Restore from stream log (has mid-turn content)
      * This is checked FIRST because stream logs have the most recent data,
      * including in-progress turns that haven't been sealed yet.
+     *
+     * Checks instance-scoped path first, then legacy path as fallback.
      */
     private restoreFromStreamLog;
     /**
@@ -49,6 +61,8 @@ export declare class RestoreOrchestrator {
         local_sessions: number;
         local_turns: number;
         local_size_bytes: number;
+        instance_id: string;
     };
 }
+export declare function createRestoreOrchestrator(instanceId?: string): RestoreOrchestrator;
 export declare const restoreOrchestrator: RestoreOrchestrator;

package/dist/restore/RestoreOrchestrator.js

@@ -1,12 +1,17 @@
 "use strict";
 /**
- * ekkOS Fast /continue - Restore Orchestrator
+ * ekkOS Fast /continue - Restore Orchestrator (Instance-Aware)
  *
  * Implements the 3-tier restore chain for near-zero context loss:
+ * - Tier -1: Stream log (real-time, has mid-turn content)
  * - Tier 0: Local JSONL cache (~20ms)
  * - Tier 1: Redis hot cache (~150ms)
  * - Tier 2: Supabase cold store (~500ms)
  *
+ * Per ekkOS Onboarding Spec v1.2 FINAL + ADDENDUM:
+ * - All Tier 0 cache paths MUST be: ~/.ekkos/cache/sessions/{instanceId}/{sessionId}.jsonl
+ * - All persisted records MUST include: instanceId, sessionId, sessionName
+ *
  * Falls back through tiers on miss, tracks which tier succeeded.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -44,16 +49,17 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreOrchestrator = exports.RestoreOrchestrator = void 0;
+exports.createRestoreOrchestrator = createRestoreOrchestrator;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const LocalSessionStore_js_1 = require("../cache/LocalSessionStore.js");
 const types_js_1 = require("../cache/types.js");
 const stream_tailer_js_1 = require("../capture/stream-tailer.js");
+const paths_js_1 = require("../utils/paths.js");
 // API configuration
 const MEMORY_API_URL = process.env.EKKOS_API_URL || 'https://api.ekkos.dev';
 const CONFIG_PATH = path.join(os.homedir(), '.ekkos', 'config.json');
-const STREAM_CACHE_DIR = path.join(os.homedir(), '.ekkos', 'cache', 'sessions');
 /**
  * Load auth token from config
  */
@@ -70,19 +76,31 @@ function loadAuthToken() {
     return '';
 }
 /**
- * RestoreOrchestrator - Tiered restore for /continue
+ * RestoreOrchestrator - Tiered restore for /continue (Instance-Aware)
  */
 class RestoreOrchestrator {
-    constructor() {
-        this.localStore = new LocalSessionStore_js_1.LocalSessionStore();
+    constructor(instanceId) {
+        this.instanceId = (0, paths_js_1.normalizeInstanceId)(instanceId || process.env.EKKOS_INSTANCE_ID);
+        this.localStore = (0, LocalSessionStore_js_1.createLocalSessionStore)(this.instanceId);
         this.authToken = loadAuthToken();
     }
+    /**
+     * Get the current instance ID
+     */
+    getInstanceId() {
+        return this.instanceId;
+    }
     /**
      * Main restore function - attempts tiers in order
      */
     async restore(options = {}) {
         const startTime = Date.now();
         const lastN = options.last_n || 10;
+        // Use provided instanceId or fall back to constructor instanceId
+        const instanceId = options.instance_id || this.instanceId;
+        if (instanceId !== this.instanceId) {
+            this.localStore.setInstanceId(instanceId);
+        }
         // Resolve session
         let sessionId = options.session_id;
         let sessionName = options.session_name;
@@ -105,7 +123,7 @@ class RestoreOrchestrator {
             };
         }
         // Try Tier -1: Stream log (has mid-turn content, most recent data)
-        const streamResult = await this.restoreFromStreamLog(sessionId, sessionName || '', lastN);
+        const streamResult = await this.restoreFromStreamLog(instanceId, sessionId, sessionName || '', lastN);
         if (streamResult.success && streamResult.data) {
             return {
                 ...streamResult,
@@ -113,7 +131,7 @@ class RestoreOrchestrator {
             };
         }
         // Try Tier 0: Local cache
-        const localResult = await this.restoreFromLocal(sessionId, sessionName || '', lastN);
+        const localResult = await this.restoreFromLocal(instanceId, sessionId, sessionName || '', lastN);
         if (localResult.success && localResult.data) {
             return {
                 ...localResult,
@@ -121,7 +139,7 @@ class RestoreOrchestrator {
             };
         }
         // Try Tier 1: Redis
-        const redisResult = await this.restoreFromRedis(sessionName || sessionId, lastN);
+        const redisResult = await this.restoreFromRedis(sessionName || sessionId, lastN, instanceId);
         if (redisResult.success && redisResult.data) {
             return {
                 ...redisResult,
@@ -129,7 +147,7 @@ class RestoreOrchestrator {
             };
         }
         // Try Tier 2: Supabase
-        const supabaseResult = await this.restoreFromSupabase(sessionId, lastN);
+        const supabaseResult = await this.restoreFromSupabase(sessionId, lastN, instanceId);
         if (supabaseResult.success && supabaseResult.data) {
             return {
                 ...supabaseResult,
@@ -147,12 +165,14 @@ class RestoreOrchestrator {
      * Tier -1: Restore from stream log (has mid-turn content)
      * This is checked FIRST because stream logs have the most recent data,
      * including in-progress turns that haven't been sealed yet.
+     *
+     * Checks instance-scoped path first, then legacy path as fallback.
      */
-    async restoreFromStreamLog(sessionId, sessionName, lastN) {
+    async restoreFromStreamLog(instanceId, sessionId, sessionName, lastN) {
         const startTime = Date.now();
-        // Find stream log file
-        const streamLogPath = path.join(STREAM_CACHE_DIR, `${sessionId}.stream.jsonl`);
-        if (!fs.existsSync(streamLogPath)) {
+        // Find stream log file (instance-scoped first, then legacy)
+        const streamLogFile = (0, paths_js_1.findStreamLogFile)(instanceId, sessionId);
+        if (!streamLogFile) {
             return {
                 success: false,
                 error: 'No stream log found',
@@ -161,7 +181,7 @@ class RestoreOrchestrator {
             };
         }
         try {
-            const { turns: streamTurns, latestTurnId } = await (0, stream_tailer_js_1.reconstructTurnFromEvents)(streamLogPath);
+            const { turns: streamTurns, latestTurnId } = await (0, stream_tailer_js_1.reconstructTurnFromEvents)(streamLogFile.path);
             if (streamTurns.size === 0) {
                 return {
                     success: false,
@@ -193,6 +213,9 @@ class RestoreOrchestrator {
                     tools_used: turn.tools.filter(t => t.kind === 'tool_use').map(t => t.name || 'unknown'),
                     files_referenced: [],
                     is_complete: turn.status === 'complete',
+                    instance_id: streamLogFile.isLegacy ? paths_js_1.DEFAULT_INSTANCE_ID : instanceId,
+                    session_id: sessionId,
+                    session_name: sessionName,
                 });
             }
             // Sort by turn_id
@@ -213,6 +236,7 @@ class RestoreOrchestrator {
             const payload = {
                 session_id: sessionId,
                 session_name: sessionName || 'unknown',
+                instance_id: streamLogFile.isLegacy ? paths_js_1.DEFAULT_INSTANCE_ID : instanceId,
                 source: 'stream',
                 restored_turns: restoredTurns,
                 latest: {
@@ -257,7 +281,7 @@ class RestoreOrchestrator {
     /**
      * Tier 0: Restore from local JSONL cache
      */
-    async restoreFromLocal(sessionId, sessionName, lastN) {
+    async restoreFromLocal(instanceId, sessionId, sessionName, lastN) {
         const startTime = Date.now();
         const turnsResult = this.localStore.getLastTurns(sessionId, lastN);
         if (!turnsResult.success || !turnsResult.data || turnsResult.data.length === 0) {
@@ -272,6 +296,9 @@ class RestoreOrchestrator {
         const allTurns = turnsResult.data.map((t) => ({
             ...t,
             is_complete: (0, types_js_1.isValidAssistantResponse)(t.assistant_response),
+            instance_id: t.instance_id || instanceId,
+            session_id: t.session_id || sessionId,
+            session_name: t.session_name || sessionName,
         }));
         // Separate complete turns from incomplete (pending) turns
         const completeTurns = allTurns.filter((t) => t.is_complete);
@@ -304,6 +331,7 @@ class RestoreOrchestrator {
         const payload = {
             session_id: sessionId,
             session_name: sessionName || this.localStore.getSessionName(sessionId) || 'unknown',
+            instance_id: meta?.instance_id || instanceId,
             source: 'local',
             restored_turns: turns,
             latest: {
@@ -337,7 +365,7 @@ class RestoreOrchestrator {
     /**
      * Tier 1: Restore from Redis via API
      */
-    async restoreFromRedis(sessionName, lastN) {
+    async restoreFromRedis(sessionName, lastN, instanceId) {
         const startTime = Date.now();
         if (!this.authToken) {
             return {
@@ -375,6 +403,9 @@ class RestoreOrchestrator {
                     tools_used: t.agent?.tools_used || [],
                     files_referenced: t.user?.files_referenced || [],
                     is_complete: (0, types_js_1.isValidAssistantResponse)(t.agent?.response),
+                    instance_id: t.instance_id || instanceId,
+                    session_id: data.session_id || sessionName,
+                    session_name: data.session_name || sessionName,
                 }));
                 // Separate complete turns from pending
                 const completeTurns = allTurns.filter((t) => t.is_complete);
@@ -395,6 +426,7 @@ class RestoreOrchestrator {
                 const payload = {
                     session_id: data.session_id || sessionName,
                     session_name: data.session_name || sessionName,
+                    instance_id: data.instance_id || instanceId,
                     source: 'redis',
                     restored_turns: turns,
                     latest: {
@@ -444,7 +476,7 @@ class RestoreOrchestrator {
     /**
      * Tier 2: Restore from Supabase via API
      */
-    async restoreFromSupabase(sessionId, lastN) {
+    async restoreFromSupabase(sessionId, lastN, instanceId) {
         const startTime = Date.now();
         if (!this.authToken) {
             return {
@@ -483,6 +515,9 @@ class RestoreOrchestrator {
                     tools_used: [],
                     files_referenced: c.metadata?.file_changes?.map((f) => f.path) || [],
                     is_complete: (0, types_js_1.isValidAssistantResponse)(c.assistant_response),
+                    instance_id: c.metadata?.instance_id || instanceId,
+                    session_id: sessionId,
+                    session_name: data.session_name || 'unknown',
                 }));
                 // Separate complete turns from pending
                 const completeTurns = allTurns.filter((t) => t.is_complete);
@@ -503,6 +538,7 @@ class RestoreOrchestrator {
                 const payload = {
                     session_id: sessionId,
                     session_name: data.session_name || 'unknown',
+                    instance_id: instanceId,
                     source: 'supabase',
                     restored_turns: turns,
                     latest: {
@@ -560,6 +596,7 @@ class RestoreOrchestrator {
             '<system-reminder>',
             'CONTEXT RESTORED (ekkOS /continue)',
             `Session: ${payload.session_name} (${payload.session_id})`,
+            `Instance: ${payload.instance_id || paths_js_1.DEFAULT_INSTANCE_ID}`,
             `Source: ${payload.source}${isStreamRestore ? ' (real-time stream)' : ''}`,
             isInProgress ? `Status: IN_PROGRESS (mid-turn restore)` : `Turns restored: ${payload.restored_turns.length}`,
             '',
@@ -570,7 +607,7 @@ class RestoreOrchestrator {
             if (openLoops && openLoops.length > 0) {
                 lines.push('## Open Loops (machine-derived)');
                 for (const loop of openLoops) {
-                    lines.push(`- ⚠️ ${loop.detail}`);
+                    lines.push(`- Warning: ${loop.detail}`);
                 }
                 lines.push('');
             }
@@ -585,7 +622,7 @@ class RestoreOrchestrator {
             // Special instruction for mid-turn resume
             lines.push('INSTRUCTION: Continue from the exact point shown above.');
             lines.push('Do not recap. Do not restart. Continue the sentence/action if mid-sentence.');
-            lines.push('Start your response with: "✓ Continuing -"');
+            lines.push('Start your response with: "Continuing -"');
         }
         else {
             // Standard restore format
@@ -598,7 +635,7 @@ class RestoreOrchestrator {
                 lines.push('\n[...truncated...]');
             }
             lines.push('');
-            lines.push('## Recent Turns (older → newer)');
+            lines.push('## Recent Turns (older to newer)');
             // Add turn summaries (skip last one since it's shown in detail above)
             const turnsToShow = payload.restored_turns.slice(0, -1);
             for (let i = 0; i < turnsToShow.length; i++) {
@@ -611,7 +648,7 @@ class RestoreOrchestrator {
             lines.push('');
             lines.push('INSTRUCTION: Resume seamlessly where you left off.');
             lines.push('Do not ask "what were we doing?"');
-            lines.push('Start your response with: "✓ Continuing -"');
+            lines.push('Start your response with: "Continuing -"');
         }
         lines.push('</system-reminder>');
         return lines.join('\n');
@@ -625,9 +662,14 @@ class RestoreOrchestrator {
             local_sessions: stats.session_count,
             local_turns: stats.total_turns,
             local_size_bytes: stats.cache_size_bytes,
+            instance_id: stats.instance_id,
         };
     }
 }
 exports.RestoreOrchestrator = RestoreOrchestrator;
-// Export singleton instance
+// Export factory function
+function createRestoreOrchestrator(instanceId) {
+    return new RestoreOrchestrator(instanceId);
+}
+// Export default instance using EKKOS_INSTANCE_ID from env
 exports.restoreOrchestrator = new RestoreOrchestrator();