cc-claw 0.3.3 → 0.3.5

package/README.md

@@ -124,6 +124,7 @@ Read commands work offline (direct DB access). Write commands require the daemon
 | `/help` | All commands |
 | `/status` | Backend, model, session, usage |
 | `/newchat` | Start fresh (summarizes current session) |
+| `/summarize` | Save session to memory without resetting |
 | `/stop` | Cancel running task |
 
 ### Backend & Model

package/dist/cli.js

@@ -48,7 +48,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.3.3" : (() => {
+    VERSION = true ? "0.3.5" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -1143,6 +1143,7 @@ function initDatabase() {
       backend TEXT,
       model TEXT,
       thinking TEXT,
+      timeout INTEGER,
       session_type TEXT NOT NULL DEFAULT 'isolated',
       channel TEXT,
       target TEXT,
@@ -1177,6 +1178,7 @@ function initDatabase() {
             backend TEXT,
             model TEXT,
             thinking TEXT,
+            timeout INTEGER,
             session_type TEXT NOT NULL DEFAULT 'isolated',
             channel TEXT,
             target TEXT,
@@ -1257,6 +1259,10 @@ function initDatabase() {
         db.exec("ALTER TABLE jobs ADD COLUMN consecutive_failures INTEGER NOT NULL DEFAULT 0");
       } catch {
       }
+      try {
+        db.exec("ALTER TABLE jobs ADD COLUMN timeout INTEGER");
+      } catch {
+      }
     }
   } catch {
   }
