cc-claw 0.4.5 → 0.4.7

package/dist/cli.js

@@ -48,7 +48,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.4.5" : (() => {
+    VERSION = true ? "0.4.7" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -358,10 +358,10 @@ function claimTask(db3, taskId, agentId) {
     ).get(...blockedBy);
     if (incomplete.count > 0) return false;
   }
-  db3.prepare(
+  const result = db3.prepare(
     "UPDATE agent_tasks SET assignee = ?, status = 'in_progress' WHERE id = ? AND status = 'pending'"
   ).run(agentId, taskId);
-  return true;
+  return result.changes > 0;
 }
 function sendInboxMessage(db3, opts) {
   const result = db3.prepare(`
@@ -2490,6 +2490,7 @@ var init_store4 = __esm({
 });
 
 // src/env.ts
+import { homedir as homedir2 } from "os";
 function stripProxyVars(env) {
   for (const key of PROXY_KEYS) delete env[key];
 }
@@ -2498,7 +2499,7 @@ function buildBaseEnv(extraOverrides) {
   for (const [k, v] of Object.entries(process.env)) {
     if (v !== void 0) env[k] = v;
   }
-  if (!env.HOME) env.HOME = `/Users/${process.env.USER ?? "unknown"}`;
+  if (!env.HOME) env.HOME = homedir2();
   stripProxyVars(env);
   if (extraOverrides) Object.assign(env, extraOverrides);
   return env;
@@ -3208,8 +3209,9 @@ async function injectMemoryContext(userMessage) {
         seen.add(mem.id);
         combinedMemories.push(mem);
       }
+      if (combinedMemories.length >= FINAL_TOP_K_MEMORIES) break;
     }
-    combinedSessions = ftsSessions;
+    combinedSessions = ftsSessions.slice(0, FINAL_TOP_K_SESSIONS);
   }
   if (combinedMemories.length === 0 && combinedSessions.length === 0) return null;
   const lines = [];
@@ -4000,8 +4002,10 @@ function spawnAgentProcess(runner, opts, callbacks) {
   const child = spawn2(runner.getExecutablePath(), args, {
     env: buildSpawnEnv(runner, opts.isSubAgent),
     cwd: opts.cwd,
-    stdio: ["ignore", "pipe", "pipe"]
+    stdio: ["ignore", "pipe", "pipe"],
+    detached: true
   });
+  child.unref();
   let resultText = "";
   let usage2;
   if (child.stdout) {
@@ -4024,7 +4028,14 @@ function spawnAgentProcess(runner, opts, callbacks) {
             if (event.usage) usage2 = event.usage;
             callbacks.onResult?.(resultText, usage2);
             if (runner.shouldKillOnResult()) {
-              child.kill("SIGTERM");
+              try {
+                if (child.pid) process.kill(-child.pid, "SIGTERM");
+              } catch {
+                try {
+                  child.kill("SIGTERM");
+                } catch {
+                }
+              }
             }
           }
         }
@@ -4104,7 +4115,7 @@ var init_cost = __esm({
 // src/mcps/propagate.ts
 import { execFile } from "child_process";
 import { promisify } from "util";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 async function discoverExistingMcps(runner) {
   try {
     const listCmd = runner.getMcpListCommand();
@@ -4113,7 +4124,7 @@ async function discoverExistingMcps(runner) {
     const result = await execFileAsync(exe, args, {
       encoding: "utf-8",
       env: runner.getEnv(),
-      cwd: homedir2(),
+      cwd: homedir3(),
       timeout: 3e4
     });
     const stdout = typeof result === "string" ? result : Array.isArray(result) ? result[0] : result?.stdout ?? null;
@@ -4628,6 +4639,26 @@ async function startAgent(agentId, chatId, opts) {
     clearTimeout(timeoutTimers.get(agentId));
     timeoutTimers.delete(agentId);
     activeProcesses.delete(agentId);
+    const crashedAgent = getAgent(db3, agentId);
+    if (crashedAgent) {
+      const mcpsCrashed = crashedAgent.mcpsAdded ? JSON.parse(crashedAgent.mcpsAdded) : [];
+      if (mcpsCrashed.length > 0) {
+        const runner2 = getRunner(crashedAgent.runnerId);
+        if (runner2) {
+          const cleanupFn = () => cleanupMcps(runner2, mcpsCrashed, db3, `agent:${agentId}`);
+          if (runner2.capabilities.mcpInjection === "add-remove") {
+            withRunnerLock(runner2.id, cleanupFn).catch((err) => {
+              warn(`[orchestrator] MCP cleanup failed for crashed agent ${agentId.slice(0, 8)}:`, err);
+            });
+          } else {
+            cleanupFn().catch((err) => {
+              warn(`[orchestrator] MCP cleanup failed for crashed agent ${agentId.slice(0, 8)}:`, err);
+            });
+          }
+        }
+      }
+      deleteMcpConfigFile(`cc-claw-${agentId.slice(0, 8)}`);
+    }
     sendInboxMessage(db3, {
       orchestrationId: agent.orchestrationId,
       toAgentId: "main",
@@ -4789,9 +4820,23 @@ function cancelAgent(agentId, reason = "user_cancelled") {
   if (!agent) return false;
   const proc = activeProcesses.get(agentId);
   if (proc) {
-    proc.kill("SIGTERM");
+    try {
+      if (proc.pid) process.kill(-proc.pid, "SIGTERM");
+    } catch {
+      try {
+        proc.kill("SIGTERM");
+      } catch {
+      }
+    }
     setTimeout(() => {
-      if (!proc.killed) proc.kill("SIGKILL");
+      try {
+        if (proc.pid) process.kill(-proc.pid, "SIGKILL");
+      } catch {
+        try {
+          proc.kill("SIGKILL");
+        } catch {
+        }
+      }
     }, 2e3);
   }
   updateAgentStatus(db3, agentId, "cancelled");
@@ -4836,7 +4881,14 @@ function cancelAllAgents(chatId, reason = "user_cancelled") {
 }
 function shutdownOrchestrator() {
   for (const [agentId, proc] of activeProcesses) {
-    proc.kill("SIGTERM");
+    try {
+      if (proc.pid) process.kill(-proc.pid, "SIGTERM");
+    } catch {
+      try {
+        proc.kill("SIGTERM");
+      } catch {
+      }
+    }
     clearTimeout(timeoutTimers.get(agentId));
   }
   activeProcesses.clear();
@@ -5532,7 +5584,7 @@ function startDashboard() {
           return jsonResponse(res, { error: "message and chatId required" }, 400);
         }
         const { askAgent: askAgent2 } = await Promise.resolve().then(() => (init_agent(), agent_exports));
-        const { getMode: getMode2, getCwd: getCwd2, getModel: getModel3, addUsage: addUsage2, getBackend: getBackend2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
+        const { getMode: getMode2, getCwd: getCwd2, getModel: getModel2, addUsage: addUsage2, getBackend: getBackend2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
         const { getAdapterForChat: getAdapterForChat2 } = await Promise.resolve().then(() => (init_backends(), backends_exports));
         const chatId = body.chatId;
         const PERM_LEVEL = { plan: 0, safe: 1, yolo: 2 };
@@ -5540,7 +5592,7 @@ function startDashboard() {
         const requestedMode = body.mode ?? storedMode;
         const mode = (PERM_LEVEL[requestedMode] ?? 2) <= (PERM_LEVEL[storedMode] ?? 2) ? requestedMode : storedMode;
         const cwd = body.cwd ?? getCwd2(chatId);
-        const model2 = body.model ?? getModel3(chatId) ?? (() => {
+        const model2 = body.model ?? getModel2(chatId) ?? (() => {
           try {
             return getAdapterForChat2(chatId).defaultModel;
           } catch {
@@ -5696,8 +5748,8 @@ data: ${JSON.stringify(data)}
     if (url.pathname === "/api/heartbeat/set" && req.method === "POST") {
       try {
         const body = JSON.parse(await readBody(req));
-        const { setHeartbeatConfig: setHeartbeatConfig3 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-        setHeartbeatConfig3(body.chatId, body);
+        const { setHeartbeatConfig: setHeartbeatConfig2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
+        setHeartbeatConfig2(body.chatId, body);
         return jsonResponse(res, { success: true });
       } catch (err) {
         return jsonResponse(res, { error: errorMessage(err) }, 400);
@@ -5998,14 +6050,21 @@ var init_server = __esm({
 var agent_exports = {};
 __export(agent_exports, {
   askAgent: () => askAgent,
-  isAgentActive: () => isAgentActive,
   isChatBusy: () => isChatBusy,
   stopAgent: () => stopAgent
 });
 import { spawn as spawn4 } from "child_process";
 import { createInterface as createInterface3 } from "readline";
-import { dirname as dirname2 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+function killProcessGroup(proc, signal = "SIGTERM") {
+  try {
+    if (proc.pid) process.kill(-proc.pid, signal);
+  } catch {
+    try {
+      proc.kill(signal);
+    } catch {
+    }
+  }
+}
 function withChatLock(chatId, fn) {
   const prev = chatLocks.get(chatId) ?? Promise.resolve();
   const isBlocked = activeChats.has(chatId);
@@ -6026,14 +6085,13 @@ function stopAgent(chatId) {
   if (!state) return false;
   state.cancelled = true;
   if (state.process) {
-    state.process.kill("SIGTERM");
-    state.killTimer = setTimeout(() => state.process?.kill("SIGKILL"), 2e3);
+    killProcessGroup(state.process, "SIGTERM");
+    state.killTimer = setTimeout(() => {
+      if (state.process) killProcessGroup(state.process, "SIGKILL");
+    }, 2e3);
   }
   return true;
 }
-function isAgentActive(chatId) {
-  return activeChats.has(chatId);
-}
 function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs) {
   const effectiveTimeout = timeoutMs ?? SPAWN_TIMEOUT_MS;
   return new Promise((resolve, reject) => {
@@ -6044,21 +6102,18 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
     const proc = spawn4(config2.executable, finalArgs, {
       env,
       stdio: ["ignore", "pipe", "pipe"],
+      detached: true,
       ...config2.cwd ? { cwd: config2.cwd } : {}
     });
+    proc.unref();
     cancelState.process = proc;
     let timedOut = false;
     let sigkillTimer;
     const spawnTimeout = setTimeout(() => {
       timedOut = true;
       warn(`[agent] Spawn timeout after ${effectiveTimeout / 1e3}s for ${adapter.id} \u2014 killing process`);
-      proc.kill("SIGTERM");
-      sigkillTimer = setTimeout(() => {
-        try {
-          proc.kill("SIGKILL");
-        } catch {
-        }
-      }, 3e3);
+      killProcessGroup(proc, "SIGTERM");
+      sigkillTimer = setTimeout(() => killProcessGroup(proc, "SIGKILL"), 3e3);
     }, effectiveTimeout);
     let resultText = "";
     let accumulatedText = "";
@@ -6146,7 +6201,7 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
                 rl2.close();
               } catch {
               }
-              proc.kill("SIGTERM");
+              killProcessGroup(proc, "SIGTERM");
             }
             break;
         }
@@ -6288,7 +6343,7 @@ function injectMcpConfig(adapterId, args, mcpConfigPath) {
   if (!flag) return args;
   return [...args, ...flag, mcpConfigPath];
 }
-var __filename2, __dirname2, activeChats, chatLocks, SPAWN_TIMEOUT_MS, MCP_CONFIG_FLAG;
+var activeChats, chatLocks, SPAWN_TIMEOUT_MS, MCP_CONFIG_FLAG;
 var init_agent = __esm({
   "src/agent.ts"() {
     "use strict";
@@ -6301,8 +6356,6 @@ var init_agent = __esm({
     init_summarize();
     init_server();
     init_mcp_config();
-    __filename2 = fileURLToPath2(import.meta.url);
-    __dirname2 = dirname2(__filename2);
     activeChats = /* @__PURE__ */ new Map();
     chatLocks = /* @__PURE__ */ new Map();
     SPAWN_TIMEOUT_MS = 10 * 60 * 1e3;
@@ -6384,7 +6437,7 @@ ${responseText.slice(0, 500)}`);
     if (!cleanText) return true;
     if (channelName === "telegram") {
       const parsed = parseTelegramTarget(targetChatId);
-      await channel.sendText(parsed.chatId, cleanText);
+      await channel.sendText(parsed.chatId, cleanText, void 0, parsed.threadId);
     } else {
       await channel.sendText(targetChatId, cleanText);
     }
@@ -6410,7 +6463,8 @@ async function deliverWebhook(job, responseText) {
         description: job.description,
         text: responseText,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
-      })
+      }),
+      signal: AbortSignal.timeout(3e4)
     });
     if (!resp.ok) {
       error(`[delivery] Webhook POST to ${url} failed: ${resp.status} ${resp.statusText}`);
@@ -6815,6 +6869,9 @@ async function executeJob(job) {
     }
   } finally {
     runningJobs.delete(job.id);
+    if (job.sessionType === "isolated" && job.thinking && job.thinking !== "auto") {
+      clearThinkingLevel(`cron:${job.id}:${runId}`);
+    }
   }
 }
 async function runWithRetry(job, model2, runId, t0) {
@@ -6911,7 +6968,7 @@ var init_cron = __esm({
 });
 
 // src/agents/runners/wrap-backend.ts
-import { join as join8 } from "path";
+import { join as join7 } from "path";
 function buildMcpCommands(backendId) {
   const exe = backendId;
   return {
@@ -6972,7 +7029,8 @@ function wrapBackendAdapter(adapter) {
         sessionId: opts.sessionId,
         permMode: opts.permMode ?? "plan",
         allowedTools: opts.allowedTools ?? [],
-        cwd: opts.cwd
+        cwd: opts.cwd,
+        model: opts.model
       });
       return config2.args;
     },
@@ -7001,7 +7059,7 @@ function wrapBackendAdapter(adapter) {
       const configPath = writeMcpConfigFile(server);
       return ["--mcp-config", configPath];
     },
-    getSkillPath: () => join8(SKILLS_PATH, `agent-${adapter.id}.md`)
+    getSkillPath: () => join7(SKILLS_PATH, `agent-${adapter.id}.md`)
   };
 }
 var BACKEND_CAPABILITIES;
