happy-coder 0.10.0-4 → 0.10.1

package/dist/{index-67rskwL7.cjs → index-B_nemqpL.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-BcDnTXMg.cjs');
+var types = require('./types-DOKP_I5s.cjs');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
 var node_readline = require('node:readline');
@@ -25,6 +25,7 @@ var path = require('path');
 var psList = require('ps-list');
 var spawn = require('cross-spawn');
 var os$1 = require('os');
+var tmp = require('tmp');
 var qrcode = require('qrcode-terminal');
 var open = require('open');
 var fastify = require('fastify');
@@ -37,6 +38,25 @@ var http = require('http');
 var util = require('util');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var tmp__namespace = /*#__PURE__*/_interopNamespaceDefault(tmp);
+
 class Session {
   path;
   logPath;
@@ -166,9 +186,39 @@ function trimIdent(text) {
   return trimmedLines.join("\n");
 }
 
-const systemPrompt = trimIdent(`
-    ALWAYS when you start a new chat - you must call a tool "mcp__happy__change_title" to set a chat title. When you think chat title is not relevant anymore - call the tool again to change it. When chat name is too generic and you have a change to make it more specific - call the tool again to change it. This title is needed to easily find the chat in the future. Help human.
+function getClaudeSettingsPath() {
+  const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || node_path.join(os.homedir(), ".claude");
+  return node_path.join(claudeConfigDir, "settings.json");
+}
+function readClaudeSettings() {
+  try {
+    const settingsPath = getClaudeSettingsPath();
+    if (!fs.existsSync(settingsPath)) {
+      types.logger.debug(`[ClaudeSettings] No Claude settings file found at ${settingsPath}`);
+      return null;
+    }
+    const settingsContent = fs.readFileSync(settingsPath, "utf-8");
+    const settings = JSON.parse(settingsContent);
+    types.logger.debug(`[ClaudeSettings] Successfully read Claude settings from ${settingsPath}`);
+    types.logger.debug(`[ClaudeSettings] includeCoAuthoredBy: ${settings.includeCoAuthoredBy}`);
+    return settings;
+  } catch (error) {
+    types.logger.debug(`[ClaudeSettings] Error reading Claude settings: ${error}`);
+    return null;
+  }
+}
+function shouldIncludeCoAuthoredBy() {
+  const settings = readClaudeSettings();
+  if (!settings || settings.includeCoAuthoredBy === void 0) {
+    return true;
+  }
+  return settings.includeCoAuthoredBy;
+}
 
+const BASE_SYSTEM_PROMPT = (() => trimIdent(`
+    ALWAYS when you start a new chat - you must call a tool "mcp__happy__change_title" to set a chat title. When you think chat title is not relevant anymore - call the tool again to change it. When chat name is too generic and you have a change to make it more specific - call the tool again to change it. This title is needed to easily find the chat in the future. Help human.
+`))();
+const CO_AUTHORED_CREDITS = (() => trimIdent(`
     When making commit messages, instead of just giving co-credit to Claude, also give credit to Happy like so:
 
     <main commit message>
@@ -178,7 +228,15 @@ const systemPrompt = trimIdent(`
 
     Co-Authored-By: Claude <noreply@anthropic.com>
     Co-Authored-By: Happy <yesreply@happy.engineering>
-`);
+`))();
+const systemPrompt = (() => {
+  const includeCoAuthored = shouldIncludeCoAuthoredBy();
+  if (includeCoAuthored) {
+    return BASE_SYSTEM_PROMPT + "\n\n" + CO_AUTHORED_CREDITS;
+  } else {
+    return BASE_SYSTEM_PROMPT;
+  }
+})();
 
 const claudeCliPath = node_path.resolve(node_path.join(types.projectPath(), "scripts", "claude_local_launcher.cjs"));
 async function claudeLocal(opts) {
@@ -923,7 +981,7 @@ class AbortError extends Error {
   }
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-67rskwL7.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B_nemqpL.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.join(__filename$1, "..");
 function getDefaultClaudeCodePath() {
   return node_path.join(__dirname$1, "..", "..", "..", "node_modules", "@anthropic-ai", "claude-code", "cli.js");
@@ -4268,7 +4326,22 @@ async function startDaemon() {
         }
       }
       try {
+        let extraEnv = {};
+        if (options.token) {
+          if (options.agent === "codex") {
+            const codexHomeDir = tmp__namespace.dirSync();
+            fs$1.writeFile(path.join(codexHomeDir.name, "auth.json"), options.token);
+            extraEnv = {
+              CODEX_HOME: codexHomeDir.name
+            };
+          } else {
+            extraEnv = {
+              CLAUDE_CODE_OAUTH_TOKEN: options.token
+            };
+          }
+        }
         const args = [
+          options.agent === "claude" ? "claude" : "codex",
           "--happy-starting-mode",
           "remote",
           "--started-by",
@@ -4278,9 +4351,12 @@ async function startDaemon() {
           cwd: directory,
           detached: true,
           // Sessions stay alive when daemon stops
-          stdio: ["ignore", "pipe", "pipe"]
+          stdio: ["ignore", "pipe", "pipe"],
           // Capture stdout/stderr for debugging
-          // env is inherited automatically from parent process
+          env: {
+            ...process.env,
+            ...extraEnv
+          }
         });
         if (process.env.DEBUG) {
           happyProcess.stdout?.on("data", (data) => {
@@ -4631,7 +4707,8 @@ async function runClaude(credentials, options = {}) {
     startedBy: options.startedBy || "terminal",
     // Initialize lifecycle state
     lifecycleState: "running",
-    lifecycleStateSince: Date.now()
+    lifecycleStateSince: Date.now(),
+    flavor: "claude"
   };
   const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   types.logger.debug(`Session created: ${response.id}`);
@@ -5726,11 +5803,17 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BLNf5zb1.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-BjT2Vmcd.cjs'); });
+      let startedBy = void 0;
+      for (let i = 1; i < args.length; i++) {
+        if (args[i] === "--started-by") {
+          startedBy = args[++i];
+        }
+      }
       const {
         credentials
       } = await authAndSetupMachineIfNeeded();
-      await runCodex({ credentials });
+      await runCodex({ credentials, startedBy });
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
       if (process.env.DEBUG) {
@@ -5863,6 +5946,9 @@ ${chalk.bold("To clean up runaway processes:")} Use ${chalk.cyan("happy doctor c
     }
     return;
   } else {
+    if (args.length > 0 && args[0] === "claude") {
+      args.shift();
+    }
     const options = {};
     let showHelp = false;
     let showVersion = false;
@@ -6029,5 +6115,8 @@ exports.MessageBuffer = MessageBuffer;
 exports.MessageQueue2 = MessageQueue2;
 exports.hashObject = hashObject;
 exports.initialMachineMetadata = initialMachineMetadata;
+exports.notifyDaemonSessionStarted = notifyDaemonSessionStarted;
+exports.registerKillSessionHandler = registerKillSessionHandler;
 exports.startHappyServer = startHappyServer;
+exports.stopCaffeinate = stopCaffeinate;
 exports.trimIdent = trimIdent;

package/dist/{index-Dw96QD4T.mjs → index-Cp1f1oto.mjs}

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import os$1, { homedir } from 'node:os';
 import { randomUUID, randomBytes } from 'node:crypto';
-import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, f as AsyncLock, g as readDaemonState, h as clearDaemonState, b as packageJson, c as configuration, r as readSettings, i as readCredentials, j as encodeBase64, u as updateSettings, k as encodeBase64Url, m as decodeBase64, w as writeCredentialsLegacy, n as writeCredentialsDataKey, o as acquireDaemonLock, q as writeDaemonState, A as ApiClient, s as releaseDaemonLock, t as clearCredentials, v as clearMachineId, x as getLatestDaemonLog } from './types-2wHnX7UW.mjs';
+import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, f as AsyncLock, g as readDaemonState, h as clearDaemonState, b as packageJson, c as configuration, r as readSettings, i as readCredentials, j as encodeBase64, u as updateSettings, k as encodeBase64Url, m as decodeBase64, w as writeCredentialsLegacy, n as writeCredentialsDataKey, o as acquireDaemonLock, q as writeDaemonState, A as ApiClient, s as releaseDaemonLock, t as clearCredentials, v as clearMachineId, x as getLatestDaemonLog } from './types-CYZG1S69.mjs';
 import { spawn, execSync, execFileSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -23,6 +23,7 @@ import { join as join$1 } from 'path';
 import psList from 'ps-list';
 import spawn$2 from 'cross-spawn';
 import os from 'os';
+import * as tmp from 'tmp';
 import qrcode from 'qrcode-terminal';
 import open from 'open';
 import fastify from 'fastify';
@@ -163,9 +164,39 @@ function trimIdent(text) {
   return trimmedLines.join("\n");
 }
 
-const systemPrompt = trimIdent(`
-    ALWAYS when you start a new chat - you must call a tool "mcp__happy__change_title" to set a chat title. When you think chat title is not relevant anymore - call the tool again to change it. When chat name is too generic and you have a change to make it more specific - call the tool again to change it. This title is needed to easily find the chat in the future. Help human.
+function getClaudeSettingsPath() {
+  const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), ".claude");
+  return join(claudeConfigDir, "settings.json");
+}
+function readClaudeSettings() {
+  try {
+    const settingsPath = getClaudeSettingsPath();
+    if (!existsSync(settingsPath)) {
+      logger.debug(`[ClaudeSettings] No Claude settings file found at ${settingsPath}`);
+      return null;
+    }
+    const settingsContent = readFileSync(settingsPath, "utf-8");
+    const settings = JSON.parse(settingsContent);
+    logger.debug(`[ClaudeSettings] Successfully read Claude settings from ${settingsPath}`);
+    logger.debug(`[ClaudeSettings] includeCoAuthoredBy: ${settings.includeCoAuthoredBy}`);
+    return settings;
+  } catch (error) {
+    logger.debug(`[ClaudeSettings] Error reading Claude settings: ${error}`);
+    return null;
+  }
+}
+function shouldIncludeCoAuthoredBy() {
+  const settings = readClaudeSettings();
+  if (!settings || settings.includeCoAuthoredBy === void 0) {
+    return true;
+  }
+  return settings.includeCoAuthoredBy;
+}
 
+const BASE_SYSTEM_PROMPT = (() => trimIdent(`
+    ALWAYS when you start a new chat - you must call a tool "mcp__happy__change_title" to set a chat title. When you think chat title is not relevant anymore - call the tool again to change it. When chat name is too generic and you have a change to make it more specific - call the tool again to change it. This title is needed to easily find the chat in the future. Help human.
+`))();
+const CO_AUTHORED_CREDITS = (() => trimIdent(`
     When making commit messages, instead of just giving co-credit to Claude, also give credit to Happy like so:
 
     <main commit message>
@@ -175,7 +206,15 @@ const systemPrompt = trimIdent(`
 
     Co-Authored-By: Claude <noreply@anthropic.com>
     Co-Authored-By: Happy <yesreply@happy.engineering>
-`);
+`))();
+const systemPrompt = (() => {
+  const includeCoAuthored = shouldIncludeCoAuthoredBy();
+  if (includeCoAuthored) {
+    return BASE_SYSTEM_PROMPT + "\n\n" + CO_AUTHORED_CREDITS;
+  } else {
+    return BASE_SYSTEM_PROMPT;
+  }
+})();
 
 const claudeCliPath = resolve(join(projectPath(), "scripts", "claude_local_launcher.cjs"));
 async function claudeLocal(opts) {
@@ -4265,7 +4304,22 @@ async function startDaemon() {
         }
       }
       try {
+        let extraEnv = {};
+        if (options.token) {
+          if (options.agent === "codex") {
+            const codexHomeDir = tmp.dirSync();
+            fs.writeFile(join$1(codexHomeDir.name, "auth.json"), options.token);
+            extraEnv = {
+              CODEX_HOME: codexHomeDir.name
+            };
+          } else {
+            extraEnv = {
+              CLAUDE_CODE_OAUTH_TOKEN: options.token
+            };
+          }
+        }
         const args = [
+          options.agent === "claude" ? "claude" : "codex",
           "--happy-starting-mode",
           "remote",
           "--started-by",
@@ -4275,9 +4329,12 @@ async function startDaemon() {
           cwd: directory,
           detached: true,
           // Sessions stay alive when daemon stops
-          stdio: ["ignore", "pipe", "pipe"]
+          stdio: ["ignore", "pipe", "pipe"],
           // Capture stdout/stderr for debugging
-          // env is inherited automatically from parent process
+          env: {
+            ...process.env,
+            ...extraEnv
+          }
         });
         if (process.env.DEBUG) {
           happyProcess.stdout?.on("data", (data) => {
@@ -4628,7 +4685,8 @@ async function runClaude(credentials, options = {}) {
     startedBy: options.startedBy || "terminal",
     // Initialize lifecycle state
     lifecycleState: "running",
-    lifecycleStateSince: Date.now()
+    lifecycleStateSince: Date.now(),
+    flavor: "claude"
   };
   const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   logger.debug(`Session created: ${response.id}`);
@@ -5723,11 +5781,17 @@ async function handleConnectVendor(vendor, displayName) {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-BNH8w4O9.mjs');
+      const { runCodex } = await import('./runCodex-CHAghw9e.mjs');
+      let startedBy = void 0;
+      for (let i = 1; i < args.length; i++) {
+        if (args[i] === "--started-by") {
+          startedBy = args[++i];
+        }
+      }
       const {
         credentials
       } = await authAndSetupMachineIfNeeded();
-      await runCodex({ credentials });
+      await runCodex({ credentials, startedBy });
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
       if (process.env.DEBUG) {
@@ -5860,6 +5924,9 @@ ${chalk.bold("To clean up runaway processes:")} Use ${chalk.cyan("happy doctor c
     }
     return;
   } else {
+    if (args.length > 0 && args[0] === "claude") {
+      args.shift();
+    }
     const options = {};
     let showHelp = false;
     let showVersion = false;
@@ -6022,4 +6089,4 @@ ${chalk.bold("Examples:")}
   }
 }
 
-export { MessageQueue2 as M, MessageBuffer as a, hashObject as h, initialMachineMetadata as i, startHappyServer as s, trimIdent as t };
+export { MessageQueue2 as M, MessageBuffer as a, stopCaffeinate as b, hashObject as h, initialMachineMetadata as i, notifyDaemonSessionStarted as n, registerKillSessionHandler as r, startHappyServer as s, trimIdent as t };

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-67rskwL7.cjs');
-require('./types-BcDnTXMg.cjs');
+require('./index-B_nemqpL.cjs');
+require('./types-DOKP_I5s.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');
@@ -27,6 +27,7 @@ require('path');
 require('ps-list');
 require('cross-spawn');
 require('os');
+require('tmp');
 require('qrcode-terminal');
 require('open');
 require('fastify');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-Dw96QD4T.mjs';
-import './types-2wHnX7UW.mjs';
+import './index-Cp1f1oto.mjs';
+import './types-CYZG1S69.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';
@@ -25,6 +25,7 @@ import 'path';
 import 'ps-list';
 import 'cross-spawn';
 import 'os';
+import 'tmp';
 import 'qrcode-terminal';
 import 'open';
 import 'fastify';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-BcDnTXMg.cjs');
+var types = require('./types-DOKP_I5s.cjs');
 require('axios');
 require('chalk');
 require('fs');

package/dist/lib.d.cts

@@ -638,6 +638,8 @@ interface SpawnSessionOptions {
     directory: string;
     sessionId?: string;
     approvedNewDirectoryCreation?: boolean;
+    agent?: 'claude' | 'codex';
+    token?: string;
 }
 type SpawnSessionResult = {
     type: 'success';

package/dist/lib.d.mts

@@ -638,6 +638,8 @@ interface SpawnSessionOptions {
     directory: string;
     sessionId?: string;
     approvedNewDirectoryCreation?: boolean;
+    agent?: 'claude' | 'codex';
+    token?: string;
 }
 type SpawnSessionResult = {
     type: 'success';

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-2wHnX7UW.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-CYZG1S69.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';

package/dist/{runCodex-BLNf5zb1.cjs → runCodex-BjT2Vmcd.cjs}

@@ -2,13 +2,13 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-BcDnTXMg.cjs');
+var types = require('./types-DOKP_I5s.cjs');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var stdio_js = require('@modelcontextprotocol/sdk/client/stdio.js');
 var z = require('zod');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var node_crypto = require('node:crypto');
-var index = require('./index-67rskwL7.cjs');
+var index = require('./index-B_nemqpL.cjs');
 var os = require('node:os');
 var node_path = require('node:path');
 var fs = require('node:fs');
@@ -32,6 +32,7 @@ require('node:readline');
 require('node:url');
 require('ps-list');
 require('cross-spawn');
+require('tmp');
 require('qrcode-terminal');
 require('open');
 require('fastify');
@@ -182,8 +183,16 @@ class CodexMcpClient {
     return this.sessionId !== null;
   }
   clearSession() {
+    const previousSessionId = this.sessionId;
     this.sessionId = null;
-    types.logger.debug("[CodexMCP] Session cleared");
+    types.logger.debug("[CodexMCP] Session cleared, previous sessionId:", previousSessionId);
+  }
+  /**
+   * Store the current session ID without clearing it, useful for abort handling
+   */
+  storeSessionForResume() {
+    types.logger.debug("[CodexMCP] Storing session for potential resume:", this.sessionId);
+    return this.sessionId;
   }
   async disconnect() {
     if (!this.connected) return;
@@ -681,6 +690,7 @@ const CodexDisplay = ({ messageBuffer, logPath, onExit }) => {
 async function runCodex(opts) {
   const sessionTag = node_crypto.randomUUID();
   const api = await types.ApiClient.create(opts.credentials);
+  types.logger.debug(`[codex] Starting with options: startedBy=${opts.startedBy || "terminal"}`);
   const settings = await types.readSettings();
   let machineId = settings?.machineId;
   if (!machineId) {
@@ -705,9 +715,9 @@ async function runCodex(opts) {
     happyHomeDir: types.configuration.happyHomeDir,
     happyLibDir: types.projectPath(),
     happyToolsDir: node_path.resolve(types.projectPath(), "tools", "unpacked"),
-    startedFromDaemon: false,
+    startedFromDaemon: opts.startedBy === "daemon",
     hostPid: process.pid,
-    startedBy: "terminal",
+    startedBy: opts.startedBy || "terminal",
     // Initialize lifecycle state
     lifecycleState: "running",
     lifecycleStateSince: Date.now(),
@@ -715,6 +725,17 @@ async function runCodex(opts) {
   };
   const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   const session = api.sessionSyncClient(response);
+  try {
+    types.logger.debug(`[START] Reporting session ${response.id} to daemon`);
+    const result = await index.notifyDaemonSessionStarted(response.id, metadata);
+    if (result.error) {
+      types.logger.debug(`[START] Failed to report to daemon (may not be running):`, result.error);
+    } else {
+      types.logger.debug(`[START] Reported session ${response.id} to daemon`);
+    }
+  } catch (error) {
+    types.logger.debug("[START] Failed to report to daemon (may not be running):", error);
+  }
   const messageQueue = new index.MessageQueue2((mode) => index.hashObject({
     permissionMode: mode.permissionMode,
     model: mode.model
@@ -768,22 +789,54 @@ async function runCodex(opts) {
   }
   let abortController = new AbortController();
   let shouldExit = false;
+  let storedSessionIdForResume = null;
   async function handleAbort() {
-    types.logger.debug("[Codex] Abort requested");
+    types.logger.debug("[Codex] Abort requested - stopping current task");
     try {
+      if (client.hasActiveSession()) {
+        storedSessionIdForResume = client.storeSessionForResume();
+        types.logger.debug("[Codex] Stored session for resume:", storedSessionIdForResume);
+      }
       abortController.abort();
       messageQueue.reset();
       permissionHandler.reset();
       reasoningProcessor.abort();
       diffProcessor.reset();
-      types.logger.debug("[Codex] Abort completed");
+      types.logger.debug("[Codex] Abort completed - session remains active");
     } catch (error) {
       types.logger.debug("[Codex] Error during abort:", error);
     } finally {
       abortController = new AbortController();
     }
   }
+  const handleKillSession = async () => {
+    types.logger.debug("[Codex] Kill session requested - terminating process");
+    await handleAbort();
+    types.logger.debug("[Codex] Abort completed, proceeding with termination");
+    try {
+      if (session) {
+        session.updateMetadata((currentMetadata) => ({
+          ...currentMetadata,
+          lifecycleState: "archived",
+          lifecycleStateSince: Date.now(),
+          archivedBy: "cli",
+          archiveReason: "User terminated"
+        }));
+        session.sendSessionDeath();
+        await session.flush();
+        await session.close();
+      }
+      index.stopCaffeinate();
+      happyServer.stop();
+      types.logger.debug("[Codex] Session termination complete, exiting");
+      process.exit(0);
+    } catch (error) {
+      types.logger.debug("[Codex] Error during session termination:", error);
+      process.exit(1);
+    }
+  };
   session.rpcHandlerManager.registerHandler("abort", handleAbort);
+  index.registerKillSessionHandler(session.rpcHandlerManager, handleKillSession);
   const messageBuffer = new index.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -831,7 +884,8 @@ async function runCodex(opts) {
         return acc;
       };
       var collectFilesRecursive = collectFilesRecursive2;
-      const rootDir = node_path.join(os.homedir(), ".codex", "sessions");
+      const codexHomeDir = process.env.CODEX_HOME || node_path.join(os.homedir(), ".codex");
+      const rootDir = node_path.join(codexHomeDir, "sessions");
       const candidates = collectFilesRecursive2(rootDir).filter((full) => full.endsWith(`-${sessionId}.jsonl`)).filter((full) => {
         try {
           return fs.statSync(full).isFile();
@@ -998,8 +1052,13 @@ async function runCodex(opts) {
       let message = pending;
       pending = null;
       if (!message) {
-        const batch = await messageQueue.waitForMessagesAndGetAsString(abortController.signal);
-        if (!batch || shouldExit) {
+        const waitSignal = abortController.signal;
+        const batch = await messageQueue.waitForMessagesAndGetAsString(waitSignal);
+        if (!batch) {
+          if (waitSignal.aborted && !shouldExit) {
+            types.logger.debug("[codex]: Wait aborted while idle; ignoring and continuing");
+            continue;
+          }
           types.logger.debug(`[codex]: batch=${!!batch}, shouldExit=${shouldExit}`);
           break;
         }
@@ -1072,9 +1131,22 @@ async function runCodex(opts) {
           if (message.mode.model) {
             startConfig.model = message.mode.model;
           }
+          let resumeFile = null;
           if (nextExperimentalResume) {
-            startConfig.config.experimental_resume = nextExperimentalResume;
+            resumeFile = nextExperimentalResume;
             nextExperimentalResume = null;
+            types.logger.debug("[Codex] Using resume file from mode change:", resumeFile);
+          } else if (storedSessionIdForResume) {
+            const abortResumeFile = findCodexResumeFile(storedSessionIdForResume);
+            if (abortResumeFile) {
+              resumeFile = abortResumeFile;
+              types.logger.debug("[Codex] Using resume file from aborted session:", resumeFile);
+              messageBuffer.addMessage("Resuming from aborted session...", "status");
+            }
+            storedSessionIdForResume = null;
+          }
+          if (resumeFile) {
+            startConfig.config.experimental_resume = resumeFile;
           }
           await client.startSession(
             startConfig,
@@ -1090,12 +1162,20 @@ async function runCodex(opts) {
         }
       } catch (error) {
         types.logger.warn("Error in codex session:", error);
-        if (error instanceof Error && error.name === "AbortError") {
+        const isAbortError = error instanceof Error && error.name === "AbortError";
+        if (isAbortError) {
           messageBuffer.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
+          wasCreated = false;
+          currentModeHash = null;
+          types.logger.debug("[Codex] Marked session as not created after abort for proper resume");
         } else {
           messageBuffer.addMessage("Process exited unexpectedly", "status");
           session.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
+          if (client.hasActiveSession()) {
+            storedSessionIdForResume = client.storeSessionForResume();
+            types.logger.debug("[Codex] Stored session after unexpected error:", storedSessionIdForResume);
+          }
         }
       } finally {
         permissionHandler.reset();
@@ -1107,7 +1187,7 @@ async function runCodex(opts) {
       }
     }
   } finally {
-    types.logger.debug("[codex]: Cleanup start");
+    types.logger.debug("[codex]: Final cleanup start");
     logActiveHandles("cleanup-start");
     try {
       types.logger.debug("[codex]: sendSessionDeath");
@@ -1148,7 +1228,7 @@ async function runCodex(opts) {
     }
     messageBuffer.clear();
     logActiveHandles("cleanup-end");
-    types.logger.debug("[codex]: Cleanup completed");
+    types.logger.debug("[codex]: Final cleanup completed");
   }
 }
 

package/dist/{runCodex-BNH8w4O9.mjs → runCodex-CHAghw9e.mjs}

@@ -1,12 +1,12 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-2wHnX7UW.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-CYZG1S69.mjs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { z } from 'zod';
 import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { randomUUID } from 'node:crypto';
-import { i as initialMachineMetadata, M as MessageQueue2, h as hashObject, a as MessageBuffer, s as startHappyServer, t as trimIdent } from './index-Dw96QD4T.mjs';
+import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler, a as MessageBuffer, s as startHappyServer, t as trimIdent, b as stopCaffeinate } from './index-Cp1f1oto.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';
@@ -30,6 +30,7 @@ import 'node:readline';
 import 'node:url';
 import 'ps-list';
 import 'cross-spawn';
+import 'tmp';
 import 'qrcode-terminal';
 import 'open';
 import 'fastify';
@@ -180,8 +181,16 @@ class CodexMcpClient {
     return this.sessionId !== null;
   }
   clearSession() {
+    const previousSessionId = this.sessionId;
     this.sessionId = null;
-    logger.debug("[CodexMCP] Session cleared");
+    logger.debug("[CodexMCP] Session cleared, previous sessionId:", previousSessionId);
+  }
+  /**
+   * Store the current session ID without clearing it, useful for abort handling
+   */
+  storeSessionForResume() {
+    logger.debug("[CodexMCP] Storing session for potential resume:", this.sessionId);
+    return this.sessionId;
   }
   async disconnect() {
     if (!this.connected) return;
@@ -679,6 +688,7 @@ const CodexDisplay = ({ messageBuffer, logPath, onExit }) => {
 async function runCodex(opts) {
   const sessionTag = randomUUID();
   const api = await ApiClient.create(opts.credentials);
+  logger.debug(`[codex] Starting with options: startedBy=${opts.startedBy || "terminal"}`);
   const settings = await readSettings();
   let machineId = settings?.machineId;
   if (!machineId) {
@@ -703,9 +713,9 @@ async function runCodex(opts) {
     happyHomeDir: configuration.happyHomeDir,
     happyLibDir: projectPath(),
     happyToolsDir: resolve(projectPath(), "tools", "unpacked"),
-    startedFromDaemon: false,
+    startedFromDaemon: opts.startedBy === "daemon",
     hostPid: process.pid,
-    startedBy: "terminal",
+    startedBy: opts.startedBy || "terminal",
     // Initialize lifecycle state
     lifecycleState: "running",
     lifecycleStateSince: Date.now(),
@@ -713,6 +723,17 @@ async function runCodex(opts) {
   };
   const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   const session = api.sessionSyncClient(response);
+  try {
+    logger.debug(`[START] Reporting session ${response.id} to daemon`);
+    const result = await notifyDaemonSessionStarted(response.id, metadata);
+    if (result.error) {
+      logger.debug(`[START] Failed to report to daemon (may not be running):`, result.error);
+    } else {
+      logger.debug(`[START] Reported session ${response.id} to daemon`);
+    }
+  } catch (error) {
+    logger.debug("[START] Failed to report to daemon (may not be running):", error);
+  }
   const messageQueue = new MessageQueue2((mode) => hashObject({
     permissionMode: mode.permissionMode,
     model: mode.model
@@ -766,22 +787,54 @@ async function runCodex(opts) {
   }
   let abortController = new AbortController();
   let shouldExit = false;
+  let storedSessionIdForResume = null;
   async function handleAbort() {
-    logger.debug("[Codex] Abort requested");
+    logger.debug("[Codex] Abort requested - stopping current task");
     try {
+      if (client.hasActiveSession()) {
+        storedSessionIdForResume = client.storeSessionForResume();
+        logger.debug("[Codex] Stored session for resume:", storedSessionIdForResume);
+      }
       abortController.abort();
       messageQueue.reset();
       permissionHandler.reset();
       reasoningProcessor.abort();
       diffProcessor.reset();
-      logger.debug("[Codex] Abort completed");
+      logger.debug("[Codex] Abort completed - session remains active");
     } catch (error) {
       logger.debug("[Codex] Error during abort:", error);
     } finally {
       abortController = new AbortController();
     }
   }
+  const handleKillSession = async () => {
+    logger.debug("[Codex] Kill session requested - terminating process");
+    await handleAbort();
+    logger.debug("[Codex] Abort completed, proceeding with termination");
+    try {
+      if (session) {
+        session.updateMetadata((currentMetadata) => ({
+          ...currentMetadata,
+          lifecycleState: "archived",
+          lifecycleStateSince: Date.now(),
+          archivedBy: "cli",
+          archiveReason: "User terminated"
+        }));
+        session.sendSessionDeath();
+        await session.flush();
+        await session.close();
+      }
+      stopCaffeinate();
+      happyServer.stop();
+      logger.debug("[Codex] Session termination complete, exiting");
+      process.exit(0);
+    } catch (error) {
+      logger.debug("[Codex] Error during session termination:", error);
+      process.exit(1);
+    }
+  };
   session.rpcHandlerManager.registerHandler("abort", handleAbort);
+  registerKillSessionHandler(session.rpcHandlerManager, handleKillSession);
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -829,7 +882,8 @@ async function runCodex(opts) {
         return acc;
       };
       var collectFilesRecursive = collectFilesRecursive2;
-      const rootDir = join(os.homedir(), ".codex", "sessions");
+      const codexHomeDir = process.env.CODEX_HOME || join(os.homedir(), ".codex");
+      const rootDir = join(codexHomeDir, "sessions");
       const candidates = collectFilesRecursive2(rootDir).filter((full) => full.endsWith(`-${sessionId}.jsonl`)).filter((full) => {
         try {
           return fs.statSync(full).isFile();
@@ -996,8 +1050,13 @@ async function runCodex(opts) {
       let message = pending;
       pending = null;
       if (!message) {
-        const batch = await messageQueue.waitForMessagesAndGetAsString(abortController.signal);
-        if (!batch || shouldExit) {
+        const waitSignal = abortController.signal;
+        const batch = await messageQueue.waitForMessagesAndGetAsString(waitSignal);
+        if (!batch) {
+          if (waitSignal.aborted && !shouldExit) {
+            logger.debug("[codex]: Wait aborted while idle; ignoring and continuing");
+            continue;
+          }
           logger.debug(`[codex]: batch=${!!batch}, shouldExit=${shouldExit}`);
           break;
         }
@@ -1070,9 +1129,22 @@ async function runCodex(opts) {
           if (message.mode.model) {
             startConfig.model = message.mode.model;
           }
+          let resumeFile = null;
           if (nextExperimentalResume) {
-            startConfig.config.experimental_resume = nextExperimentalResume;
+            resumeFile = nextExperimentalResume;
             nextExperimentalResume = null;
+            logger.debug("[Codex] Using resume file from mode change:", resumeFile);
+          } else if (storedSessionIdForResume) {
+            const abortResumeFile = findCodexResumeFile(storedSessionIdForResume);
+            if (abortResumeFile) {
+              resumeFile = abortResumeFile;
+              logger.debug("[Codex] Using resume file from aborted session:", resumeFile);
+              messageBuffer.addMessage("Resuming from aborted session...", "status");
+            }
+            storedSessionIdForResume = null;
+          }
+          if (resumeFile) {
+            startConfig.config.experimental_resume = resumeFile;
           }
           await client.startSession(
             startConfig,
@@ -1088,12 +1160,20 @@ async function runCodex(opts) {
         }
       } catch (error) {
         logger.warn("Error in codex session:", error);
-        if (error instanceof Error && error.name === "AbortError") {
+        const isAbortError = error instanceof Error && error.name === "AbortError";
+        if (isAbortError) {
           messageBuffer.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
+          wasCreated = false;
+          currentModeHash = null;
+          logger.debug("[Codex] Marked session as not created after abort for proper resume");
         } else {
           messageBuffer.addMessage("Process exited unexpectedly", "status");
           session.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
+          if (client.hasActiveSession()) {
+            storedSessionIdForResume = client.storeSessionForResume();
+            logger.debug("[Codex] Stored session after unexpected error:", storedSessionIdForResume);
+          }
         }
       } finally {
         permissionHandler.reset();
@@ -1105,7 +1185,7 @@ async function runCodex(opts) {
       }
     }
   } finally {
-    logger.debug("[codex]: Cleanup start");
+    logger.debug("[codex]: Final cleanup start");
     logActiveHandles("cleanup-start");
     try {
       logger.debug("[codex]: sendSessionDeath");
@@ -1146,7 +1226,7 @@ async function runCodex(opts) {
     }
     messageBuffer.clear();
     logActiveHandles("cleanup-end");
-    logger.debug("[codex]: Cleanup completed");
+    logger.debug("[codex]: Final cleanup completed");
   }
 }
 

package/dist/{types-2wHnX7UW.mjs → types-CYZG1S69.mjs}

@@ -21,7 +21,7 @@ import { platform } from 'os';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-coder";
-var version = "0.10.0-4";
+var version = "0.10.1";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -89,8 +89,8 @@ var scripts = {
 	postinstall: "node scripts/unpack-tools.cjs"
 };
 var dependencies = {
-	"@anthropic-ai/claude-code": "^1.0.102",
-	"@anthropic-ai/sdk": "^0.56.0",
+	"@anthropic-ai/claude-code": "1.0.120",
+	"@anthropic-ai/sdk": "0.56.0",
 	"@modelcontextprotocol/sdk": "^1.15.1",
 	"@stablelib/base64": "^2.0.1",
 	"@stablelib/hex": "^2.0.1",
@@ -99,6 +99,7 @@ var dependencies = {
 	"@types/ps-list": "^6.2.1",
 	"@types/qrcode-terminal": "^0.12.2",
 	"@types/react": "^19.1.9",
+	"@types/tmp": "^0.2.6",
 	axios: "^1.10.0",
 	chalk: "^5.4.1",
 	"cross-spawn": "^7.0.6",
@@ -114,6 +115,7 @@ var dependencies = {
 	react: "^19.1.1",
 	"socket.io-client": "^4.8.1",
 	tar: "^7.4.3",
+	tmp: "^0.2.5",
 	tweetnacl: "^1.0.3",
 	zod: "^3.23.8"
 };
@@ -1627,11 +1629,12 @@ class ApiMachineClient {
     requestShutdown
   }) {
     this.rpcHandlerManager.registerHandler("spawn-happy-session", async (params) => {
-      const { directory, sessionId, machineId, approvedNewDirectoryCreation } = params || {};
+      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token } = params || {};
+      logger.debug(`[API MACHINE] Spawning session with params: ${JSON.stringify(params)}`);
       if (!directory) {
         throw new Error("Directory is required");
       }
-      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation });
+      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token });
       switch (result.type) {
         case "success":
           logger.debug(`[API MACHINE] Spawned session ${result.sessionId}`);

package/dist/{types-BcDnTXMg.cjs → types-DOKP_I5s.cjs}

@@ -42,7 +42,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "happy-coder";
-var version = "0.10.0-4";
+var version = "0.10.1";
 var description = "Mobile and Web client for Claude Code and Codex";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -110,8 +110,8 @@ var scripts = {
 	postinstall: "node scripts/unpack-tools.cjs"
 };
 var dependencies = {
-	"@anthropic-ai/claude-code": "^1.0.102",
-	"@anthropic-ai/sdk": "^0.56.0",
+	"@anthropic-ai/claude-code": "1.0.120",
+	"@anthropic-ai/sdk": "0.56.0",
 	"@modelcontextprotocol/sdk": "^1.15.1",
 	"@stablelib/base64": "^2.0.1",
 	"@stablelib/hex": "^2.0.1",
@@ -120,6 +120,7 @@ var dependencies = {
 	"@types/ps-list": "^6.2.1",
 	"@types/qrcode-terminal": "^0.12.2",
 	"@types/react": "^19.1.9",
+	"@types/tmp": "^0.2.6",
 	axios: "^1.10.0",
 	chalk: "^5.4.1",
 	"cross-spawn": "^7.0.6",
@@ -135,6 +136,7 @@ var dependencies = {
 	react: "^19.1.1",
 	"socket.io-client": "^4.8.1",
 	tar: "^7.4.3",
+	tmp: "^0.2.5",
 	tweetnacl: "^1.0.3",
 	zod: "^3.23.8"
 };
@@ -1015,7 +1017,7 @@ class RpcHandlerManager {
   }
 }
 
-const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-BcDnTXMg.cjs', document.baseURI).href))));
+const __dirname$1 = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-DOKP_I5s.cjs', document.baseURI).href))));
 function projectPath() {
   const path$1 = path.resolve(__dirname$1, "..");
   return path$1;
@@ -1648,11 +1650,12 @@ class ApiMachineClient {
     requestShutdown
   }) {
     this.rpcHandlerManager.registerHandler("spawn-happy-session", async (params) => {
-      const { directory, sessionId, machineId, approvedNewDirectoryCreation } = params || {};
+      const { directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token } = params || {};
+      logger.debug(`[API MACHINE] Spawning session with params: ${JSON.stringify(params)}`);
       if (!directory) {
         throw new Error("Directory is required");
       }
-      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation });
+      const result = await spawnSession({ directory, sessionId, machineId, approvedNewDirectoryCreation, agent, token });
       switch (result.type) {
         case "success":
           logger.debug(`[API MACHINE] Spawned session ${result.sessionId}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-coder",
-  "version": "0.10.0-4",
+  "version": "0.10.1",
   "description": "Mobile and Web client for Claude Code and Codex",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",
@@ -68,8 +68,8 @@
     "postinstall": "node scripts/unpack-tools.cjs"
   },
   "dependencies": {
-    "@anthropic-ai/claude-code": "^1.0.102",
-    "@anthropic-ai/sdk": "^0.56.0",
+    "@anthropic-ai/claude-code": "1.0.120",
+    "@anthropic-ai/sdk": "0.56.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@stablelib/base64": "^2.0.1",
     "@stablelib/hex": "^2.0.1",
@@ -78,6 +78,7 @@
     "@types/ps-list": "^6.2.1",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/react": "^19.1.9",
+    "@types/tmp": "^0.2.6",
     "axios": "^1.10.0",
     "chalk": "^5.4.1",
     "cross-spawn": "^7.0.6",
@@ -93,6 +94,7 @@
     "react": "^19.1.1",
     "socket.io-client": "^4.8.1",
     "tar": "^7.4.3",
+    "tmp": "^0.2.5",
     "tweetnacl": "^1.0.3",
     "zod": "^3.23.8"
   },