@@ -1949,8 +1955,8 @@ function getBackendUsageInWindow(backend2, windowType) {
 function insertJob(params) {
   const result = db.prepare(`
     INSERT INTO jobs (schedule_type, cron, at_time, every_ms, description, chat_id,
-      backend, model, thinking, session_type, channel, target, delivery_mode, timezone)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      backend, model, thinking, timeout, session_type, channel, target, delivery_mode, timezone)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(
     params.scheduleType,
     params.cron ?? null,
@@ -1961,6 +1967,7 @@ function insertJob(params) {
     params.backend ?? null,
     params.model ?? null,
     params.thinking ?? null,
+    params.timeout ?? null,
     params.sessionType ?? "isolated",
     params.channel ?? null,
     params.target ?? null,
@@ -2012,6 +2019,7 @@ function updateJob(id, fields) {
     backend: "backend",
     model: "model",
     thinking: "thinking",
+    timeout: "timeout",
     sessionType: "session_type",
     channel: "channel",
     target: "target",
@@ -2275,7 +2283,7 @@ var init_store4 = __esm({
     ALL_TOOLS = ["Read", "Glob", "Grep", "Bash", "Write", "Edit", "WebFetch", "WebSearch", "Agent", "AskUserQuestion"];
     JOB_SELECT = `
   SELECT id, schedule_type as scheduleType, cron, at_time as atTime, every_ms as everyMs,
-    description, chat_id as chatId, backend, model, thinking,
+    description, chat_id as chatId, backend, model, thinking, timeout,
     session_type as sessionType, channel, target, delivery_mode as deliveryMode,
     timezone, enabled, active, created_at as createdAt, last_run_at as lastRunAt,
     next_run_at as nextRunAt, consecutive_failures as consecutiveFailures
@@ -5230,9 +5238,14 @@ data: ${JSON.stringify(data)}
 `);
           };
           try {
-            const response = await askAgent2(chatId, body.message, cwd, (partial) => {
-              sendSSE("text", partial);
-            }, model2, mode);
+            const response = await askAgent2(chatId, body.message, {
+              cwd,
+              onStream: (partial) => {
+                sendSSE("text", partial);
+              },
+              model: model2,
+              permMode: mode
+            });
             if (response.usage) addUsage2(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? "unknown");
             sendSSE("done", JSON.stringify({ text: response.text, usage: response.usage }));
             res.end();
@@ -5241,7 +5254,7 @@ data: ${JSON.stringify(data)}
             res.end();
           }
         } else {
-          const response = await askAgent2(chatId, body.message, cwd, void 0, model2, mode);
+          const response = await askAgent2(chatId, body.message, { cwd, model: model2, permMode: mode });
           if (response.usage) addUsage2(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2 ?? "unknown");
           return jsonResponse(res, { text: response.text, usage: response.usage, sessionId: response.sessionId });
         }
@@ -5696,24 +5709,32 @@ function stopAgent(chatId) {
 function isAgentActive(chatId) {
   return activeChats.has(chatId);
 }
-function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolAction, thinkingLevel) {
+function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs) {
+  const effectiveTimeout = timeoutMs ?? SPAWN_TIMEOUT_MS;
   return new Promise((resolve, reject) => {
     const thinkingConfig = thinkingLevel && thinkingLevel !== "auto" ? adapter.applyThinkingConfig(thinkingLevel, model2) : void 0;
     const env = adapter.getEnv(thinkingConfig?.envOverrides);
     const finalArgs = thinkingConfig?.extraArgs ? [...config2.args, ...thinkingConfig.extraArgs] : config2.args;
-    log(`[agent:spawn] backend=${adapter.id} exe=${config2.executable} model=${model2} cwd=${config2.cwd ?? "(inherited)"}`);
+    log(`[agent:spawn] backend=${adapter.id} exe=${config2.executable} model=${model2} timeout=${effectiveTimeout / 1e3}s cwd=${config2.cwd ?? "(inherited)"}`);
     const proc = spawn4(config2.executable, finalArgs, {
       env,
       stdio: ["ignore", "pipe", "pipe"],
       ...config2.cwd ? { cwd: config2.cwd } : {}
     });
     cancelState.process = proc;
+    let timedOut = false;
+    let sigkillTimer;
     const spawnTimeout = setTimeout(() => {
-      warn(`[agent] Spawn timeout after ${SPAWN_TIMEOUT_MS / 1e3}s for ${adapter.id} \u2014 killing process`);
-      cancelState.cancelled = true;
+      timedOut = true;
+      warn(`[agent] Spawn timeout after ${effectiveTimeout / 1e3}s for ${adapter.id} \u2014 killing process`);
       proc.kill("SIGTERM");
-      setTimeout(() => proc.kill("SIGKILL"), 3e3);
-    }, SPAWN_TIMEOUT_MS);
+      sigkillTimer = setTimeout(() => {
+        try {
+          proc.kill("SIGKILL");
+        } catch {
+        }
+      }, 3e3);
+    }, effectiveTimeout);
     let resultText = "";
     let accumulatedText = "";
     let sessionId;
@@ -5808,12 +5829,17 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
     });
     proc.on("error", (err) => {
       clearTimeout(spawnTimeout);
+      if (sigkillTimer) clearTimeout(sigkillTimer);
       rl2.close();
       cancelState.process = void 0;
       reject(err);
     });
     proc.on("close", (code, signal) => {
       clearTimeout(spawnTimeout);
+      if (sigkillTimer) {
+        clearTimeout(sigkillTimer);
+        sigkillTimer = void 0;
+      }
       if (cancelState.killTimer) {
         clearTimeout(cancelState.killTimer);
         cancelState.killTimer = void 0;
@@ -5823,6 +5849,10 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
         const stderr = Buffer.concat(stderrChunks).toString().trim();
         if (stderr) warn(`[agent] stderr: ${stderr.slice(0, 500)}`);
       }
+      if (timedOut) {
+        reject(new Error(`Spawn timeout after ${effectiveTimeout / 1e3}s`));
+        return;
+      }
       if (code && code !== 0 && !cancelState.cancelled && !resultText) {
         const stderr = Buffer.concat(stderrChunks).toString().trim();
         reject(new Error(`CLI exited with code ${code}${stderr ? `: ${stderr.slice(0, 500)}` : ""}`));
@@ -5832,10 +5862,11 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
     });
   });
 }
-function askAgent(chatId, userMessage, cwd, onStream, model2, permMode, onToolAction, bootstrapTier) {
-  return withChatLock(chatId, () => askAgentImpl(chatId, userMessage, cwd, onStream, model2, permMode, onToolAction, bootstrapTier));
+function askAgent(chatId, userMessage, opts) {
+  return withChatLock(chatId, () => askAgentImpl(chatId, userMessage, opts));
 }
-async function askAgentImpl(chatId, userMessage, cwd, onStream, model2, permMode, onToolAction, bootstrapTier) {
+async function askAgentImpl(chatId, userMessage, opts) {
+  const { cwd, onStream, model: model2, permMode, onToolAction, bootstrapTier, timeoutMs } = opts ?? {};
   const adapter = getAdapterForChat(chatId);
   const mode = permMode ?? "yolo";
   const thinkingLevel = getThinkingLevel(chatId);
@@ -5876,13 +5907,13 @@ async function askAgentImpl(chatId, userMessage, cwd, onStream, model2, permMode
   const resolvedModel = model2 ?? adapter.defaultModel;
   let result = { resultText: "", sessionId: void 0, input: 0, output: 0, cacheRead: 0, sawToolEvents: false, sawResultEvent: false };
   try {
-    result = await spawnQuery(adapter, configWithSession, resolvedModel, cancelState, onStream, onToolAction, thinkingLevel);
+    result = await spawnQuery(adapter, configWithSession, resolvedModel, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs);
     const wasEmptyResponse = !result.resultText && !result.sawToolEvents && !result.sawResultEvent;
     if (wasEmptyResponse && !cancelState.cancelled && existingSessionId) {
       warn(`[agent] No result with session ${existingSessionId} for chat ${chatId} \u2014 retrying fresh`);
       await summarizeSession(chatId);
       clearSession(chatId);
-      result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, onStream, onToolAction, thinkingLevel);
+      result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs);
     }
   } finally {
     activeChats.delete(chatId);
@@ -6429,7 +6460,8 @@ async function runWithRetry(job, model2, runId, t0) {
   }
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
     try {
-      const response = await askAgent(chatId, job.description, void 0, void 0, model2, void 0, void 0, "slim");
+      const timeoutMs = job.timeout ? job.timeout * 1e3 : void 0;
+      const response = await askAgent(chatId, job.description, { model: model2, bootstrapTier: "slim", timeoutMs });
       return response;
     } catch (err) {
       lastError = err;
@@ -7069,6 +7101,7 @@ var init_telegram2 = __esm({
           { command: "help", description: "Show available commands" },
           { command: "status", description: "Session, backend, model, and usage" },
           { command: "newchat", description: "Start a fresh conversation" },
+          { command: "summarize", description: "Save session to memory (or 'all' for pre-restart)" },
           { command: "stop", description: "Cancel the current running task" },
           // Backend & model
           { command: "backend", description: "Switch AI backend (Claude/Gemini/Codex)" },
@@ -7856,7 +7889,7 @@ async function runHeartbeat(chatId, config2) {
   cleanExpiredWatches();
   const prompt = assembleHeartbeatPrompt(chatId);
   try {
-    const response = await askAgent(chatId, prompt, void 0, void 0, void 0, void 0, void 0, "heartbeat");
+    const response = await askAgent(chatId, prompt, { bootstrapTier: "heartbeat" });
     if (response.usage) {
       let heartbeatModel;
       try {
@@ -7988,6 +8021,52 @@ var init_heartbeat = __esm({
   }
 });
 
+// src/format-time.ts
+function formatLocalDate(utcDatetime) {
+  const d = parseUtcDatetime(utcDatetime);
+  if (!d) return utcDatetime.split("T")[0] ?? utcDatetime.split(" ")[0];
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+function formatLocalDateTime(utcDatetime) {
+  const d = parseUtcDatetime(utcDatetime);
+  if (!d) return utcDatetime;
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  const hours = String(d.getHours()).padStart(2, "0");
+  const minutes = String(d.getMinutes()).padStart(2, "0");
+  const tzAbbr = getTimezoneAbbr(d);
+  return `${year}-${month}-${day} ${hours}:${minutes} ${tzAbbr}`;
+}
+function parseUtcDatetime(utcDatetime) {
+  if (!utcDatetime) return null;
+  const normalized = utcDatetime.includes("T") ? utcDatetime : utcDatetime.replace(" ", "T");
+  const withZ = normalized.endsWith("Z") ? normalized : normalized + "Z";
+  const d = new Date(withZ);
+  return isNaN(d.getTime()) ? null : d;
+}
+function getTimezoneAbbr(date) {
+  try {
+    const parts = new Intl.DateTimeFormat("en-US", {
+      timeZone: systemTimezone,
+      timeZoneName: "short"
+    }).formatToParts(date);
+    return parts.find((p) => p.type === "timeZoneName")?.value ?? "";
+  } catch {
+    return "";
+  }
+}
+var systemTimezone;
+var init_format_time = __esm({
+  "src/format-time.ts"() {
+    "use strict";
+    systemTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  }
+});
+
 // src/voice/stt.ts
 import crypto from "crypto";
 import { execFile as execFile2 } from "child_process";
@@ -8092,10 +8171,13 @@ var init_stt = __esm({
 });
 
 // src/scheduler/types.ts
-var COMMON_TIMEZONES;
+var TIMEOUT_MIN_SECONDS, TIMEOUT_MAX_SECONDS, TIMEOUT_DEFAULT_SECONDS, COMMON_TIMEZONES;
 var init_types2 = __esm({
   "src/scheduler/types.ts"() {
     "use strict";
+    TIMEOUT_MIN_SECONDS = 30;
+    TIMEOUT_MAX_SECONDS = 3600;
+    TIMEOUT_DEFAULT_SECONDS = 600;
     COMMON_TIMEZONES = {
       "US/Eastern": "America/New_York",
       "US/Central": "America/Chicago",
@@ -8311,8 +8393,23 @@ async function handleWizardText(chatId, text, channel) {
     case "thinking": {
       const level = text.trim().toLowerCase();
       pending.thinking = level || "auto";
-      pending.step = "session";
-      await promptSession(chatId, channel);
+      pending.step = "timeout";
+      await promptTimeout(chatId, channel);
+      break;
+    }
+    case "timeout": {
+      const val = parseInt(text.trim(), 10);
+      if (text.trim().toLowerCase() === "default") {
+        pending.timeout = void 0;
+        pending.step = "session";
+        await promptSession(chatId, channel);
+      } else if (isNaN(val) || val < TIMEOUT_MIN_SECONDS || val > TIMEOUT_MAX_SECONDS) {
+        await channel.sendText(chatId, `Invalid timeout. Enter a value between ${TIMEOUT_MIN_SECONDS} and ${TIMEOUT_MAX_SECONDS} seconds, or "default" for ${TIMEOUT_DEFAULT_SECONDS}s.`, "plain");
+      } else {
+        pending.timeout = val;
+        pending.step = "session";
+        await promptSession(chatId, channel);
+      }
       break;
     }
     case "session": {
@@ -8390,7 +8487,18 @@ async function handleWizardCallback(chatId, data, channel) {
     await promptThinking(chatId, channel);
   } else if (data.startsWith("sched:thinking:")) {
     pending.thinking = data.slice(15);
+    pending.step = "timeout";
+    await promptTimeout(chatId, channel);
+  } else if (data.startsWith("sched:timeout:")) {
+    const val = data.slice(14);
+    if (val === "default") {
+      pending.timeout = void 0;
+    } else {
+      pending.timeout = parseInt(val, 10);
+    }
     pending.step = "session";
+    const label2 = pending.timeout ? `${pending.timeout}s (${Math.round(pending.timeout / 60)} min)` : `Default (${TIMEOUT_DEFAULT_SECONDS}s)`;
+    await channel.sendText(chatId, `Timeout: ${label2}`, "plain");
     await promptSession(chatId, channel);
   } else if (data.startsWith("sched:session:")) {
     pending.sessionType = data.slice(14);
@@ -8484,10 +8592,27 @@ async function promptThinking(chatId, channel) {
     await channel.sendKeyboard(chatId, "Thinking/effort level for this job?", buttons);
   } else {
     pending.thinking = "auto";
-    pending.step = "session";
-    await promptSession(chatId, channel);
+    pending.step = "timeout";
+    await promptTimeout(chatId, channel);
   }
 }
+async function promptTimeout(chatId, channel) {
+  if (typeof channel.sendKeyboard !== "function") {
+    await channel.sendText(chatId, `Job timeout in seconds (${TIMEOUT_MIN_SECONDS}-${TIMEOUT_MAX_SECONDS}), or "default" for ${TIMEOUT_DEFAULT_SECONDS}s:`, "plain");
+    return;
+  }
+  await channel.sendKeyboard(chatId, "Maximum runtime for this job?", [
+    [
+      { label: `5 min (300s)`, data: "sched:timeout:300" },
+      { label: `10 min (600s)`, data: "sched:timeout:600" }
+    ],
+    [
+      { label: `15 min (900s)`, data: "sched:timeout:900" },
+      { label: `30 min (1800s)`, data: "sched:timeout:1800" }
+    ],
+    [{ label: `Default (${TIMEOUT_DEFAULT_SECONDS}s)`, data: "sched:timeout:default" }]
+  ]);
+}
 async function promptSession(chatId, channel) {
   if (typeof channel.sendKeyboard !== "function") {
     await channel.sendText(chatId, "Session type: isolated (fresh, no history) or main (uses conversation context)?", "plain");
@@ -8523,6 +8648,7 @@ async function promptConfirm(chatId, channel) {
   const pending = pendingJobs.get(chatId);
   if (!pending) return;
   const backendName = pending.backend ? getAdapter(pending.backend).displayName : "default";
+  const timeoutLabel = pending.timeout ? `${pending.timeout}s (${Math.round(pending.timeout / 60)} min)` : `Default (${TIMEOUT_DEFAULT_SECONDS}s)`;
   const lines = [
     "Job configuration:",
     "",
@@ -8532,6 +8658,7 @@ async function promptConfirm(chatId, channel) {
     `  Backend:  ${backendName}`,
     `  Model:    ${pending.model ?? "default"}`,
     `  Thinking: ${pending.thinking ?? "auto"}`,
+    `  Timeout:  ${timeoutLabel}`,
     `  Session:  ${pending.sessionType ?? "isolated"}`,
     `  Delivery: ${pending.deliveryMode ?? "announce"}`
   ];
@@ -8562,6 +8689,7 @@ async function finalizeJob(chatId, channel) {
     backend: pending.backend ?? null,
     model: pending.model ?? null,
     thinking: pending.thinking ?? null,
+    timeout: pending.timeout ?? null,
     sessionType: pending.sessionType ?? "isolated",
     channel: pending.channel ?? null,
     target: pending.target ?? null,
@@ -8622,6 +8750,7 @@ async function startEditWizard(chatId, jobId, channel) {
     backend: job.backend,
     model: job.model ?? void 0,
     thinking: job.thinking ?? void 0,
+    timeout: job.timeout ?? void 0,
     sessionType: job.sessionType,
     deliveryMode: job.deliveryMode,
     channel: job.channel ?? void 0,
@@ -9006,7 +9135,7 @@ async function handleCommand(msg, channel) {
     case "help":
       await channel.sendText(
         chatId,
-        "Hey! I'm CC-Claw \u2014 your personal AI assistant on Telegram.\n\nI use AI coding CLIs (Claude, Gemini, Codex) as my brain. Just send me a message to get started.\n\nCommands:\n/backend [name] - Switch AI backend (or /claude /gemini /codex)\n/model - Switch model for active backend\n/summarizer - Configure session summarization model\n/status - Show session, model, backend, and usage\n/cost - Show estimated API cost (use /cost all for all-time)\n/usage - Show usage per backend with limits\n/limits - Configure usage limits per backend\n/newchat - Start a fresh conversation\n/cwd <path> - Set working directory\n/cwd - Show current working directory\n/memory - List stored memories\n/forget <keyword> - Remove a memory\n/voice - Toggle voice responses\n/cron <description> - Schedule a task (or /schedule)\n/cron - List scheduled jobs (or /jobs)\n/cron cancel <id> - Cancel a job\n/cron pause <id> - Pause a job\n/cron resume <id> - Resume a job\n/cron run <id> - Trigger a job now\n/cron runs [id] - View run history\n/cron edit <id> - Edit a job\n/cron health - Scheduler health\n/skills - List skills from all backends\n/skill-install <url> - Install a skill from GitHub\n/setup-profile - Set up your user profile\n/chats - List authorized chats and aliases\n/heartbeat - Proactive awareness (on/off/interval/hours)\n/history - List recent session summaries\n/stop - Cancel the current running task\n/tools - Configure which tools the agent can use\n/permissions - Switch permission mode (yolo/safe/readonly/plan)\n/verbose - Tool visibility (off/normal/verbose)\n/agents - List active sub-agents\n/tasks - Show task board for current orchestration\n/stopagent <id> - Cancel a specific sub-agent\n/stopall - Cancel all sub-agents in this chat\n/runners - List registered CLI runners\n/mcps - List registered MCP servers\n/help - Show this message",
+        "Hey! I'm CC-Claw \u2014 your personal AI assistant on Telegram.\n\nI use AI coding CLIs (Claude, Gemini, Codex) as my brain. Just send me a message to get started.\n\nCommands:\n/backend [name] - Switch AI backend (or /claude /gemini /codex)\n/model - Switch model for active backend\n/summarizer - Configure session summarization model\n/status - Show session, model, backend, and usage\n/cost - Show estimated API cost (use /cost all for all-time)\n/usage - Show usage per backend with limits\n/limits - Configure usage limits per backend\n/newchat - Start a fresh conversation\n/summarize - Save session to memory (without resetting)\n/summarize all - Summarize all pending sessions (pre-restart)\n/cwd <path> - Set working directory\n/cwd - Show current working directory\n/memory - List stored memories\n/forget <keyword> - Remove a memory\n/voice - Toggle voice responses\n/cron <description> - Schedule a task (or /schedule)\n/cron - List scheduled jobs (or /jobs)\n/cron cancel <id> - Cancel a job\n/cron pause <id> - Pause a job\n/cron resume <id> - Resume a job\n/cron run <id> - Trigger a job now\n/cron runs [id] - View run history\n/cron edit <id> - Edit a job\n/cron health - Scheduler health\n/skills - List skills from all backends\n/skill-install <url> - Install a skill from GitHub\n/setup-profile - Set up your user profile\n/chats - List authorized chats and aliases\n/heartbeat - Proactive awareness (on/off/interval/hours)\n/history - List recent session summaries\n/stop - Cancel the current running task\n/tools - Configure which tools the agent can use\n/permissions - Switch permission mode (yolo/safe/readonly/plan)\n/verbose - Tool visibility (off/normal/verbose)\n/agents - List active sub-agents\n/tasks - Show task board for current orchestration\n/stopagent <id> - Cancel a specific sub-agent\n/stopall - Cancel all sub-agents in this chat\n/runners - List registered CLI runners\n/mcps - List registered MCP servers\n/help - Show this message",
         "plain"
       );
       break;
@@ -9088,6 +9217,32 @@ Tap to toggle:`,
       await channel.sendText(chatId, msg2, "plain");
       break;
     }
+    case "summarize": {
+      if (commandArgs?.toLowerCase() === "all") {
+        const pendingIds = getLoggedChatIds();
+        if (pendingIds.length === 0) {
+          await channel.sendText(chatId, "No pending sessions to summarize.", "plain");
+          break;
+        }
+        await channel.sendText(chatId, `Summarizing ${pendingIds.length} pending session(s)...`, "plain");
+        await summarizeAllPending();
+        await channel.sendText(chatId, `Done. ${pendingIds.length} session(s) summarized and saved to memory.`, "plain");
+      } else {
+        const pairs = getMessagePairCount(chatId);
+        if (pairs < 2) {
+          await channel.sendText(chatId, "Not enough conversation to summarize (need at least 2 exchanges). Session log is preserved.", "plain");
+          break;
+        }
+        await channel.sendText(chatId, `Summarizing current session (${pairs} exchanges)...`, "plain");
+        const success2 = await summarizeSession(chatId);
+        if (success2) {
+          await channel.sendText(chatId, "Session summarized and saved to memory. Session continues (use /newchat to also reset).", "plain");
+        } else {
+          await channel.sendText(chatId, "Summarization failed. Session log preserved for retry.", "plain");
+        }
+      }
+      break;
+    }
     case "status": {
       const sessionId = getSessionId(chatId);
       const cwd = getCwd(chatId);
@@ -9564,7 +9719,7 @@ ${lines.join("\n")}`, "plain");
     Error: ${r.error.slice(0, 100)}` : "";
         const usage2 = r.usageInput ? `
     Tokens: ${r.usageInput}in / ${r.usageOutput}out` : "";
-        return `#${r.jobId} [${r.status}] ${r.startedAt}${duration}${error3}${usage2}`;
+        return `#${r.jobId} [${r.status}] ${formatLocalDateTime(r.startedAt)}${duration}${error3}${usage2}`;
       });
       await channel.sendText(chatId, lines.join("\n\n"), "plain");
       break;
@@ -9591,7 +9746,7 @@ ${lines.join("\n")}`, "plain");
         return;
       }
       const lines = summaries.map((s) => {
-        const date = s.created_at.split("T")[0] ?? s.created_at.split(" ")[0];
+        const date = formatLocalDate(s.created_at);
         const shortSummary = s.summary.length > 200 ? s.summary.slice(0, 200) + "\u2026" : s.summary;
         return `${date} (${s.message_count} msgs)
 ${shortSummary}
@@ -9606,20 +9761,8 @@ Topics: ${s.topics}`;
         await channel.sendText(chatId, "No skills found. Install skills with /skill-install <github-url> or place them in ~/.cc-claw/workspace/skills/", "plain");
         return;
       }
-      if (typeof channel.sendKeyboard === "function") {
-        const buttons = skills2.map((s) => {
-          const tags = s.sources.join(", ");
-          return [{ label: `${s.name} [${tags}]`, data: `skill:${s.source}:${s.name}` }];
-        });
-        await channel.sendKeyboard(chatId, `${skills2.length} skills available. Select one to invoke:`, buttons);
-      } else {
-        const lines = skills2.map((s) => {
-          const tags = s.sources.join(", ");
-          const desc = s.description ? ` \u2014 ${s.description.slice(0, 50)}` : "";
-          return `\u2022 ${s.name} [${tags}]${desc}`;
-        });
-        await channel.sendText(chatId, ["Available skills:", "", ...lines].join("\n"), "plain");
-      }
+      const page = commandArgs ? parseInt(commandArgs, 10) || 1 : 1;
+      await sendSkillsPage(chatId, channel, skills2, page);
       break;
     }
     case "skill-install": {
@@ -10047,7 +10190,7 @@ Use /skills to see it.`, "plain");
           }
           const runLines = cronRuns2.map((r) => {
             const dur = r.durationMs ? ` (${(r.durationMs / 1e3).toFixed(1)}s)` : "";
-            return `#${r.jobId} [${r.status}] ${r.startedAt}${dur}`;
+            return `#${r.jobId} [${r.status}] ${formatLocalDateTime(r.startedAt)}${dur}`;
           });
           await channel.sendText(chatId, runLines.join("\n\n"), "plain");
           break;