@@ -7044,7 +7102,7 @@ var init_wrap_backend = __esm({
 
 // src/agents/runners/config-loader.ts
 import { readFileSync as readFileSync6, readdirSync as readdirSync4, existsSync as existsSync9, mkdirSync as mkdirSync4, watchFile, unwatchFile } from "fs";
-import { join as join9 } from "path";
+import { join as join8 } from "path";
 import { execFileSync } from "child_process";
 function resolveExecutable(config2) {
   if (existsSync9(config2.executable)) return config2.executable;
@@ -7180,7 +7238,7 @@ function configToRunner(config2) {
     prepareMcpInjection() {
       return [];
     },
-    getSkillPath: () => join9(SKILLS_PATH, `agent-${config2.id}.md`)
+    getSkillPath: () => join8(SKILLS_PATH, `agent-${config2.id}.md`)
   };
 }
 function loadRunnerConfig(filePath) {
@@ -7200,7 +7258,7 @@ function loadAllRunnerConfigs() {
   const files = readdirSync4(RUNNERS_PATH).filter((f) => f.endsWith(".json"));
   const configs = [];
   for (const file of files) {
-    const config2 = loadRunnerConfig(join9(RUNNERS_PATH, file));
+    const config2 = loadRunnerConfig(join8(RUNNERS_PATH, file));
     if (config2) configs.push(config2);
   }
   return configs;
@@ -7230,7 +7288,7 @@ function watchRunnerConfigs(onChange) {
   }
   const files = readdirSync4(RUNNERS_PATH).filter((f) => f.endsWith(".json"));
   for (const file of files) {
-    const fullPath = join9(RUNNERS_PATH, file);
+    const fullPath = join8(RUNNERS_PATH, file);
     if (watchedFiles.has(fullPath)) continue;
     watchedFiles.add(fullPath);
     watchFile(fullPath, { interval: 5e3 }, () => {
@@ -7571,6 +7629,8 @@ var init_telegram2 = __esm({
             return;
           }
           const data = ctx.callbackQuery.data;
+          await ctx.answerCallbackQuery().catch(() => {
+          });
           try {
             for (const handler2 of this.callbackHandlers) {
               await handler2(chatId, data, this);
@@ -7578,8 +7638,6 @@ var init_telegram2 = __esm({
           } catch (err) {
             error("[telegram] Callback handler error:", err);
           }
-          await ctx.answerCallbackQuery().catch(() => {
-          });
         });
         this.bot.catch((err) => {
           error("[telegram] Unhandled error:", err);
@@ -7599,11 +7657,12 @@ var init_telegram2 = __esm({
       async sendTyping(chatId) {
         await this.bot.api.sendChatAction(numericChatId(chatId), "typing");
       }
-      async sendText(chatId, text, parseMode) {
+      async sendText(chatId, text, parseMode, threadId) {
+        const threadOpts = threadId ? { message_thread_id: threadId } : {};
         if (parseMode === "plain") {
           const plainChunks = splitMessage(text);
           for (const chunk of plainChunks) {
-            await this.bot.api.sendMessage(numericChatId(chatId), chunk);
+            await this.bot.api.sendMessage(numericChatId(chatId), chunk, { ...threadOpts });
           }
           return;
         }
@@ -7612,12 +7671,14 @@ var init_telegram2 = __esm({
         for (const chunk of chunks) {
           try {
             await this.bot.api.sendMessage(numericChatId(chatId), chunk, {
-              parse_mode: "HTML"
+              parse_mode: "HTML",
+              ...threadOpts
             });
           } catch {
             await this.bot.api.sendMessage(
               numericChatId(chatId),
-              chunk.replace(/<[^>]+>/g, "")
+              chunk.replace(/<[^>]+>/g, ""),
+              { ...threadOpts }
             );
           }
         }
@@ -7642,7 +7703,9 @@ var init_telegram2 = __esm({
       }
       async sendTextReturningId(chatId, text, parseMode) {
         try {
-          const msg = await this.bot.api.sendMessage(numericChatId(chatId), text);
+          const formatted = parseMode === "html" ? text : parseMode === "plain" ? text : formatForTelegram(text);
+          const opts = parseMode === "plain" ? {} : { parse_mode: "HTML" };
+          const msg = await this.bot.api.sendMessage(numericChatId(chatId), formatted, opts);
           return msg.message_id.toString();
         } catch {
           return void 0;
@@ -7816,13 +7879,13 @@ __export(discover_exports, {
 });
 import { readdir, readFile as readFile2 } from "fs/promises";
 import { createHash } from "crypto";
-import { homedir as homedir3 } from "os";
-import { join as join10 } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join9 } from "path";
 async function discoverAllSkills() {
   const rawSkills = [];
   rawSkills.push(...await scanSkillDir(SKILLS_PATH, "cc-claw"));
   for (const backendId of getAllBackendIds()) {
-    const dirs = BACKEND_SKILL_DIRS[backendId] ?? [join10(homedir3(), `.${backendId}`, "skills")];
+    const dirs = BACKEND_SKILL_DIRS[backendId] ?? [join9(homedir4(), `.${backendId}`, "skills")];
     for (const dir of dirs) {
       rawSkills.push(...await scanSkillDir(dir, backendId));
     }
@@ -7842,7 +7905,7 @@ async function scanSkillDir(skillsDir, source) {
     let content;
     let resolvedPath;
     for (const candidate of SKILL_FILE_CANDIDATES) {
-      const p = join10(skillsDir, entry.name, candidate);
+      const p = join9(skillsDir, entry.name, candidate);
       try {
         content = await readFile2(p, "utf-8");
         resolvedPath = p;
@@ -7945,11 +8008,11 @@ var init_discover = __esm({
     init_backends();
     SKILL_FILE_CANDIDATES = ["SKILL.md", "skill.md"];
     BACKEND_SKILL_DIRS = {
-      claude: [join10(homedir3(), ".claude", "skills")],
-      gemini: [join10(homedir3(), ".gemini", "skills")],
+      claude: [join9(homedir4(), ".claude", "skills")],
+      gemini: [join9(homedir4(), ".gemini", "skills")],
       codex: [
-        join10(homedir3(), ".agents", "skills"),
-        join10(homedir3(), ".codex", "skills")
+        join9(homedir4(), ".agents", "skills"),
+        join9(homedir4(), ".codex", "skills")
       ]
     };
   }
@@ -7962,7 +8025,7 @@ __export(install_exports, {
 });
 import { mkdir, readdir as readdir2, readFile as readFile3, cp } from "fs/promises";
 import { existsSync as existsSync10 } from "fs";
-import { join as join11, basename } from "path";
+import { join as join10, basename } from "path";
 import { execSync as execSync4 } from "child_process";
 async function installSkillFromGitHub(urlOrShorthand) {
   let repoUrl;
@@ -7973,23 +8036,23 @@ async function installSkillFromGitHub(urlOrShorthand) {
   }
   repoUrl = parsed.cloneUrl;
   subPath = parsed.subPath;
-  const tmpDir = join11("/tmp", `cc-claw-skill-${Date.now()}`);
+  const tmpDir = join10("/tmp", `cc-claw-skill-${Date.now()}`);
   try {
     log(`[skill-install] Cloning ${repoUrl} to ${tmpDir}`);
     execSync4(`git clone --depth 1 ${repoUrl} ${tmpDir}`, {
       stdio: "pipe",
       timeout: 3e4
     });
-    if (!existsSync10(join11(tmpDir, ".git"))) {
+    if (!existsSync10(join10(tmpDir, ".git"))) {
       return { success: false, error: "Git clone failed: no .git directory produced" };
     }
-    const searchRoot = subPath ? join11(tmpDir, subPath) : tmpDir;
+    const searchRoot = subPath ? join10(tmpDir, subPath) : tmpDir;
     const skillDir = await findSkillDir(searchRoot);
     if (!skillDir) {
       return { success: false, error: "No SKILL.md found in the repository." };
     }
     const skillFolderName = basename(skillDir);
-    const destDir = join11(SKILLS_PATH, skillFolderName);
+    const destDir = join10(SKILLS_PATH, skillFolderName);
     if (existsSync10(destDir)) {
       log(`[skill-install] Overwriting existing skill at ${destDir}`);
     }
@@ -7997,12 +8060,12 @@ async function installSkillFromGitHub(urlOrShorthand) {
     await cp(skillDir, destDir, { recursive: true });
     let skillName = skillFolderName;
     try {
-      const content = await readFile3(join11(destDir, "SKILL.md"), "utf-8");
+      const content = await readFile3(join10(destDir, "SKILL.md"), "utf-8");
       const nameMatch = content.match(/^name:\s*(.+)$/m);
       if (nameMatch) skillName = nameMatch[1].trim().replace(/^["']|["']$/g, "");
     } catch {
       try {
-        const content = await readFile3(join11(destDir, "skill.md"), "utf-8");
+        const content = await readFile3(join10(destDir, "skill.md"), "utf-8");
         const nameMatch = content.match(/^name:\s*(.+)$/m);
         if (nameMatch) skillName = nameMatch[1].trim().replace(/^["']|["']$/g, "");
       } catch {
@@ -8037,15 +8100,15 @@ function parseGitHubUrl(input) {
 async function findSkillDir(root) {
   const candidates = ["SKILL.md", "skill.md"];
   for (const c of candidates) {
-    if (existsSync10(join11(root, c))) return root;
+    if (existsSync10(join10(root, c))) return root;
   }
   try {
     const entries = await readdir2(root, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
       for (const c of candidates) {
-        if (existsSync10(join11(root, entry.name, c))) {
-          return join11(root, entry.name);
+        if (existsSync10(join10(root, entry.name, c))) {
+          return join10(root, entry.name);
         }
       }
     }
@@ -8057,15 +8120,15 @@ async function findSkillDir(root) {
       if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
       let subEntries;
       try {
-        subEntries = await readdir2(join11(root, entry.name), { withFileTypes: true });
+        subEntries = await readdir2(join10(root, entry.name), { withFileTypes: true });
       } catch {
         continue;
       }
       for (const sub of subEntries) {
         if (!sub.isDirectory() || sub.name.startsWith(".")) continue;
         for (const c of candidates) {
-          if (existsSync10(join11(root, entry.name, sub.name, c))) {
-            return join11(root, entry.name, sub.name);
+          if (existsSync10(join10(root, entry.name, sub.name, c))) {
+            return join10(root, entry.name, sub.name);
           }
         }
       }
@@ -8084,7 +8147,7 @@ var init_install = __esm({
 
 // src/bootstrap/profile.ts
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync4, existsSync as existsSync11 } from "fs";
-import { join as join12 } from "path";
+import { join as join11 } from "path";
 function hasActiveProfile(chatId) {
   return activeProfiles.has(chatId);
 }
@@ -8229,14 +8292,14 @@ var init_profile = __esm({
     "use strict";
     init_paths();
     init_log();
-    USER_PATH2 = join12(WORKSPACE_PATH, "USER.md");
+    USER_PATH2 = join11(WORKSPACE_PATH, "USER.md");
     activeProfiles = /* @__PURE__ */ new Map();
   }
 });
 
 // src/bootstrap/heartbeat.ts
 import { readFileSync as readFileSync8, existsSync as existsSync12 } from "fs";
-import { join as join13 } from "path";
+import { join as join12 } from "path";
 function initHeartbeat(channelReg) {
   registry2 = channelReg;
 }
@@ -8244,8 +8307,18 @@ function startHeartbeatForChat(chatId) {
   stopHeartbeatForChat(chatId);
   const config2 = getHeartbeatConfig(chatId);
   if (!config2 || !config2.enabled) return;
+  let running = false;
   const timer = setInterval(async () => {
-    await runHeartbeat(chatId, config2);
+    if (running) {
+      log(`[heartbeat] Skipping tick for ${chatId}: previous heartbeat still running`);
+      return;
+    }
+    running = true;
+    try {
+      await runHeartbeat(chatId, config2);
+    } finally {
+      running = false;
+    }
   }, config2.intervalMs);
   activeTimers2.set(chatId, timer);
   const nextBeat = new Date(Date.now() + config2.intervalMs).toISOString();
@@ -8412,7 +8485,7 @@ var init_heartbeat = __esm({
     init_backends();
     init_health2();
     init_log();
-    HEARTBEAT_MD_PATH = join13(WORKSPACE_PATH, "HEARTBEAT.md");
+    HEARTBEAT_MD_PATH = join12(WORKSPACE_PATH, "HEARTBEAT.md");
     HEARTBEAT_OK = "HEARTBEAT_OK";
     registry2 = null;
     activeTimers2 = /* @__PURE__ */ new Map();
@@ -8458,8 +8531,9 @@ var init_format_time = __esm({
 });
 
 // src/media/image-gen.ts
-import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, existsSync as existsSync13 } from "fs";
-import { join as join14 } from "path";
+import { mkdirSync as mkdirSync5, existsSync as existsSync13 } from "fs";
+import { writeFile as writeFile2 } from "fs/promises";
+import { join as join13 } from "path";
 async function generateImage(prompt) {
   const apiKey = process.env.GEMINI_API_KEY;
   if (!apiKey) {
@@ -8511,9 +8585,9 @@ async function generateImage(prompt) {
   }
   const ext = mimeType.includes("jpeg") || mimeType.includes("jpg") ? "jpg" : "png";
   const filename = `img_${Date.now()}.${ext}`;
-  const filePath = join14(IMAGE_OUTPUT_DIR, filename);
+  const filePath = join13(IMAGE_OUTPUT_DIR, filename);
   const buffer = Buffer.from(imageData, "base64");
-  writeFileSync5(filePath, buffer);
+  await writeFile2(filePath, buffer);
   log(`[image-gen] Saved ${buffer.length} bytes to ${filePath}`);
   return { filePath, text: textResponse, mimeType };
 }
@@ -8526,8 +8600,8 @@ var init_image_gen = __esm({
     "use strict";
     init_log();
     IMAGE_MODEL = "gemini-3.1-flash-image-preview";
-    IMAGE_OUTPUT_DIR = join14(
-      process.env.CC_CLAW_HOME ?? join14(process.env.HOME ?? "/tmp", ".cc-claw"),
+    IMAGE_OUTPUT_DIR = join13(
+      process.env.CC_CLAW_HOME ?? join13(process.env.HOME ?? "/tmp", ".cc-claw"),
       "data",
       "images"
     );
@@ -8675,8 +8749,8 @@ async function mp3ToOgg(mp3Buffer) {
   const id = crypto.randomUUID();
   const tmpMp3 = `/tmp/cc-claw-tts-${id}.mp3`;
   const tmpOgg = `/tmp/cc-claw-tts-${id}.ogg`;
-  const { writeFile: writeFile4 } = await import("fs/promises");
-  await writeFile4(tmpMp3, mp3Buffer);
+  const { writeFile: writeFile5 } = await import("fs/promises");
+  await writeFile5(tmpMp3, mp3Buffer);
   await execFileAsync2("ffmpeg", ["-y", "-i", tmpMp3, "-c:a", "libopus", "-b:a", "64k", tmpOgg]);
   const oggBuffer = await readFile4(tmpOgg);
   unlink(tmpMp3).catch((err) => {
@@ -8691,8 +8765,7 @@ async function macOsTts(text, voice2 = "Samantha") {
   const id = crypto.randomUUID();
   const tmpAiff = `/tmp/cc-claw-tts-${id}.aiff`;
   const tmpOgg = `/tmp/cc-claw-tts-${id}.ogg`;
-  const sanitized = text.replace(/['"\\$`]/g, " ");
-  await execFileAsync2("say", ["-v", voice2, "-o", tmpAiff, sanitized]);
+  await execFileAsync2("say", ["-v", voice2, "-o", tmpAiff, text]);
   await execFileAsync2("ffmpeg", ["-y", "-i", tmpAiff, "-c:a", "libopus", "-b:a", "64k", tmpOgg]);
   const oggBuffer = await readFile4(tmpOgg);
   unlink(tmpAiff).catch((err) => {
@@ -9567,7 +9640,7 @@ var init_backend_cmd = __esm({
 });
 
 // src/router.ts
-import { readFile as readFile5, writeFile as writeFile2, unlink as unlink2 } from "fs/promises";
+import { readFile as readFile5, writeFile as writeFile3, unlink as unlink2 } from "fs/promises";
 import { resolve as resolvePath } from "path";
 function parseMcpListOutput(output2) {
   const results = [];
@@ -10518,8 +10591,8 @@ Use /skills to see it.`, "plain");
           if (!lim.max_input_tokens) continue;
           const u = getBackendUsageInWindow(lim.backend, lim.window);
           const pct = (u.input_tokens / lim.max_input_tokens * 100).toFixed(0);
-          const warn3 = u.input_tokens / lim.max_input_tokens >= lim.warn_pct;
-          lines.push(`  ${lim.backend} (${lim.window}): ${pct}% of ${(lim.max_input_tokens / 1e3).toFixed(0)}K${warn3 ? " \u26A0\uFE0F" : ""}`);
+          const warn2 = u.input_tokens / lim.max_input_tokens >= lim.warn_pct;
+          lines.push(`  ${lim.backend} (${lim.window}): ${pct}% of ${(lim.max_input_tokens / 1e3).toFixed(0)}K${warn2 ? " \u26A0\uFE0F" : ""}`);
         }
       }
       await channel.sendText(chatId, lines.join("\n"), "plain");
@@ -10719,8 +10792,8 @@ Use /skills to see it.`, "plain");
         lines.push(`  \u2705 <b>cc-claw</b>  <i>Agent orchestrator (spawn, tasks, inbox)</i>`);
       }
       const { execFile: execFile5 } = await import("child_process");
-      const { homedir: homedir6 } = await import("os");
-      const discoveryCwd = homedir6();
+      const { homedir: homedir7 } = await import("os");
+      const discoveryCwd = homedir7();
       const runnerResults = await Promise.allSettled(
         getAllRunners().map((runner) => {
           const listCmd = runner.getMcpListCommand();
@@ -10912,8 +10985,10 @@ async function handleMedia(msg, channel) {
       const videoMime = msg.metadata?.mimeType ?? msg.mimeType ?? "video/mp4";
       const videoExt = videoMime.split("/")[1]?.replace("quicktime", "mov") || "mp4";
       const tempVideoPath = `/tmp/cc-claw-video-${Date.now()}.${videoExt}`;
-      await writeFile2(tempVideoPath, videoBuffer);
+      await writeFile3(tempVideoPath, videoBuffer);
       let prompt2;
+      const cleanupVideo = () => unlink2(tempVideoPath).catch(() => {
+      });
       if (wantsVideoAnalysis(caption)) {
         const geminiPrompt = caption || "Analyze this video and describe what you see in detail.";
         let analysis;
@@ -10952,6 +11027,7 @@ Acknowledge receipt. Do NOT analyze the video unless they ask you to.`;
       const response2 = await askAgent(chatId, prompt2, { cwd: getCwd(chatId), model: vidModel, permMode: vMode, onToolAction: vidToolCb });
       if (response2.usage) addUsage(chatId, response2.usage.input, response2.usage.output, response2.usage.cacheRead, vidModel);
       await sendResponse(chatId, channel, response2.text, msg.messageId);
+      cleanupVideo();
       return;
     }
     const fileBuffer = await channel.downloadFile(fileName);
@@ -10962,7 +11038,7 @@ Acknowledge receipt. Do NOT analyze the video unless they ask you to.`;
     if (msg.type === "photo" || isImageExt(ext)) {
       const imgExt = msg.type === "photo" ? "jpg" : ext || "jpg";
       tempFilePath = `/tmp/cc-claw-img-${Date.now()}.${imgExt}`;
-      await writeFile2(tempFilePath, fileBuffer);
+      await writeFile3(tempFilePath, fileBuffer);
       prompt = caption ? `The user sent an image with caption: "${caption}"
 
 The image has been saved to: ${tempFilePath}
@@ -11403,6 +11479,9 @@ Your conversation history is preserved. ${targetAdapter.displayName} will receiv
 async function doBackendSwitch(chatId, backendId, channel) {
   const targetAdapter = getAdapter(backendId);
   const pairCount = getMessagePairCount(chatId);
+  if (pairCount >= 2) {
+    await channel.sendText(chatId, `\u23F3 Saving context...`, "plain");
+  }
   const summarized = await summarizeWithFallbackChain(chatId, backendId);
   const bridge = buildContextBridge(chatId);
   if (bridge) {
@@ -11521,7 +11600,7 @@ ${PERM_MODES[chosen]}`,
     const pending = getPendingEscalation(chatId);
     if (pending) {
       removePendingEscalation(chatId);
-      await handleMessage({ text: pending, chatId, source: "telegram" }, channel);
+      await handleMessage({ text: pending, chatId, source: "telegram", type: "text" }, channel);
     }
   } else if (data === "perm:deny") {
     removePendingEscalation(chatId);
@@ -11954,7 +12033,7 @@ var init_router = __esm({
     pendingFallbackMessages = /* @__PURE__ */ new Map();
     CLI_INSTALL_HINTS = {
       claude: "Install: npm install -g @anthropic-ai/claude-code",
-      gemini: "Install: npm install -g @anthropic-ai/gemini-cli",
+      gemini: "Install: npm install -g @google/gemini-cli",
       codex: "Install: npm install -g @openai/codex"
     };
     BLOCKED_PATH_PATTERNS2 = [
@@ -12047,17 +12126,17 @@ var init_router = __esm({
 
 // src/skills/bootstrap.ts
 import { existsSync as existsSync14 } from "fs";
-import { readdir as readdir3, readFile as readFile6, writeFile as writeFile3, copyFile } from "fs/promises";
-import { join as join15, dirname as dirname3 } from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { readdir as readdir3, readFile as readFile6, writeFile as writeFile4, copyFile } from "fs/promises";
+import { join as join14, dirname as dirname2 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 async function copyAgentManifestSkills() {
   if (!existsSync14(PKG_SKILLS)) return;
   try {
     const entries = await readdir3(PKG_SKILLS, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isFile() || !entry.name.startsWith("agent-") || !entry.name.endsWith(".md")) continue;
-      const src = join15(PKG_SKILLS, entry.name);
-      const dest = join15(SKILLS_PATH, entry.name);
+      const src = join14(PKG_SKILLS, entry.name);
+      const dest = join14(SKILLS_PATH, entry.name);
       if (existsSync14(dest)) continue;
       await copyFile(src, dest);
       log(`[skills] Bootstrapped ${entry.name} to ${SKILLS_PATH}`);
@@ -12068,7 +12147,7 @@ async function copyAgentManifestSkills() {
 }
 async function bootstrapSkills() {
   await copyAgentManifestSkills();
-  const usmDir = join15(SKILLS_PATH, USM_DIR_NAME);
+  const usmDir = join14(SKILLS_PATH, USM_DIR_NAME);
   if (existsSync14(usmDir)) return;
   try {
     const entries = await readdir3(SKILLS_PATH);
@@ -12091,7 +12170,7 @@ async function bootstrapSkills() {
   }
 }
 async function patchUsmForCcClaw(usmDir) {
-  const skillPath = join15(usmDir, "SKILL.md");
+  const skillPath = join14(usmDir, "SKILL.md");
   if (!existsSync14(skillPath)) return;
   try {
     let content = await readFile6(skillPath, "utf-8");
@@ -12120,7 +12199,7 @@ async function patchUsmForCcClaw(usmDir) {
       }
     }
     if (patched) {
-      await writeFile3(skillPath, content, "utf-8");
+      await writeFile4(skillPath, content, "utf-8");
       log("[skills] Patched USM SKILL.md with CC-Claw support");
     }
   } catch (err) {
@@ -12137,8 +12216,8 @@ var init_bootstrap = __esm({
     USM_REPO = "jacob-bd/universal-skills-manager";
     USM_DIR_NAME = "universal-skills-manager";
     CC_CLAW_ECOSYSTEM_PATCH = `| **CC-Claw** | \`~/.cc-claw/workspace/skills/\` | N/A (daemon, no project scope) |`;
-    PKG_ROOT = join15(dirname3(fileURLToPath3(import.meta.url)), "..", "..");
-    PKG_SKILLS = join15(PKG_ROOT, "skills");
+    PKG_ROOT = join14(dirname2(fileURLToPath2(import.meta.url)), "..", "..");
+    PKG_SKILLS = join14(PKG_ROOT, "skills");
   }
 });
 
@@ -12352,9 +12431,9 @@ __export(ai_skill_exports, {
   generateAiSkill: () => generateAiSkill,
   installAiSkill: () => installAiSkill
 });
-import { existsSync as existsSync15, writeFileSync as writeFileSync6, mkdirSync as mkdirSync6 } from "fs";
-import { join as join16 } from "path";
-import { homedir as homedir4 } from "os";
+import { existsSync as existsSync15, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
+import { join as join15 } from "path";
+import { homedir as homedir5 } from "os";
 function generateAiSkill() {
   const version = VERSION;
   let systemState = "";
@@ -12654,11 +12733,11 @@ function installAiSkill() {
   const failed = [];
   for (const [backend2, dirs] of Object.entries(BACKEND_SKILL_DIRS2)) {
     for (const dir of dirs) {
-      const skillDir = join16(dir, "cc-claw-cli");
-      const skillPath = join16(skillDir, "SKILL.md");
+      const skillDir = join15(dir, "cc-claw-cli");
+      const skillPath = join15(skillDir, "SKILL.md");
       try {
         mkdirSync6(skillDir, { recursive: true });
-        writeFileSync6(skillPath, skill, "utf-8");
+        writeFileSync5(skillPath, skill, "utf-8");
         installed.push(skillPath);
       } catch {
         failed.push(skillPath);
@@ -12674,10 +12753,10 @@ var init_ai_skill = __esm({
     init_paths();
     init_version();
     BACKEND_SKILL_DIRS2 = {
-      "cc-claw": [join16(homedir4(), ".cc-claw", "workspace", "skills")],
-      claude: [join16(homedir4(), ".claude", "skills")],
-      gemini: [join16(homedir4(), ".gemini", "skills")],
-      codex: [join16(homedir4(), ".agents", "skills")]
+      "cc-claw": [join15(homedir5(), ".cc-claw", "workspace", "skills")],
+      claude: [join15(homedir5(), ".claude", "skills")],
+      gemini: [join15(homedir5(), ".gemini", "skills")],
+      codex: [join15(homedir5(), ".agents", "skills")]
     };
   }
 });
@@ -12688,17 +12767,17 @@ __export(index_exports, {
   main: () => main
 });
 import { mkdirSync as mkdirSync7, existsSync as existsSync16, renameSync, statSync as statSync2, readFileSync as readFileSync10 } from "fs";
-import { join as join17 } from "path";
+import { join as join16 } from "path";
 import dotenv from "dotenv";
 function migrateLayout() {
   const moves = [
-    [join17(CC_CLAW_HOME, "cc-claw.db"), join17(DATA_PATH, "cc-claw.db")],
-    [join17(CC_CLAW_HOME, "cc-claw.db-shm"), join17(DATA_PATH, "cc-claw.db-shm")],
-    [join17(CC_CLAW_HOME, "cc-claw.db-wal"), join17(DATA_PATH, "cc-claw.db-wal")],
-    [join17(CC_CLAW_HOME, "cc-claw.log"), join17(LOGS_PATH, "cc-claw.log")],
-    [join17(CC_CLAW_HOME, "cc-claw.log.1"), join17(LOGS_PATH, "cc-claw.log.1")],
-    [join17(CC_CLAW_HOME, "cc-claw.error.log"), join17(LOGS_PATH, "cc-claw.error.log")],
-    [join17(CC_CLAW_HOME, "cc-claw.error.log.1"), join17(LOGS_PATH, "cc-claw.error.log.1")]
+    [join16(CC_CLAW_HOME, "cc-claw.db"), join16(DATA_PATH, "cc-claw.db")],
+    [join16(CC_CLAW_HOME, "cc-claw.db-shm"), join16(DATA_PATH, "cc-claw.db-shm")],
+    [join16(CC_CLAW_HOME, "cc-claw.db-wal"), join16(DATA_PATH, "cc-claw.db-wal")],
+    [join16(CC_CLAW_HOME, "cc-claw.log"), join16(LOGS_PATH, "cc-claw.log")],
+    [join16(CC_CLAW_HOME, "cc-claw.log.1"), join16(LOGS_PATH, "cc-claw.log.1")],
+    [join16(CC_CLAW_HOME, "cc-claw.error.log"), join16(LOGS_PATH, "cc-claw.error.log")],
+    [join16(CC_CLAW_HOME, "cc-claw.error.log.1"), join16(LOGS_PATH, "cc-claw.error.log.1")]
   ];
   for (const [from, to] of moves) {
     if (existsSync16(from) && !existsSync16(to)) {
@@ -12803,11 +12882,11 @@ async function main() {
   bootstrapSkills().catch((err) => error("[cc-claw] Skill bootstrap failed:", err));
   try {
     const { generateAiSkill: generateAiSkill2 } = await Promise.resolve().then(() => (init_ai_skill(), ai_skill_exports));
-    const { writeFileSync: writeFileSync9, mkdirSync: mkdirSync11 } = await import("fs");
-    const { join: join20 } = await import("path");
-    const skillDir = join20(SKILLS_PATH, "cc-claw-cli");
+    const { writeFileSync: writeFileSync8, mkdirSync: mkdirSync11 } = await import("fs");
+    const { join: join19 } = await import("path");
+    const skillDir = join19(SKILLS_PATH, "cc-claw-cli");
     mkdirSync11(skillDir, { recursive: true });
-    writeFileSync9(join20(skillDir, "SKILL.md"), generateAiSkill2(), "utf-8");
+    writeFileSync8(join19(skillDir, "SKILL.md"), generateAiSkill2(), "utf-8");
     log("[cc-claw] AI skill updated");
   } catch {
   }
@@ -12833,7 +12912,13 @@ async function main() {
       stopMonitor();
       shutdownOrchestrator();
       shutdownScheduler();
-      await summarizeAllPending();
+      await Promise.race([
+        summarizeAllPending(),
+        new Promise((resolve) => setTimeout(() => {
+          log("[cc-claw] Summarization timed out after 15s, skipping.");
+          resolve();
+        }, 15e3))
+      ]);
       await channelRegistry.stopAll();
       log("[cc-claw] Clean shutdown complete.");
     } catch (err) {
@@ -12891,10 +12976,10 @@ __export(service_exports, {
   serviceStatus: () => serviceStatus,
   uninstallService: () => uninstallService
 });
-import { existsSync as existsSync17, mkdirSync as mkdirSync8, writeFileSync as writeFileSync7, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync17, mkdirSync as mkdirSync8, writeFileSync as writeFileSync6, unlinkSync as unlinkSync2 } from "fs";
 import { execFileSync as execFileSync2, execSync as execSync5 } from "child_process";
-import { homedir as homedir5, platform } from "os";
-import { join as join18, dirname as dirname4 } from "path";
+import { homedir as homedir6, platform } from "os";
+import { join as join17, dirname as dirname3 } from "path";
 function resolveExecutable2(name) {
   try {
     return execFileSync2("which", [name], { encoding: "utf-8" }).trim();
@@ -12903,18 +12988,18 @@ function resolveExecutable2(name) {
   }
 }
 function getPathDirs() {
-  const nodeBin = dirname4(process.execPath);
-  const home = homedir5();
+  const nodeBin = dirname3(process.execPath);
+  const home = homedir6();
   const dirs = /* @__PURE__ */ new Set([
     nodeBin,
-    join18(home, ".local", "bin"),
+    join17(home, ".local", "bin"),
     "/usr/local/bin",
     "/usr/bin",
     "/bin"
   ]);
   try {
     const prefix = execSync5("npm config get prefix", { encoding: "utf-8" }).trim();
-    if (prefix) dirs.add(join18(prefix, "bin"));
+    if (prefix) dirs.add(join17(prefix, "bin"));
   } catch {
   }
   return [...dirs].join(":");
@@ -12922,7 +13007,7 @@ function getPathDirs() {
 function generatePlist() {
   const ccClawBin = resolveExecutable2("cc-claw");
   const pathDirs = getPathDirs();
-  const home = homedir5();
+  const home = homedir6();
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -12968,7 +13053,7 @@ function generatePlist() {
 </plist>`;
 }
 function installMacOS() {
-  const agentsDir = dirname4(PLIST_PATH);
+  const agentsDir = dirname3(PLIST_PATH);
   if (!existsSync17(agentsDir)) mkdirSync8(agentsDir, { recursive: true });
   if (!existsSync17(LOGS_PATH)) mkdirSync8(LOGS_PATH, { recursive: true });
   if (existsSync17(PLIST_PATH)) {
@@ -12977,7 +13062,7 @@ function installMacOS() {
     } catch {
     }
   }
-  writeFileSync7(PLIST_PATH, generatePlist());
+  writeFileSync6(PLIST_PATH, generatePlist());
   console.log(`  Installed: ${PLIST_PATH}`);
   execFileSync2("launchctl", ["load", PLIST_PATH]);
   console.log("  Service loaded and starting.");
@@ -13027,7 +13112,7 @@ Restart=on-failure
 RestartSec=10
 WorkingDirectory=${CC_CLAW_HOME}
 Environment=PATH=${pathDirs}
-Environment=HOME=${homedir5()}
+Environment=HOME=${homedir6()}
 
 [Install]
 WantedBy=default.target
@@ -13036,7 +13121,7 @@ WantedBy=default.target
 function installLinux() {
   if (!existsSync17(SYSTEMD_DIR)) mkdirSync8(SYSTEMD_DIR, { recursive: true });
   if (!existsSync17(LOGS_PATH)) mkdirSync8(LOGS_PATH, { recursive: true });
-  writeFileSync7(UNIT_PATH, generateUnit());
+  writeFileSync6(UNIT_PATH, generateUnit());
   console.log(`  Installed: ${UNIT_PATH}`);
   execFileSync2("systemctl", ["--user", "daemon-reload"]);
   execFileSync2("systemctl", ["--user", "enable", "cc-claw"]);
@@ -13069,7 +13154,7 @@ function statusLinux() {
   }
 }
 function installService() {
-  if (!existsSync17(join18(CC_CLAW_HOME, ".env"))) {
+  if (!existsSync17(join17(CC_CLAW_HOME, ".env"))) {
     console.error(`  Config not found at ${CC_CLAW_HOME}/.env`);
     console.error("  Run 'cc-claw setup' before installing the service.");
     process.exitCode = 1;
@@ -13098,9 +13183,9 @@ var init_service = __esm({
     "use strict";
     init_paths();
     PLIST_LABEL = "com.cc-claw";
-    PLIST_PATH = join18(homedir5(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
-    SYSTEMD_DIR = join18(homedir5(), ".config", "systemd", "user");
-    UNIT_PATH = join18(SYSTEMD_DIR, "cc-claw.service");
+    PLIST_PATH = join17(homedir6(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
+    SYSTEMD_DIR = join17(homedir6(), ".config", "systemd", "user");
+    UNIT_PATH = join17(SYSTEMD_DIR, "cc-claw.service");
   }
 });
 
@@ -13761,15 +13846,14 @@ async function logsCommand(opts) {
   console.log(tailLines.join("\n"));
   if (opts.follow) {
     console.log(muted("\n  Following... (Ctrl+C to stop)\n"));
-    let lastSize = Buffer.byteLength(content, "utf-8");
+    let lastLength = content.length;
     watchFile2(logFile, { interval: 500 }, () => {
       try {
         const newContent = readFileSync14(logFile, "utf-8");
-        const newSize = Buffer.byteLength(newContent, "utf-8");
-        if (newSize > lastSize) {
-          const newPart = newContent.slice(content.length);
+        if (newContent.length > lastLength) {
+          const newPart = newContent.slice(lastLength);
           process.stdout.write(newPart);
-          lastSize = newSize;
+          lastLength = newContent.length;
         }
       } catch {
       }
@@ -14242,8 +14326,17 @@ async function cronEdit(globalOpts, id, opts) {
       values.push(opts.at);
     }
     if (opts.every) {
-      updates.push("every_ms = ?, schedule_type = 'every'");
-      values.push(opts.every);
+      const m = opts.every.match(/^(\d+)\s*(m|min|h|hr|s|sec)$/i);
+      if (m) {
+        const num = parseInt(m[1], 10);
+        const unit = m[2].toLowerCase();
+        const ms = unit.startsWith("h") ? num * 36e5 : unit.startsWith("m") ? num * 6e4 : num * 1e3;
+        updates.push("every_ms = ?, schedule_type = 'every'");
+        values.push(ms);
+      } else {
+        updates.push("every_ms = ?, schedule_type = 'every'");
+        values.push(parseInt(opts.every, 10) || 0);
+      }
     }
     if (opts.backend) {
       updates.push("backend = ?");
@@ -14495,7 +14588,7 @@ __export(db_exports, {
   dbStats: () => dbStats
 });
 import { existsSync as existsSync27, statSync as statSync5, copyFileSync, mkdirSync as mkdirSync9 } from "fs";
-import { dirname as dirname5 } from "path";
+import { dirname as dirname4 } from "path";
 async function dbStats(globalOpts) {
   if (!existsSync27(DB_PATH)) {
     outputError("DB_NOT_FOUND", `Database not found at ${DB_PATH}`);
@@ -14545,7 +14638,7 @@ async function dbBackup(globalOpts, destPath) {
   }
   const dest = destPath ?? `${DB_PATH}.backup-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
   try {
-    mkdirSync9(dirname5(dest), { recursive: true });
+    mkdirSync9(dirname4(dest), { recursive: true });
     copyFileSync(DB_PATH, dest);
     const walPath = DB_PATH + "-wal";
     if (existsSync27(walPath)) copyFileSync(walPath, dest + "-wal");
@@ -15917,7 +16010,7 @@ var init_completion = __esm({
       model: ["list", "get", "set"],
       thinking: ["get", "set"],
       summarizer: ["get", "set"],
-      memory: ["list", "search", "add", "forget", "history"],
+      memory: ["list", "search", "history"],
       cron: ["list", "create", "edit", "cancel", "pause", "resume", "run", "runs", "health"],
       schedule: ["list", "create", "edit", "cancel", "pause", "resume", "run", "runs", "health"],
       agents: ["list", "spawn", "cancel", "cancel-all"],
@@ -15935,7 +16028,7 @@ var init_completion = __esm({
       chats: ["list", "alias", "remove-alias"],
       skills: ["list", "install"],
       mcps: ["list"],
-      db: ["stats", "path", "backup", "prune"],
+      db: ["stats", "path", "backup"],
       chat: ["send", "stop"]
     };
   }
@@ -15943,10 +16036,10 @@ var init_completion = __esm({
 
 // src/setup.ts
 var setup_exports = {};
-import { existsSync as existsSync38, writeFileSync as writeFileSync8, readFileSync as readFileSync17, copyFileSync as copyFileSync2, mkdirSync as mkdirSync10, statSync as statSync6 } from "fs";
+import { existsSync as existsSync38, writeFileSync as writeFileSync7, readFileSync as readFileSync17, copyFileSync as copyFileSync2, mkdirSync as mkdirSync10, statSync as statSync6 } from "fs";
 import { execFileSync as execFileSync4 } from "child_process";
 import { createInterface as createInterface5 } from "readline";
-import { join as join19 } from "path";
+import { join as join18 } from "path";
 function divider2() {
   console.log(dim("\u2500".repeat(55)));
 }
@@ -16033,7 +16126,7 @@ async function setup() {
       if (match) env[match[1].trim()] = match[2].trim();
     }
   }
-  const cwdDb = join19(process.cwd(), "cc-claw.db");
+  const cwdDb = join18(process.cwd(), "cc-claw.db");
   if (existsSync38(cwdDb) && !existsSync38(DB_PATH)) {
     const { size } = statSync6(cwdDb);
     console.log(yellow(`  Found existing database at ${cwdDb} (${(size / 1024).toFixed(0)}KB)`));
@@ -16247,7 +16340,7 @@ async function setup() {
     envLines.push("", "# Video Analysis", `GEMINI_API_KEY=${env.GEMINI_API_KEY}`);
   }
   const envContent = envLines.join("\n") + "\n";
-  writeFileSync8(ENV_PATH, envContent, { mode: 384 });
+  writeFileSync7(ENV_PATH, envContent, { mode: 384 });
   console.log(green(`  Config saved to ${ENV_PATH} (permissions: owner-only)`));
   header(6, TOTAL_STEPS, "Run on Startup (Daemon)");
   console.log("  CC-Claw can run automatically in the background, starting");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-claw",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "CC-Claw: Personal AI assistant on Telegram — multi-backend (Claude, Gemini, Codex), sub-agent orchestration, MCP management",
   "type": "module",
   "main": "dist/cli.js",