@@ -10096,7 +10239,7 @@ async function handleVoice(msg, channel) {
     const vModel = resolveModel(chatId);
     const vVerbose = getVerboseLevel(chatId);
     const vToolCb = vVerbose !== "off" ? makeToolActionCallback(chatId, channel, vVerbose) : void 0;
-    const response = await askAgent(chatId, transcript, getCwd(chatId), void 0, vModel, mode, vToolCb);
+    const response = await askAgent(chatId, transcript, { cwd: getCwd(chatId), model: vModel, permMode: mode, onToolAction: vToolCb });
     if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, vModel);
     await sendResponse(chatId, channel, response.text);
   } catch (err) {
@@ -10143,7 +10286,7 @@ Summarize this for the user.`;
       const vMode = getMode(chatId);
       const vidVerbose = getVerboseLevel(chatId);
       const vidToolCb = vidVerbose !== "off" ? makeToolActionCallback(chatId, channel, vidVerbose) : void 0;
-      const response2 = await askAgent(chatId, prompt2, getCwd(chatId), void 0, vidModel, vMode, vidToolCb);
+      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);
       return;
@@ -10184,7 +10327,7 @@ ${content}
     const mMode = getMode(chatId);
     const mVerbose = getVerboseLevel(chatId);
     const mToolCb = mVerbose !== "off" ? makeToolActionCallback(chatId, channel, mVerbose) : void 0;
-    const response = await askAgent(chatId, prompt, getCwd(chatId), void 0, mediaModel, mMode, mToolCb);
+    const response = await askAgent(chatId, prompt, { cwd: getCwd(chatId), model: mediaModel, permMode: mMode, onToolAction: mToolCb });
     if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, mediaModel);
     await sendResponse(chatId, channel, response.text);
     if (tempFilePath) {
@@ -10249,7 +10392,7 @@ async function handleText(msg, channel) {
     const tMode = getMode(chatId);
     const tVerbose = getVerboseLevel(chatId);
     const tToolCb = tVerbose !== "off" ? makeToolActionCallback(chatId, channel, tVerbose) : void 0;
-    const response = await askAgent(chatId, text, getCwd(chatId), void 0, model2, tMode, tToolCb);
+    const response = await askAgent(chatId, text, { cwd: getCwd(chatId), model: model2, permMode: tMode, onToolAction: tToolCb });
     if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2);
     await sendResponse(chatId, channel, response.text);
   } catch (err) {
@@ -10588,6 +10731,10 @@ ${PERM_MODES[chosen]}`,
     touchBookmark(chatId, alias);
     logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Working directory set to ${bookmark.path}`, detail: { field: "cwd", value: bookmark.path } });
     await sendCwdSessionChoice(chatId, bookmark.path, channel);
+  } else if (data.startsWith("skills:page:")) {
+    const page = parseInt(data.slice(12), 10);
+    const skills2 = await discoverAllSkills();
+    await sendSkillsPage(chatId, channel, skills2, page);
   } else if (data.startsWith("skill:")) {
     const parts = data.slice(6).split(":");
     let skillName;
@@ -10620,7 +10767,7 @@ ${PERM_MODES[chosen]}`,
     const sMode = getMode(chatId);
     const sVerbose = getVerboseLevel(chatId);
     const sToolCb = sVerbose !== "off" ? makeToolActionCallback(chatId, channel, sVerbose) : void 0;
-    const response = await askAgent(chatId, skillContent, getCwd(chatId), void 0, skillModel, sMode, sToolCb);
+    const response = await askAgent(chatId, skillContent, { cwd: getCwd(chatId), model: skillModel, permMode: sMode, onToolAction: sToolCb });
     if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, skillModel);
     await sendResponse(chatId, channel, response.text);
   }
@@ -10764,7 +10911,38 @@ function isTextExt(ext) {
     "log"
   ].includes(ext);
 }
-var PERM_MODES, VERBOSE_LEVELS, CLI_INSTALL_HINTS, BLOCKED_PATH_PATTERNS2;
+async function sendSkillsPage(chatId, channel, skills2, page) {
+  const totalPages = Math.ceil(skills2.length / SKILLS_PER_PAGE);
+  const safePage = Math.max(1, Math.min(page, totalPages));
+  const start = (safePage - 1) * SKILLS_PER_PAGE;
+  const pageSkills = skills2.slice(start, start + SKILLS_PER_PAGE);
+  if (typeof channel.sendKeyboard !== "function") {
+    const lines = pageSkills.map((s) => {
+      const tags = s.sources.join(", ");
+      const desc = s.description ? ` \u2014 ${s.description.slice(0, 50)}` : "";
+      return `\u2022 ${s.name} [${tags}]${desc}`;
+    });
+    const header3 = totalPages > 1 ? `Skills (page ${safePage}/${totalPages}, ${skills2.length} total):` : "Available skills:";
+    const footer = totalPages > 1 ? `
+Use /skills <page> to navigate (e.g. /skills 2)` : "";
+    await channel.sendText(chatId, [header3, "", ...lines, footer].join("\n"), "plain");
+    return;
+  }
+  const buttons = pageSkills.map((s) => {
+    const tags = s.sources.join(", ");
+    return [{ label: `${s.name} [${tags}]`, data: `skill:${s.source}:${s.name}` }];
+  });
+  if (totalPages > 1) {
+    const navRow = [];
+    if (safePage > 1) navRow.push({ label: `\u2190 Page ${safePage - 1}`, data: `skills:page:${safePage - 1}` });
+    navRow.push({ label: `${safePage}/${totalPages}`, data: "skills:page:noop" });
+    if (safePage < totalPages) navRow.push({ label: `Page ${safePage + 1} \u2192`, data: `skills:page:${safePage + 1}` });
+    buttons.push(navRow);
+  }
+  const header2 = totalPages > 1 ? `${skills2.length} skills (page ${safePage}/${totalPages}). Select one to invoke:` : `${skills2.length} skills available. Select one to invoke:`;
+  await channel.sendKeyboard(chatId, header2, buttons);
+}
+var PERM_MODES, VERBOSE_LEVELS, CLI_INSTALL_HINTS, BLOCKED_PATH_PATTERNS2, SKILLS_PER_PAGE;
 var init_router = __esm({
   "src/router.ts"() {
     "use strict";
@@ -10773,10 +10951,12 @@ var init_router = __esm({
     init_profile();
     init_heartbeat();
     init_log();
+    init_format_time();
     init_agent();
     init_stt();
     init_store4();
     init_summarize();
+    init_session_log();
     init_backends();
     init_cron();
     init_wizard();
@@ -10819,6 +10999,7 @@ var init_router = __esm({
       /\/etc\/shadow$/,
       /\/etc\/passwd$/
     ];
+    SKILLS_PER_PAGE = 25;
   }
 });
 
@@ -12420,7 +12601,9 @@ async function doctorCommand(globalOpts, localOpts) {
       lines.push(`  ${parts.join(", ")}`);
       const fixable = r.checks.filter((c) => c.fix);
       if (fixable.length > 0 && !localOpts.fix) {
-        lines.push(muted("  Run cc-claw doctor --fix to attempt repairs."));
+        for (const f of fixable) {
+          lines.push(muted(`  Fix: ${f.fix}`));
+        }
       }
     }
     lines.push("");
@@ -12723,7 +12906,7 @@ async function memoryHistory(globalOpts, opts) {
 `;
     const lines = ["", divider(`Session History (${sums.length})`), ""];
     for (const s of sums) {
-      const date = s.created_at.split("T")[0] ?? s.created_at.split(" ")[0];
+      const date = formatLocalDateTime(s.created_at);
       lines.push(`  ${date} (${s.message_count} msgs)`);
       lines.push(`  ${s.summary}`);
       lines.push(`  Topics: ${muted(s.topics)}`);
@@ -12738,6 +12921,7 @@ var init_memory = __esm({
     init_format();
     init_paths();
     init_resolve_chat();
+    init_format_time();
   }
 });
 
@@ -12752,6 +12936,15 @@ __export(cron_exports2, {
   cronRuns: () => cronRuns
 });
 import { existsSync as existsSync24 } from "fs";
+function parseAndValidateTimeout(raw) {
+  if (!raw) return null;
+  const val = parseInt(raw, 10);
+  if (isNaN(val) || val < TIMEOUT_MIN_SECONDS || val > TIMEOUT_MAX_SECONDS) {
+    outputError("INVALID_TIMEOUT", `Timeout must be between ${TIMEOUT_MIN_SECONDS} and ${TIMEOUT_MAX_SECONDS} seconds (got: ${raw})`);
+    process.exit(1);
+  }
+  return val;
+}
 async function cronList(globalOpts) {
   if (!existsSync24(DB_PATH)) {
     outputError("DB_NOT_FOUND", "Database not found.");
@@ -12774,6 +12967,7 @@ async function cronList(globalOpts) {
       lines.push(`  ${statusDot(status)} #${j.id} [${status}] ${schedule2}${tz}`);
       lines.push(`    ${j.description}`);
       if (j.backend) lines.push(`    Backend: ${j.backend}${j.model ? ` / ${j.model}` : ""}`);
+      if (j.timeout) lines.push(`    Timeout: ${j.timeout}s`);
       if (j.next_run_at) lines.push(`    Next: ${muted(j.next_run_at)}`);
       lines.push("");
     }
@@ -12810,7 +13004,7 @@ async function cronHealth(globalOpts) {
   });
 }
 async function cronCreate(globalOpts, opts) {
-  const { isDaemonRunning: isDaemonRunning2, apiPost: apiPost2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+  const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
   if (!await isDaemonRunning2()) {
     outputError("DAEMON_OFFLINE", "CC-Claw daemon is not running.\n\n  Start it with: cc-claw service start");
     process.exit(1);
@@ -12821,10 +13015,9 @@ async function cronCreate(globalOpts, opts) {
   }
   const chatId = resolveChatId(globalOpts);
   const { success: successFmt } = await Promise.resolve().then(() => (init_format(), format_exports));
+  const timeout = parseAndValidateTimeout(opts.timeout);
   try {
-    const { openDatabaseReadOnly: openDatabaseReadOnly2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-    const { getDb: getDb2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-    const db3 = getDb2();
+    const { insertJob: insertJob2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
     const schedType = opts.cron ? "cron" : opts.at ? "at" : "every";
     let everyMs = null;
     if (opts.every) {
@@ -12835,28 +13028,25 @@ async function cronCreate(globalOpts, opts) {
         everyMs = unit.startsWith("h") ? num * 36e5 : unit.startsWith("m") ? num * 6e4 : num * 1e3;
       }
     }
-    const result = db3.prepare(`
-      INSERT INTO jobs (schedule_type, cron, at_time, every_ms, description, chat_id, backend, model, thinking, session_type, delivery_mode, channel, target, timezone)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(
-      schedType,
-      opts.cron ?? null,
-      opts.at ?? null,
+    const job = insertJob2({
+      scheduleType: schedType,
+      cron: opts.cron ?? null,
+      atTime: opts.at ?? null,
       everyMs,
-      opts.description,
+      description: opts.description,
       chatId,
-      opts.backend ?? null,
-      opts.model ?? null,
-      opts.thinking ?? null,
-      opts.sessionType ?? "isolated",
-      opts.delivery ?? "announce",
-      opts.channel ?? null,
-      opts.target ?? null,
-      opts.timezone ?? "UTC"
-    );
-    const jobId = Number(result.lastInsertRowid);
-    output({ id: jobId, success: true }, () => `
-  ${successFmt(`Job #${jobId} created.`)}
+      backend: opts.backend ?? null,
+      model: opts.model ?? null,
+      thinking: opts.thinking ?? null,
+      timeout,
+      sessionType: opts.sessionType ?? "isolated",
+      deliveryMode: opts.delivery ?? "announce",
+      channel: opts.channel ?? null,
+      target: opts.target ?? null,
+      timezone: opts.timezone ?? "UTC"
+    });
+    output({ id: job.id, success: true }, () => `
+  ${successFmt(`Job #${job.id} created.`)}
 `);
   } catch (err) {
     outputError("CREATE_FAILED", err.message);
@@ -12923,6 +13113,11 @@ async function cronEdit(globalOpts, id, opts) {
       updates.push("thinking = ?");
       values.push(opts.thinking);
     }
+    if (opts.timeout) {
+      const timeout = parseAndValidateTimeout(opts.timeout);
+      updates.push("timeout = ?");
+      values.push(timeout);
+    }
     if (opts.timezone) {
       updates.push("timezone = ?");
       values.push(opts.timezone);
@@ -12974,6 +13169,7 @@ var init_cron2 = __esm({
     init_format();
     init_paths();
     init_resolve_chat();
+    init_types2();
   }
 });
 
@@ -15049,7 +15245,7 @@ function registerCronCommands(cmd) {
     const { cronList: cronList2 } = await Promise.resolve().then(() => (init_cron2(), cron_exports2));
     await cronList2(program.opts());
   });
-  cmd.command("create").description("Create a scheduled job").requiredOption("--description <text>", "Job description").option("--prompt <text>", "Agent prompt (defaults to description)").option("--cron <expr>", "Cron expression (e.g. '0 9 * * *')").option("--at <iso8601>", "One-shot time").option("--every <interval>", "Repeat interval (e.g. 30m, 1h)").option("--backend <name>", "Backend for this job").option("--model <name>", "Model for this job").option("--thinking <level>", "Thinking level").option("--timezone <tz>", "IANA timezone", "UTC").option("--session-type <type>", "Session type (isolated/main)", "isolated").option("--delivery <mode>", "Delivery mode (announce/webhook/none)", "announce").option("--channel <name>", "Delivery channel").option("--target <id>", "Delivery target").option("--cwd <path>", "Working directory").action(async (opts) => {
+  cmd.command("create").description("Create a scheduled job").requiredOption("--description <text>", "Job description").option("--prompt <text>", "Agent prompt (defaults to description)").option("--cron <expr>", "Cron expression (e.g. '0 9 * * *')").option("--at <iso8601>", "One-shot time").option("--every <interval>", "Repeat interval (e.g. 30m, 1h)").option("--backend <name>", "Backend for this job").option("--model <name>", "Model for this job").option("--thinking <level>", "Thinking level").option("--timeout <seconds>", "Job timeout in seconds (30-3600)").option("--timezone <tz>", "IANA timezone", "UTC").option("--session-type <type>", "Session type (isolated/main)", "isolated").option("--delivery <mode>", "Delivery mode (announce/webhook/none)", "announce").option("--channel <name>", "Delivery channel").option("--target <id>", "Delivery target").option("--cwd <path>", "Working directory").action(async (opts) => {
     const { cronCreate: cronCreate2 } = await Promise.resolve().then(() => (init_cron2(), cron_exports2));
     await cronCreate2(program.opts(), opts);
   });
@@ -15069,7 +15265,7 @@ function registerCronCommands(cmd) {
     const { cronAction: cronAction2 } = await Promise.resolve().then(() => (init_cron2(), cron_exports2));
     await cronAction2(program.opts(), "run", id);
   });
-  cmd.command("edit <id>").description("Edit a job (same flags as create)").option("--description <text>").option("--cron <expr>").option("--at <iso8601>").option("--every <interval>").option("--backend <name>").option("--model <name>").option("--thinking <level>").option("--timezone <tz>").action(async (id, opts) => {
+  cmd.command("edit <id>").description("Edit a job (same flags as create)").option("--description <text>").option("--cron <expr>").option("--at <iso8601>").option("--every <interval>").option("--backend <name>").option("--model <name>").option("--thinking <level>").option("--timeout <seconds>", "Job timeout in seconds (30-3600)").option("--timezone <tz>").action(async (id, opts) => {
     const { cronEdit: cronEdit2 } = await Promise.resolve().then(() => (init_cron2(), cron_exports2));
     await cronEdit2(program.opts(), id, opts);
   });

package/package.json

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