cc-claw 0.4.10 → 0.5.1

package/dist/cli.js

@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/paths.ts
 import { homedir } from "os";
 import { join } from "path";
-var CC_CLAW_HOME, ENV_PATH, DATA_PATH, DB_PATH, LOGS_PATH, LOG_PATH, ERROR_LOG_PATH, WORKSPACE_PATH, SKILLS_PATH, RUNNERS_PATH, AGENTS_PATH;
+var CC_CLAW_HOME, ENV_PATH, DATA_PATH, DB_PATH, LOGS_PATH, LOG_PATH, ERROR_LOG_PATH, IDENTITY_PATH, WORKSPACE_PATH, SKILLS_PATH, RUNNERS_PATH, AGENTS_PATH;
 var init_paths = __esm({
   "src/paths.ts"() {
     "use strict";
@@ -34,6 +34,7 @@ var init_paths = __esm({
     LOGS_PATH = join(CC_CLAW_HOME, "logs");
     LOG_PATH = join(LOGS_PATH, "cc-claw.log");
     ERROR_LOG_PATH = join(LOGS_PATH, "cc-claw.error.log");
+    IDENTITY_PATH = join(CC_CLAW_HOME, "identity");
     WORKSPACE_PATH = join(CC_CLAW_HOME, "workspace");
     SKILLS_PATH = join(WORKSPACE_PATH, "skills");
     RUNNERS_PATH = join(CC_CLAW_HOME, "runners");
@@ -48,7 +49,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.4.10" : (() => {
+    VERSION = true ? "0.5.1" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -964,6 +965,7 @@ __export(store_exports3, {
   getMemoriesWithoutEmbeddings: () => getMemoriesWithoutEmbeddings,
   getMode: () => getMode,
   getModel: () => getModel,
+  getModelSignature: () => getModelSignature,
   getPendingEscalation: () => getPendingEscalation,
   getRecentBookmarks: () => getRecentBookmarks,
   getRecentMemories: () => getRecentMemories,
@@ -1010,6 +1012,7 @@ __export(store_exports3, {
   setHeartbeatConfig: () => setHeartbeatConfig,
   setMode: () => setMode,
   setModel: () => setModel,
+  setModelSignature: () => setModelSignature,
   setResponseStyle: () => setResponseStyle,
   setSessionId: () => setSessionId,
   setSessionStartedAt: () => setSessionStartedAt,
@@ -1486,6 +1489,12 @@ function initDatabase() {
       style TEXT NOT NULL DEFAULT 'normal'
     );
   `);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS chat_model_signature (
+      chat_id TEXT PRIMARY KEY,
+      value TEXT NOT NULL DEFAULT 'off'
+    );
+  `);
 }
 function getDb() {
   return db;
@@ -1629,6 +1638,17 @@ function setResponseStyle(chatId, style) {
     ON CONFLICT(chat_id) DO UPDATE SET style = excluded.style
   `).run(chatId, style);
 }
+function getModelSignature(chatId) {
+  const row = db.prepare("SELECT value FROM chat_model_signature WHERE chat_id = ?").get(chatId);
+  return row?.value ?? "off";
+}
+function setModelSignature(chatId, value) {
+  db.prepare(`
+    INSERT INTO chat_model_signature (chat_id, value)
+    VALUES (?, ?)
+    ON CONFLICT(chat_id) DO UPDATE SET value = excluded.value
+  `).run(chatId, value);
+}
 function getSessionId(chatId) {
   const row = db.prepare(
     "SELECT session_id FROM sessions WHERE chat_id = ?"
@@ -2533,11 +2553,13 @@ var init_env = __esm({
 // src/backends/claude.ts
 import { existsSync } from "fs";
 import { execSync } from "child_process";
+import { join as join3 } from "path";
 var ADAPTIVE_MODELS, ClaudeAdapter;
 var init_claude = __esm({
   "src/backends/claude.ts"() {
     "use strict";
     init_env();
+    init_paths();
     ADAPTIVE_MODELS = /* @__PURE__ */ new Set(["claude-opus-4-6", "claude-sonnet-4-6"]);
     ClaudeAdapter = class {
       id = "claude";
@@ -2624,7 +2646,7 @@ var init_claude = __esm({
           "stream-json",
           "--verbose",
           "--max-turns",
-          "25"
+          String(opts.maxTurns ?? 25)
         ];
         if (opts.sessionId) args.push("--resume", opts.sessionId);
         if (opts.model) args.push("--model", opts.model);
@@ -2647,6 +2669,10 @@ var init_claude = __esm({
             args.push("--allow-dangerously-skip-permissions");
             break;
         }
+        const identityFile = join3(IDENTITY_PATH, "CC-CLAW.md");
+        if (existsSync(identityFile)) {
+          args.push("--append-system-prompt-file", identityFile);
+        }
         return { executable: this.getExecutablePath(), args, cwd: opts.cwd };
       }
       parseLine(raw) {
@@ -2723,11 +2749,13 @@ var init_claude = __esm({
 // src/backends/gemini.ts
 import { existsSync as existsSync2 } from "fs";
 import { execSync as execSync2 } from "child_process";
+import { join as join4 } from "path";
 var GeminiAdapter;
 var init_gemini = __esm({
   "src/backends/gemini.ts"() {
     "use strict";
     init_env();
+    init_paths();
     GeminiAdapter = class {
       id = "gemini";
       displayName = "Gemini";
@@ -2774,7 +2802,12 @@ var init_gemini = __esm({
         return this._resolvedPath;
       }
       getEnv(thinkingOverrides) {
-        return buildBaseEnv(thinkingOverrides);
+        const env = buildBaseEnv(thinkingOverrides);
+        const identityFile = join4(IDENTITY_PATH, "CC-CLAW.md");
+        if (existsSync2(identityFile)) {
+          env.GEMINI_SYSTEM_MD = identityFile;
+        }
+        return env;
       }
       applyThinkingConfig(level, _model) {
         if (level === "auto" || level === "high") return {};
@@ -3261,7 +3294,7 @@ You are a proactive personal AI assistant running inside a Telegram bot powered
 ## Identity
 - You serve one user through Telegram. Be helpful, concise, and proactive.
 - You can switch between multiple AI backends (Claude, Gemini, Codex) \u2014 the user controls which one is active.
-- Your name, personality, and behavioral rules are defined in this file. The user can customize everything by editing ~/.cc-claw/workspace/SOUL.md.
+- Your name, personality, and behavioral rules are defined in this file. The user can customize everything by editing ~/.cc-claw/identity/SOUL.md.
 
 ## Capabilities
 - **Coding**: Read, write, and edit files. Run shell commands. Full agentic coding.
@@ -3278,6 +3311,15 @@ You are a proactive personal AI assistant running inside a Telegram bot powered
 - When you learn something about the user's preferences, include \`[UPDATE_USER:key=value]\` in your response to suggest saving it.
 - For the heartbeat: if nothing needs attention, respond with exactly \`HEARTBEAT_OK\` and nothing else.
 - Always use the user's timezone when discussing times and dates.
+
+## Identity File Maintenance
+- Keep SOUL.md under 100 lines. Every line costs tokens on every message.
+- Before adding content to SOUL.md or USER.md, consider if it belongs in:
+  - A context file (context/*.md) for topic-specific knowledge
+  - A skill (skills/) for reusable instructions
+  - A memory (via /remember) for facts
+- Never duplicate information already in memories or context files.
+- When updating identity files, remove outdated content first.
 `;
     DEFAULT_USER = `# User Profile
 
@@ -3298,7 +3340,7 @@ You are an expert user and operator of the CC-Claw architecture. Because you are
 - **Database**: All state is stored locally in SQLite (\`~/.cc-claw/data/cc-claw.db\`), ensuring total privacy and fast local access for memory, jobs, and orchestration.
 
 ## 2. Identity & Context (The "Brain")
-- **SOUL & USER**: Your personality is defined in \`~/.cc-claw/workspace/SOUL.md\`, and the user's profile is in \`USER.md\`. These are the single source of truth for your behavior.
+- **SOUL & USER**: Your personality is defined in \`~/.cc-claw/identity/SOUL.md\`, and the user's profile is in \`~/.cc-claw/identity/USER.md\`. These are the single source of truth for your behavior.
 - **On-Demand Context**: The \`context/\` directory holds files like this one. They are injected into your prompt only when triggered by relevant semantic keywords, keeping your context window lean.
 - **Proactive Memory**: You can autonomously save user facts and preferences to the database by writing \`[UPDATE_USER:key=value]\` in your replies.
 
@@ -3326,9 +3368,49 @@ If the user asks *how* to do something with CC-Claw, use this expertise to sugge
 });
 
 // src/bootstrap/init.ts
-import { existsSync as existsSync4, writeFileSync, mkdirSync, readFileSync as readFileSync2, statSync } from "fs";
-import { join as join3 } from "path";
+import {
+  existsSync as existsSync4,
+  writeFileSync,
+  mkdirSync,
+  readFileSync as readFileSync2,
+  statSync,
+  copyFileSync,
+  unlinkSync
+} from "fs";
+import { join as join5 } from "path";
+function migrateFile(legacyPath, newPath, label2) {
+  if (existsSync4(newPath)) return false;
+  if (existsSync4(legacyPath)) {
+    copyFileSync(legacyPath, newPath);
+    const copied = readFileSync2(newPath, "utf-8");
+    if (copied.length > 0) {
+      unlinkSync(legacyPath);
+      log(`[bootstrap] Migrated ${label2} from workspace/ to identity/`);
+      return true;
+    }
+    log(`[bootstrap] WARNING: Migration verification failed for ${label2}, keeping original`);
+    return false;
+  }
+  return false;
+}
 function bootstrapWorkspaceFiles() {
+  if (!existsSync4(IDENTITY_PATH)) {
+    mkdirSync(IDENTITY_PATH, { recursive: true });
+    log("[bootstrap] Created identity/ directory");
+  }
+  if (!existsSync4(WORKSPACE_PATH)) {
+    mkdirSync(WORKSPACE_PATH, { recursive: true });
+  }
+  migrateFile(LEGACY_SOUL_PATH, SOUL_PATH, "SOUL.md");
+  migrateFile(LEGACY_USER_PATH, USER_PATH, "USER.md");
+  if (existsSync4(LEGACY_CLAUDE_MD)) {
+    unlinkSync(LEGACY_CLAUDE_MD);
+    log("[bootstrap] Removed legacy workspace/CLAUDE.md (replaced by identity/CC-CLAW.md)");
+  }
+  if (existsSync4(LEGACY_GEMINI_MD)) {
+    unlinkSync(LEGACY_GEMINI_MD);
+    log("[bootstrap] Removed legacy workspace/GEMINI.md (replaced by identity/CC-CLAW.md)");
+  }
   if (!existsSync4(SOUL_PATH)) {
     writeFileSync(SOUL_PATH, DEFAULT_SOUL, "utf-8");
     log("[bootstrap] Created default SOUL.md");
@@ -3347,11 +3429,32 @@ function bootstrapWorkspaceFiles() {
     mkdirSync(CONTEXT_DIR, { recursive: true });
     log("[bootstrap] Created context/ directory");
   }
-  const expertisePath = join3(CONTEXT_DIR, "cc-claw-expertise.md");
+  const expertisePath = join5(CONTEXT_DIR, "cc-claw-expertise.md");
   if (!existsSync4(expertisePath)) {
     writeFileSync(expertisePath, DEFAULT_EXPERTISE, "utf-8");
     log("[bootstrap] Created default context/cc-claw-expertise.md");
   }
+  const IGNORE_CONTENT = [
+    "# CC-Claw workspace: only essential files are scanned by coding CLIs.",
+    "# Agents can still access any file via absolute path when asked.",
+    "*",
+    "!.gitignore",
+    "!.geminiignore",
+    "!AGENTS.md",
+    "!context/",
+    "!context/**",
+    ""
+  ].join("\n");
+  const gitignorePath = join5(WORKSPACE_PATH, ".gitignore");
+  if (!existsSync4(gitignorePath)) {
+    writeFileSync(gitignorePath, IGNORE_CONTENT, "utf-8");
+    log("[bootstrap] Created .gitignore (workspace allowlist)");
+  }
+  const geminiignorePath = join5(WORKSPACE_PATH, ".geminiignore");
+  if (!existsSync4(geminiignorePath)) {
+    writeFileSync(geminiignorePath, IGNORE_CONTENT, "utf-8");
+    log("[bootstrap] Created .geminiignore (workspace allowlist)");
+  }
   syncNativeCliFiles();
 }
 function syncNativeCliFiles() {
@@ -3360,15 +3463,23 @@ function syncNativeCliFiles() {
   try {
     soul = readFileSync2(SOUL_PATH, "utf-8").trim();
   } catch {
+    try {
+      soul = readFileSync2(LEGACY_SOUL_PATH, "utf-8").trim();
+    } catch {
+    }
   }
   try {
     user = readFileSync2(USER_PATH, "utf-8").trim();
   } catch {
+    try {
+      user = readFileSync2(LEGACY_USER_PATH, "utf-8").trim();
+    } catch {
+    }
   }
   try {
     const soulMtime = existsSync4(SOUL_PATH) ? statSync(SOUL_PATH).mtimeMs : 0;
     const userMtime = existsSync4(USER_PATH) ? statSync(USER_PATH).mtimeMs : 0;
-    if (soulMtime === lastSoulMtime && userMtime === lastUserMtime) {
+    if (soulMtime > 0 && soulMtime === lastSoulMtime && userMtime === lastUserMtime) {
       return;
     }
     lastSoulMtime = soulMtime;
@@ -3402,27 +3513,26 @@ function syncNativeCliFiles() {
     "- Skills are in ~/.cc-claw/workspace/skills/",
     ""
   ].join("\n");
-  for (const name of NATIVE_CLI_FILES) {
-    const filePath = join3(WORKSPACE_PATH, name);
-    let content = nativeContent;
-    if (name === "GEMINI.md") {
-      content = content.replace(/@(\w+)/g, "$1");
-    }
-    writeFileSync(filePath, content, "utf-8");
-  }
-  log(`[bootstrap] Synced SOUL.md + USER.md \u2192 ${NATIVE_CLI_FILES.join(", ")}`);
+  const ccClawPath = join5(IDENTITY_PATH, "CC-CLAW.md");
+  writeFileSync(ccClawPath, nativeContent, "utf-8");
+  const agentsPath = join5(WORKSPACE_PATH, "AGENTS.md");
+  writeFileSync(agentsPath, nativeContent, "utf-8");
+  log("[bootstrap] Synced SOUL.md + USER.md \u2192 identity/CC-CLAW.md, workspace/AGENTS.md");
 }
-var SOUL_PATH, USER_PATH, CONTEXT_DIR, NATIVE_CLI_FILES, lastSoulMtime, lastUserMtime;
+var SOUL_PATH, USER_PATH, CONTEXT_DIR, LEGACY_SOUL_PATH, LEGACY_USER_PATH, LEGACY_CLAUDE_MD, LEGACY_GEMINI_MD, lastSoulMtime, lastUserMtime;
 var init_init = __esm({
   "src/bootstrap/init.ts"() {
     "use strict";
     init_paths();
     init_defaults();
     init_log();
-    SOUL_PATH = join3(WORKSPACE_PATH, "SOUL.md");
-    USER_PATH = join3(WORKSPACE_PATH, "USER.md");
-    CONTEXT_DIR = join3(WORKSPACE_PATH, "context");
-    NATIVE_CLI_FILES = ["CLAUDE.md", "GEMINI.md", "AGENTS.md"];
+    SOUL_PATH = join5(IDENTITY_PATH, "SOUL.md");
+    USER_PATH = join5(IDENTITY_PATH, "USER.md");
+    CONTEXT_DIR = join5(WORKSPACE_PATH, "context");
+    LEGACY_SOUL_PATH = join5(WORKSPACE_PATH, "SOUL.md");
+    LEGACY_USER_PATH = join5(WORKSPACE_PATH, "USER.md");
+    LEGACY_CLAUDE_MD = join5(WORKSPACE_PATH, "CLAUDE.md");
+    LEGACY_GEMINI_MD = join5(WORKSPACE_PATH, "GEMINI.md");
     lastSoulMtime = 0;
     lastUserMtime = 0;
   }
@@ -3430,7 +3540,7 @@ var init_init = __esm({
 
 // src/bootstrap/loader.ts
 import { readFileSync as readFileSync3, existsSync as existsSync5, readdirSync } from "fs";
-import { join as join4 } from "path";
+import { join as join6 } from "path";
 function searchContext(userMessage) {
   if (!existsSync5(CONTEXT_DIR2)) return null;
   const msgWords = new Set(
@@ -3441,7 +3551,7 @@ function searchContext(userMessage) {
   try {
     const files = readdirSync(CONTEXT_DIR2).filter((f) => f.endsWith(".md"));
     for (const file of files) {
-      const filePath = join4(CONTEXT_DIR2, file);
+      const filePath = join6(CONTEXT_DIR2, file);
       try {
         const content = readFileSync3(filePath, "utf-8").trim();
         if (!content) continue;
@@ -3471,7 +3581,10 @@ function searchContext(userMessage) {
 }
 async function assembleBootstrapPrompt(userMessage, tier = "full", chatId, permMode, responseStyle) {
   const sections = [];
-  syncNativeCliFiles();
+  if (Date.now() - lastSyncMs >= 5e3) {
+    syncNativeCliFiles();
+    lastSyncMs = Date.now();
+  }
   if (permMode && permMode !== "yolo") {
     sections.push(buildPermissionNotice(permMode));
   }
@@ -3489,7 +3602,7 @@ async function assembleBootstrapPrompt(userMessage, tier = "full", chatId, permM
 ${ctx}`);
     }
   }
-  if (chatId && tier !== "slim") {
+  if (chatId && tier !== "slim" && tier !== "chat") {
     const bridge = consumeContextBridge(chatId);
     if (bridge) {
       sections.push(bridge);
@@ -3562,7 +3675,7 @@ ${boardText}`);
     return null;
   }
 }
-var CONTEXT_DIR2, MAX_CONTEXT_CHARS, ACTIVITY_TOKEN_BUDGET, INBOX_TOKEN_BUDGET, WHITEBOARD_TOKEN_BUDGET;
+var lastSyncMs, CONTEXT_DIR2, MAX_CONTEXT_CHARS, ACTIVITY_TOKEN_BUDGET, INBOX_TOKEN_BUDGET, WHITEBOARD_TOKEN_BUDGET;
 var init_loader = __esm({
   "src/bootstrap/loader.ts"() {
     "use strict";
@@ -3573,7 +3686,8 @@ var init_loader = __esm({
     init_store3();
     init_store4();
     init_store();
-    CONTEXT_DIR2 = join4(WORKSPACE_PATH, "context");
+    lastSyncMs = 0;
+    CONTEXT_DIR2 = join6(WORKSPACE_PATH, "context");
     MAX_CONTEXT_CHARS = 4e3;
     ACTIVITY_TOKEN_BUDGET = 1500;
     INBOX_TOKEN_BUDGET = 2e3;
@@ -3615,6 +3729,16 @@ function clearLog(chatId) {
   markMessageLogSummarized(chatId);
   cache.delete(chatId);
 }
+function getLastMessageTimestamp(chatId) {
+  const cached = cache.get(chatId);
+  if (cached && cached.length > 0) {
+    return cached[cached.length - 1].timestamp;
+  }
+  const rows = getUnsummarizedLog(chatId);
+  if (rows.length === 0) return null;
+  const last = rows[rows.length - 1];
+  return (/* @__PURE__ */ new Date(last.created_at + (last.created_at.includes("Z") ? "" : "Z"))).getTime();
+}
 function getLoggedChatIds() {
   return getUnsummarizedChatIds();
 }
@@ -3807,7 +3931,15 @@ async function summarizeSession(chatId) {
   return summarizeWithFallbackChain(chatId);
 }
 async function summarizeAllPending() {
-  const chatIds = getLoggedChatIds();
+  const allIds = getLoggedChatIds();
+  const chatIds = allIds.filter((id) => !id.includes("-test-"));
+  if (allIds.length > chatIds.length) {
+    const skipped = allIds.length - chatIds.length;
+    log(`[summarize] Skipping ${skipped} test session(s)`);
+    for (const testId of allIds.filter((id) => id.includes("-test-"))) {
+      clearLog(testId);
+    }
+  }
   if (chatIds.length === 0) return;
   log(`[summarize] Summarizing ${chatIds.length} pending session(s)...`);
   for (const chatId of chatIds) {
@@ -4202,13 +4334,13 @@ var init_propagate = __esm({
 });
 
 // src/agents/mcp-config.ts
-import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, existsSync as existsSync6, readdirSync as readdirSync2, unlinkSync } from "fs";
-import { join as join5, dirname } from "path";
+import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, existsSync as existsSync6, readdirSync as readdirSync2, unlinkSync as unlinkSync2 } from "fs";
+import { join as join7, dirname } from "path";
 import { fileURLToPath } from "url";
 function generateOrchestratorMcpConfig(opts) {
   const port = opts.port ?? process.env.DASHBOARD_PORT ?? "3141";
-  const distPath = join5(__dirname, "agents", "mcp-server.js");
-  const tsxPath = join5(__dirname, "..", "src", "agents", "mcp-server.ts");
+  const distPath = join7(__dirname, "agents", "mcp-server.js");
+  const tsxPath = join7(__dirname, "..", "src", "agents", "mcp-server.ts");
   const useTs = !existsSync6(distPath);
   return {
     name: opts.agentId === "main" ? "cc-claw" : `cc-claw-${opts.agentId.slice(0, 8)}`,
@@ -4235,15 +4367,15 @@ function writeMcpConfigFile(config2) {
     }
   };
   const safeName = config2.name.replace(/[^a-zA-Z0-9-]/g, "_");
-  const configPath = join5(MCP_CONFIG_DIR, `mcp-${safeName}.json`);
+  const configPath = join7(MCP_CONFIG_DIR, `mcp-${safeName}.json`);
   writeFileSync2(configPath, JSON.stringify(jsonConfig, null, 2), { mode: 384 });
   return configPath;
 }
 function deleteMcpConfigFile(mcpName) {
   const safeName = mcpName.replace(/[^a-zA-Z0-9-]/g, "_");
-  const configPath = join5(MCP_CONFIG_DIR, `mcp-${safeName}.json`);
+  const configPath = join7(MCP_CONFIG_DIR, `mcp-${safeName}.json`);
   try {
-    unlinkSync(configPath);
+    unlinkSync2(configPath);
   } catch {
   }
 }
@@ -4254,7 +4386,7 @@ function cleanupOrphanedMcpConfigs() {
     for (const file of files) {
       if (file.startsWith("mcp-cc-claw-") && file.endsWith(".json")) {
         try {
-          unlinkSync(join5(MCP_CONFIG_DIR, file));
+          unlinkSync2(join7(MCP_CONFIG_DIR, file));
         } catch {
         }
       }
@@ -4269,7 +4401,7 @@ var init_mcp_config = __esm({
     init_paths();
     __filename = fileURLToPath(import.meta.url);
     __dirname = dirname(__filename);
-    MCP_CONFIG_DIR = join5(CC_CLAW_HOME, "mcp-configs");
+    MCP_CONFIG_DIR = join7(CC_CLAW_HOME, "mcp-configs");
   }
 });
 
@@ -4280,7 +4412,7 @@ __export(loader_exports, {
   listTemplates: () => listTemplates
 });
 import { readdirSync as readdirSync3, readFileSync as readFileSync5 } from "fs";
-import { join as join6 } from "path";
+import { join as join8 } from "path";
 function parseFrontmatter(content) {
   const match = content.match(/^---\s*\n([\s\S]*?)\n---\s*\n?([\s\S]*)$/m);
   if (!match || match.index !== 0) return { meta: {}, body: content.trim() };
@@ -4318,7 +4450,7 @@ function scanTemplates() {
     return;
   }
   for (const file of files) {
-    const filePath = join6(AGENTS_PATH, file);
+    const filePath = join8(AGENTS_PATH, file);
     try {
       const raw = readFileSync5(filePath, "utf-8");
       const { meta, body } = parseFrontmatter(raw);
@@ -6092,7 +6224,7 @@ function stopAgent(chatId) {
   }
   return true;
 }
-function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs) {
+function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs, maxTurns) {
   const effectiveTimeout = timeoutMs ?? SPAWN_TIMEOUT_MS;
   return new Promise((resolve, reject) => {
     const thinkingConfig = thinkingLevel && thinkingLevel !== "auto" ? adapter.applyThinkingConfig(thinkingLevel, model2) : void 0;
@@ -6123,6 +6255,7 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
     let cacheRead = 0;
     let sawToolEvents = false;
     let sawResultEvent = false;
+    let toolTurnCount = 0;
     const t0 = Date.now();
     const elapsed = () => `${((Date.now() - t0) / 1e3).toFixed(1)}s`;
     const pendingTools = /* @__PURE__ */ new Map();
@@ -6164,6 +6297,13 @@ function spawnQuery(adapter, config2, model2, cancelState, onStream, onToolActio
                 error("[agent] tool action error:", err);
               });
             }
+            if (maxTurns && adapter.id !== "claude") {
+              toolTurnCount++;
+              if (toolTurnCount >= maxTurns) {
+                log(`[agent] Turn limit ${maxTurns} reached for ${adapter.id} -- stopping`);
+                killProcessGroup(proc, "SIGTERM");
+              }
+            }
             break;
           case "tool_end":
             if (onToolAction) {
@@ -6246,7 +6386,7 @@ function askAgent(chatId, userMessage, opts) {
   return withChatLock(chatId, () => askAgentImpl(chatId, userMessage, opts));
 }
 async function askAgentImpl(chatId, userMessage, opts) {
-  const { cwd, onStream, model: model2, backend: backend2, permMode, onToolAction, bootstrapTier, timeoutMs } = opts ?? {};
+  const { cwd, onStream, model: model2, backend: backend2, permMode, onToolAction, bootstrapTier, timeoutMs, maxTurns } = opts ?? {};
   const adapter = backend2 ? getAdapter(backend2) : getAdapterForChat(chatId);
   const mode = permMode ?? getMode(chatId);
   const responseStyle = getResponseStyle(chatId);
@@ -6263,7 +6403,8 @@ async function askAgentImpl(chatId, userMessage, opts) {
     permMode: mode,
     allowedTools,
     cwd: resolvedCwd,
-    thinkingLevel
+    thinkingLevel,
+    maxTurns
   });
   if (mcpConfigPath) {
     baseConfig.args = injectMcpConfig(adapter.id, baseConfig.args, mcpConfigPath);
@@ -6276,7 +6417,8 @@ async function askAgentImpl(chatId, userMessage, opts) {
       permMode: mode,
       allowedTools,
       cwd: resolvedCwd,
-      thinkingLevel
+      thinkingLevel,
+      maxTurns
     });
     if (mcpConfigPath) {
       cfg.args = injectMcpConfig(adapter.id, cfg.args, mcpConfigPath);
@@ -6288,13 +6430,13 @@ async function askAgentImpl(chatId, userMessage, opts) {
   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, timeoutMs);
+    result = await spawnQuery(adapter, configWithSession, resolvedModel, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs, maxTurns);
     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, timeoutMs);
+      result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, onStream, onToolAction, thinkingLevel, timeoutMs, maxTurns);
     }
   } finally {
     activeChats.delete(chatId);
@@ -6316,7 +6458,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
   if (result.resultText) {
     appendToLog(chatId, userMessage, result.resultText, adapter.id, model2 ?? null, result.sessionId ?? null);
     const AUTO_SUMMARIZE_THRESHOLD = 30;
-    const pairCount = getMessagePairCount(chatId);
+    const pairCount = tier !== "chat" ? getMessagePairCount(chatId) : 0;
     if (pairCount >= AUTO_SUMMARIZE_THRESHOLD) {
       log(`[agent] Auto-summarizing chat ${chatId} after ${pairCount} turns`);
       summarizeWithFallbackChain(chatId).then((saved) => {
@@ -6969,7 +7111,7 @@ var init_cron = __esm({
 });
 
 // src/agents/runners/wrap-backend.ts
-import { join as join7 } from "path";
+import { join as join9 } from "path";
 function buildMcpCommands(backendId) {
   const exe = backendId;
   return {
@@ -7060,7 +7202,7 @@ function wrapBackendAdapter(adapter) {
       const configPath = writeMcpConfigFile(server);
       return ["--mcp-config", configPath];
     },
-    getSkillPath: () => join7(SKILLS_PATH, `agent-${adapter.id}.md`)
+    getSkillPath: () => join9(SKILLS_PATH, `agent-${adapter.id}.md`)
   };
 }
 var BACKEND_CAPABILITIES;
@@ -7103,7 +7245,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 join8 } from "path";
+import { join as join10 } from "path";
 import { execFileSync } from "child_process";
 function resolveExecutable(config2) {
   if (existsSync9(config2.executable)) return config2.executable;
@@ -7239,7 +7381,7 @@ function configToRunner(config2) {
     prepareMcpInjection() {
       return [];
     },
-    getSkillPath: () => join8(SKILLS_PATH, `agent-${config2.id}.md`)
+    getSkillPath: () => join10(SKILLS_PATH, `agent-${config2.id}.md`)
   };
 }
 function loadRunnerConfig(filePath) {
@@ -7259,7 +7401,7 @@ function loadAllRunnerConfigs() {
   const files = readdirSync4(RUNNERS_PATH).filter((f) => f.endsWith(".json"));
   const configs = [];
   for (const file of files) {
-    const config2 = loadRunnerConfig(join8(RUNNERS_PATH, file));
+    const config2 = loadRunnerConfig(join10(RUNNERS_PATH, file));
     if (config2) configs.push(config2);
   }
   return configs;
@@ -7289,7 +7431,7 @@ function watchRunnerConfigs(onChange) {
   }
   const files = readdirSync4(RUNNERS_PATH).filter((f) => f.endsWith(".json"));
   for (const file of files) {
-    const fullPath = join8(RUNNERS_PATH, file);
+    const fullPath = join10(RUNNERS_PATH, file);
     if (watchedFiles.has(fullPath)) continue;
     watchedFiles.add(fullPath);
     watchFile(fullPath, { interval: 5e3 }, () => {
@@ -7600,9 +7742,11 @@ var init_telegram2 = __esm({
           { command: "voice", description: "Toggle voice responses" },
           { command: "voice_config", description: "Configure voice provider and voice" },
           { command: "response_style", description: "Set the AI response style (concise/normal/detailed)" },
+          { command: "model_signature", description: "Toggle model+thinking signature on responses" },
           { command: "imagine", description: "Generate an image from a prompt" },
           { command: "heartbeat", description: "Configure proactive heartbeat" },
-          { command: "chats", description: "Manage multi-chat aliases" }
+          { command: "chats", description: "Manage multi-chat aliases" },
+          { command: "intent", description: "Test intent classifier on a message" }
         ]);
         this.bot.on("message", (ctx) => {
           const chatId = ctx.chat.id.toString();
@@ -7876,22 +8020,44 @@ var init_telegram2 = __esm({
 var discover_exports = {};
 __export(discover_exports, {
   discoverAllSkills: () => discoverAllSkills,
+  invalidateSkillCache: () => invalidateSkillCache,
   stripFrontmatter: () => stripFrontmatter2
 });
 import { readdir, readFile as readFile2 } from "fs/promises";
 import { createHash } from "crypto";
 import { homedir as homedir4 } from "os";
-import { join as join9 } from "path";
+import { join as join11 } from "path";
+function invalidateSkillCache() {
+  cachedSkills = null;
+  cacheTimestamp = 0;
+}
 async function discoverAllSkills() {
-  const rawSkills = [];
-  rawSkills.push(...await scanSkillDir(SKILLS_PATH, "cc-claw"));
-  for (const backendId of getAllBackendIds()) {
-    const dirs = BACKEND_SKILL_DIRS[backendId] ?? [join9(homedir4(), `.${backendId}`, "skills")];
-    for (const dir of dirs) {
-      rawSkills.push(...await scanSkillDir(dir, backendId));
-    }
+  const now = Date.now();
+  if (cachedSkills !== null && now - cacheTimestamp < CACHE_TTL_MS2) {
+    return cachedSkills;
+  }
+  if (pendingScan !== null) {
+    return pendingScan;
   }
-  return mergeAndDeduplicate(rawSkills);
+  pendingScan = (async () => {
+    try {
+      const rawSkills = [];
+      rawSkills.push(...await scanSkillDir(SKILLS_PATH, "cc-claw"));
+      for (const backendId of getAllBackendIds()) {
+        const dirs = BACKEND_SKILL_DIRS[backendId] ?? [join11(homedir4(), `.${backendId}`, "skills")];
+        for (const dir of dirs) {
+          rawSkills.push(...await scanSkillDir(dir, backendId));
+        }
+      }
+      const result = mergeAndDeduplicate(rawSkills);
+      cachedSkills = result;
+      cacheTimestamp = Date.now();
+      return result;
+    } finally {
+      pendingScan = null;
+    }
+  })();
+  return pendingScan;
 }
 async function scanSkillDir(skillsDir, source) {
   const results = [];
@@ -7906,7 +8072,7 @@ async function scanSkillDir(skillsDir, source) {
     let content;
     let resolvedPath;
     for (const candidate of SKILL_FILE_CANDIDATES) {
-      const p = join9(skillsDir, entry.name, candidate);
+      const p = join11(skillsDir, entry.name, candidate);
       try {
         content = await readFile2(p, "utf-8");
         resolvedPath = p;
@@ -8001,7 +8167,7 @@ function parseFrontmatter2(content, fallbackName) {
 function stripFrontmatter2(content) {
   return content.replace(/^---\s*\n[\s\S]*?\n---\s*\n?/, "").trim();
 }
-var SKILL_FILE_CANDIDATES, BACKEND_SKILL_DIRS;
+var SKILL_FILE_CANDIDATES, BACKEND_SKILL_DIRS, CACHE_TTL_MS2, cachedSkills, cacheTimestamp, pendingScan;
 var init_discover = __esm({
   "src/skills/discover.ts"() {
     "use strict";
@@ -8009,13 +8175,17 @@ var init_discover = __esm({
     init_backends();
     SKILL_FILE_CANDIDATES = ["SKILL.md", "skill.md"];
     BACKEND_SKILL_DIRS = {
-      claude: [join9(homedir4(), ".claude", "skills")],
-      gemini: [join9(homedir4(), ".gemini", "skills")],
+      claude: [join11(homedir4(), ".claude", "skills")],
+      gemini: [join11(homedir4(), ".gemini", "skills")],
       codex: [
-        join9(homedir4(), ".agents", "skills"),
-        join9(homedir4(), ".codex", "skills")
+        join11(homedir4(), ".agents", "skills"),
+        join11(homedir4(), ".codex", "skills")
       ]
     };
+    CACHE_TTL_MS2 = 3e5;
+    cachedSkills = null;
+    cacheTimestamp = 0;
+    pendingScan = null;
   }
 });
 
@@ -8026,7 +8196,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 join10, basename } from "path";
+import { join as join12, basename } from "path";
 import { execSync as execSync4 } from "child_process";
 async function installSkillFromGitHub(urlOrShorthand) {
   let repoUrl;
@@ -8037,23 +8207,23 @@ async function installSkillFromGitHub(urlOrShorthand) {
   }
   repoUrl = parsed.cloneUrl;
   subPath = parsed.subPath;
-  const tmpDir = join10("/tmp", `cc-claw-skill-${Date.now()}`);
+  const tmpDir = join12("/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(join10(tmpDir, ".git"))) {
+    if (!existsSync10(join12(tmpDir, ".git"))) {
       return { success: false, error: "Git clone failed: no .git directory produced" };
     }
-    const searchRoot = subPath ? join10(tmpDir, subPath) : tmpDir;
+    const searchRoot = subPath ? join12(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 = join10(SKILLS_PATH, skillFolderName);
+    const destDir = join12(SKILLS_PATH, skillFolderName);
     if (existsSync10(destDir)) {
       log(`[skill-install] Overwriting existing skill at ${destDir}`);
     }
@@ -8061,12 +8231,12 @@ async function installSkillFromGitHub(urlOrShorthand) {
     await cp(skillDir, destDir, { recursive: true });
     let skillName = skillFolderName;
     try {
-      const content = await readFile3(join10(destDir, "SKILL.md"), "utf-8");
+      const content = await readFile3(join12(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(join10(destDir, "skill.md"), "utf-8");
+        const content = await readFile3(join12(destDir, "skill.md"), "utf-8");
         const nameMatch = content.match(/^name:\s*(.+)$/m);
         if (nameMatch) skillName = nameMatch[1].trim().replace(/^["']|["']$/g, "");
       } catch {
@@ -8101,15 +8271,15 @@ function parseGitHubUrl(input) {
 async function findSkillDir(root) {
   const candidates = ["SKILL.md", "skill.md"];
   for (const c of candidates) {
-    if (existsSync10(join10(root, c))) return root;
+    if (existsSync10(join12(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(join10(root, entry.name, c))) {
-          return join10(root, entry.name);
+        if (existsSync10(join12(root, entry.name, c))) {
+          return join12(root, entry.name);
         }
       }
     }
@@ -8121,15 +8291,15 @@ async function findSkillDir(root) {
       if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
       let subEntries;
       try {
-        subEntries = await readdir2(join10(root, entry.name), { withFileTypes: true });
+        subEntries = await readdir2(join12(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(join10(root, entry.name, sub.name, c))) {
-            return join10(root, entry.name, sub.name);
+          if (existsSync10(join12(root, entry.name, sub.name, c))) {
+            return join12(root, entry.name, sub.name);
           }
         }
       }
@@ -8148,7 +8318,7 @@ var init_install = __esm({
 
 // src/bootstrap/profile.ts
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync4, existsSync as existsSync11 } from "fs";
-import { join as join11 } from "path";
+import { join as join13 } from "path";
 function hasActiveProfile(chatId) {
   return activeProfiles.has(chatId);
 }
@@ -8263,7 +8433,7 @@ Timezone: ${state.timezone}
 Style: ${state.style}
 Use: ${state.useCase}
 
-You can edit ~/.cc-claw/workspace/USER.md anytime or run /setup-profile again.`,
+You can edit ~/.cc-claw/identity/USER.md anytime or run /setup-profile again.`,
     "plain"
   );
 }
@@ -8293,14 +8463,14 @@ var init_profile = __esm({
     "use strict";
     init_paths();
     init_log();
-    USER_PATH2 = join11(WORKSPACE_PATH, "USER.md");
+    USER_PATH2 = join13(IDENTITY_PATH, "USER.md");
     activeProfiles = /* @__PURE__ */ new Map();
   }
 });
 
 // src/bootstrap/heartbeat.ts
 import { readFileSync as readFileSync8, existsSync as existsSync12 } from "fs";
-import { join as join12 } from "path";
+import { join as join14 } from "path";
 function initHeartbeat(channelReg) {
   registry2 = channelReg;
 }
@@ -8486,7 +8656,7 @@ var init_heartbeat = __esm({
     init_backends();
     init_health2();
     init_log();
-    HEARTBEAT_MD_PATH = join12(WORKSPACE_PATH, "HEARTBEAT.md");
+    HEARTBEAT_MD_PATH = join14(WORKSPACE_PATH, "HEARTBEAT.md");
     HEARTBEAT_OK = "HEARTBEAT_OK";
     registry2 = null;
     activeTimers2 = /* @__PURE__ */ new Map();
@@ -8531,10 +8701,127 @@ var init_format_time = __esm({
   }
 });
 
+// src/intent/classify.ts
+function classifyIntent(text, chatId) {
+  const trimmed = text.trim();
+  if (trimmed.startsWith(">>")) return "agentic";
+  if (trimmed.startsWith("/")) return "agentic";
+  const lower = trimmed.toLowerCase();
+  for (const pattern of AGENTIC_PATTERNS) {
+    if (pattern.test(trimmed)) {
+      log(`[intent] "${trimmed.slice(0, 30)}..." -> agentic (pattern: ${pattern})`);
+      return "agentic";
+    }
+  }
+  const sessionId = getSessionId(chatId);
+  if (sessionId) {
+    const lastTs = getLastMessageTimestamp(chatId);
+    if (lastTs) {
+      const elapsed = Date.now() - lastTs;
+      if (elapsed < 12e4) {
+        if (trimmed.length < 30) {
+          log(`[intent] "${trimmed.slice(0, 30)}" -> agentic (active session, ${(elapsed / 1e3).toFixed(0)}s ago)`);
+          return "agentic";
+        }
+      }
+    }
+  }
+  if (CHAT_EXACT.has(lower)) {
+    log(`[intent] "${lower}" -> chat (exact match)`);
+    return "chat";
+  }
+  if (trimmed.length <= 4 && /^[\p{Emoji}\s]+$/u.test(trimmed)) {
+    log(`[intent] "${trimmed}" -> chat (emoji-only)`);
+    return "chat";
+  }
+  log(`[intent] "${trimmed.slice(0, 30)}..." -> agentic (default)`);
+  return "agentic";
+}
+var CHAT_EXACT, AGENTIC_PATTERNS;
+var init_classify = __esm({
+  "src/intent/classify.ts"() {
+    "use strict";
+    init_store4();
+    init_session_log();
+    init_log();
+    CHAT_EXACT = /* @__PURE__ */ new Set([
+      "hey",
+      "hi",
+      "hello",
+      "yo",
+      "sup",
+      "howdy",
+      "hiya",
+      "thanks",
+      "thank you",
+      "thx",
+      "ty",
+      "thank u",
+      "ok",
+      "okay",
+      "k",
+      "kk",
+      "cool",
+      "nice",
+      "great",
+      "awesome",
+      "perfect",
+      "good morning",
+      "good night",
+      "good evening",
+      "gm",
+      "gn",
+      "bye",
+      "goodbye",
+      "later",
+      "see ya",
+      "cya",
+      "lol",
+      "lmao",
+      "haha",
+      "heh",
+      "np",
+      "no problem",
+      "no worries",
+      "nw",
+      "got it",
+      "understood",
+      "roger",
+      "copy",
+      "good",
+      "fine",
+      "alright",
+      "sure"
+    ]);
+    AGENTIC_PATTERNS = [
+      /\.\w{1,5}$/,
+      // file extensions (.ts, .py, .md)
+      /[\/\\][\w.-]+/,
+      // file paths
+      /`[^`]+`/,
+      // inline code
+      /```/,
+      // code blocks
+      /\b(fix|create|build|deploy|run|execute|install|delete|remove|update|edit|write|read|check|test|debug|refactor|implement|add|change|modify|move|copy|rename|push|pull|commit|merge|rebase)\b/i,
+      // imperative verbs
+      /\b(error|bug|crash|fail|broken|issue|problem|exception|stack ?trace)\b/i,
+      // error keywords
+      /\b(function|class|const|let|var|import|export|return|async|await)\b/i,
+      // code keywords
+      /[!]{1,2}\s/,
+      // shell prefix
+      /^\/\//,
+      // backend command prefix
+      /\b(file|folder|directory|script|server|database|api|endpoint|config|package|module|component)\b/i
+      // tech nouns
+    ];
+  }
+});
+
 // src/media/image-gen.ts
 import { mkdirSync as mkdirSync5, existsSync as existsSync13 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { join as join13 } from "path";
+import { join as join15 } from "path";
 async function generateImage(prompt) {
   const apiKey = process.env.GEMINI_API_KEY;
   if (!apiKey) {
@@ -8586,7 +8873,7 @@ async function generateImage(prompt) {
   }
   const ext = mimeType.includes("jpeg") || mimeType.includes("jpg") ? "jpg" : "png";
   const filename = `img_${Date.now()}.${ext}`;
-  const filePath = join13(IMAGE_OUTPUT_DIR, filename);
+  const filePath = join15(IMAGE_OUTPUT_DIR, filename);
   const buffer = Buffer.from(imageData, "base64");
   await writeFile2(filePath, buffer);
   log(`[image-gen] Saved ${buffer.length} bytes to ${filePath}`);
@@ -8601,8 +8888,8 @@ var init_image_gen = __esm({
     "use strict";
     init_log();
     IMAGE_MODEL = "gemini-3.1-flash-image-preview";
-    IMAGE_OUTPUT_DIR = join13(
-      process.env.CC_CLAW_HOME ?? join13(process.env.HOME ?? "/tmp", ".cc-claw"),
+    IMAGE_OUTPUT_DIR = join15(
+      process.env.CC_CLAW_HOME ?? join15(process.env.HOME ?? "/tmp", ".cc-claw"),
       "data",
       "images"
     );
@@ -9689,6 +9976,25 @@ function shortModelName(modelId) {
   }
   return modelId;
 }
+function formatModelShort(modelId) {
+  const MAP = {
+    "claude-opus-4-6": "Opus 4.6",
+    "claude-sonnet-4-6": "Sonnet 4.6",
+    "claude-haiku-4-5": "Haiku 4.5",
+    "gemini-3.1-pro-preview": "Gemini Pro 3.1",
+    "gemini-3-flash-preview": "Gemini 3 Flash",
+    "gpt-5.4": "GPT-5.4",
+    "gpt-5.3-codex": "GPT-5.3 Codex",
+    "gpt-5.2-codex": "GPT-5.2 Codex",
+    "gpt-5.1-codex-max": "GPT-5.1 Codex Max",
+    "gpt-5.4-mini": "GPT-5.4-mini"
+  };
+  return MAP[modelId] ?? modelId;
+}
+function capitalize(s) {
+  if (s === "extra_high") return "xHigh";
+  return s.charAt(0).toUpperCase() + s.slice(1);
+}
 function resolveModel(chatId) {
   const explicit = getModel(chatId);
   if (explicit) return explicit;
@@ -9767,7 +10073,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/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/remember <text> - Save a memory\n/forget <keyword> - Remove a memory\n/voice - Toggle voice responses\n/voice_config - Configure voice provider and voice\n/imagine <prompt> - Generate an image (or /image)\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/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/remember <text> - Save a memory\n/forget <keyword> - Remove a memory\n/voice - Toggle voice responses\n/voice_config - Configure voice provider and voice\n/imagine <prompt> - Generate an image (or /image)\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/plan)\n/verbose - Tool visibility (off/normal/verbose)\n/model_signature - Toggle model+thinking signature on responses\n/intent <msg> - Test intent classifier (chat vs agentic)\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;
@@ -10294,6 +10600,23 @@ ${lines.join("\n")}`, "plain");
       }
       break;
     }
+    case "model_signature": {
+      const currentSig = getModelSignature(chatId);
+      if (typeof channel.sendKeyboard === "function") {
+        await channel.sendKeyboard(chatId, `Model Signature: ${currentSig === "on" ? "ON" : "OFF"}
+Appends model + thinking level to each response.`, [
+          [
+            { label: currentSig === "on" ? "\u2713 On" : "On", data: "model_sig:on" },
+            { label: currentSig !== "on" ? "\u2713 Off" : "Off", data: "model_sig:off" }
+          ]
+        ]);
+      } else {
+        const newSig = currentSig === "on" ? "off" : "on";
+        setModelSignature(chatId, newSig);
+        await channel.sendText(chatId, newSig === "on" ? "Model signature enabled." : "Model signature disabled.", "plain");
+      }
+      break;
+    }
     case "imagine":
     case "image": {
       if (!commandArgs) {
@@ -10933,6 +11256,13 @@ Use /skills to see it.`, "plain");
       }
       break;
     }
+    case "intent": {
+      const testMsg = commandArgs?.trim() || "hey";
+      const result = classifyIntent(testMsg, chatId);
+      await channel.sendText(chatId, `Intent: ${result}
+Message: "${testMsg}"`, "plain");
+      break;
+    }
     default:
       await channel.sendText(chatId, `Unknown command: /${command}. Type /help for available commands.`, "plain");
   }
@@ -11113,6 +11443,10 @@ async function handleText(msg, channel) {
     await channel.sendText(chatId, limitMsg, "plain");
     return;
   }
+  const intent = classifyIntent(text, chatId);
+  const cleanText = text.startsWith(">>") ? text.slice(2).trim() : text;
+  const bootstrapTier = intent === "chat" ? "chat" : void 0;
+  const maxTurns = intent === "chat" ? 1 : void 0;
   if (isChatBusy(chatId) && !bypassBusyCheck.delete(chatId)) {
     if (typeof channel.sendKeyboard === "function") {
       pendingInterrupts.set(chatId, { msg, channel });
@@ -11141,20 +11475,33 @@ 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, {
+    const response = await askAgent(chatId, cleanText || text, {
       cwd: getCwd(chatId),
       model: model2,
       permMode: tMode,
       onToolAction: tToolCb,
+      bootstrapTier,
+      maxTurns,
       onCompaction: (cid) => {
         channel.sendText(cid, "\u{1F4BE} Context saved to memory.").catch(() => {
         });
       }
     });
     if (response.usage) addUsage(chatId, response.usage.input, response.usage.output, response.usage.cacheRead, model2);
-    if (response.text.includes("[NEED_PERMISSION]") && tMode !== "yolo") {
-      const cleanText = response.text.replace(/\[NEED_PERMISSION\]/g, "").trim();
-      await sendResponse(chatId, channel, cleanText, msg.messageId);
+    let responseText = response.text;
+    const sigEnabled = getModelSignature(chatId);
+    if (sigEnabled === "on" && responseText && !responseText.startsWith("(No response")) {
+      const adapter = getAdapterForChat(chatId);
+      const modelId = model2 ?? adapter.defaultModel;
+      const thinking2 = getThinkingLevel(chatId) || "auto";
+      const shortModel = formatModelShort(modelId);
+      responseText += `
+
+\u{1F9E0} [${shortModel} | ${capitalize(thinking2)}]`;
+    }
+    if (responseText.includes("[NEED_PERMISSION]") && tMode !== "yolo") {
+      const cleanText2 = responseText.replace(/\[NEED_PERMISSION\]/g, "").trim();
+      await sendResponse(chatId, channel, cleanText2, msg.messageId);
       const targetMode = determineEscalationTarget(chatId, tMode);
       storePendingEscalation(chatId, text);
       if (typeof channel.sendKeyboard === "function") {
@@ -11164,7 +11511,7 @@ async function handleText(msg, channel) {
       }
       return;
     }
-    await sendResponse(chatId, channel, response.text, msg.messageId);
+    await sendResponse(chatId, channel, responseText, msg.messageId);
   } catch (err) {
     error("[router] Error:", err);
     const errMsg = errorMessage(err);
@@ -11745,6 +12092,14 @@ ${PERM_MODES[chosen]}`,
       }
       await channel.sendText(chatId, `Response style set to: ${selectedStyle}`, "plain");
     }
+  } else if (data.startsWith("model_sig:")) {
+    const value = data.slice(10);
+    setModelSignature(chatId, value);
+    await channel.sendText(
+      chatId,
+      value === "on" ? "\u{1F9E0} Model signature enabled. Each response will show the active model and thinking level." : "Model signature disabled.",
+      "plain"
+    );
   } else if (data.startsWith("vcfg:")) {
     const parts = data.slice(5).split(":");
     const action = parts[0];
@@ -11999,6 +12354,7 @@ var init_router = __esm({
     init_format_time();
     init_agent();
     init_retry();
+    init_classify();
     init_image_gen();
     init_stt();
     init_store4();
@@ -12128,7 +12484,7 @@ var init_router = __esm({
 // src/skills/bootstrap.ts
 import { existsSync as existsSync14 } from "fs";
 import { readdir as readdir3, readFile as readFile6, writeFile as writeFile4, copyFile } from "fs/promises";
-import { join as join14, dirname as dirname2 } from "path";
+import { join as join16, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 async function copyAgentManifestSkills() {
   if (!existsSync14(PKG_SKILLS)) return;
@@ -12136,8 +12492,8 @@ async function copyAgentManifestSkills() {
     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 = join14(PKG_SKILLS, entry.name);
-      const dest = join14(SKILLS_PATH, entry.name);
+      const src = join16(PKG_SKILLS, entry.name);
+      const dest = join16(SKILLS_PATH, entry.name);
       if (existsSync14(dest)) continue;
       await copyFile(src, dest);
       log(`[skills] Bootstrapped ${entry.name} to ${SKILLS_PATH}`);
@@ -12148,7 +12504,7 @@ async function copyAgentManifestSkills() {
 }
 async function bootstrapSkills() {
   await copyAgentManifestSkills();
-  const usmDir = join14(SKILLS_PATH, USM_DIR_NAME);
+  const usmDir = join16(SKILLS_PATH, USM_DIR_NAME);
   if (existsSync14(usmDir)) return;
   try {
     const entries = await readdir3(SKILLS_PATH);
@@ -12171,7 +12527,7 @@ async function bootstrapSkills() {
   }
 }
 async function patchUsmForCcClaw(usmDir) {
-  const skillPath = join14(usmDir, "SKILL.md");
+  const skillPath = join16(usmDir, "SKILL.md");
   if (!existsSync14(skillPath)) return;
   try {
     let content = await readFile6(skillPath, "utf-8");
@@ -12217,8 +12573,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 = join14(dirname2(fileURLToPath2(import.meta.url)), "..", "..");
-    PKG_SKILLS = join14(PKG_ROOT, "skills");
+    PKG_ROOT = join16(dirname2(fileURLToPath2(import.meta.url)), "..", "..");
+    PKG_SKILLS = join16(PKG_ROOT, "skills");
   }
 });
 
@@ -12433,7 +12789,7 @@ __export(ai_skill_exports, {
   installAiSkill: () => installAiSkill
 });
 import { existsSync as existsSync15, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
-import { join as join15 } from "path";
+import { join as join17 } from "path";
 import { homedir as homedir5 } from "os";
 function generateAiSkill() {
   const version = VERSION;
@@ -12734,8 +13090,8 @@ function installAiSkill() {
   const failed = [];
   for (const [backend2, dirs] of Object.entries(BACKEND_SKILL_DIRS2)) {
     for (const dir of dirs) {
-      const skillDir = join15(dir, "cc-claw-cli");
-      const skillPath = join15(skillDir, "SKILL.md");
+      const skillDir = join17(dir, "cc-claw-cli");
+      const skillPath = join17(skillDir, "SKILL.md");
       try {
         mkdirSync6(skillDir, { recursive: true });
         writeFileSync5(skillPath, skill, "utf-8");
@@ -12754,10 +13110,10 @@ var init_ai_skill = __esm({
     init_paths();
     init_version();
     BACKEND_SKILL_DIRS2 = {
-      "cc-claw": [join15(homedir5(), ".cc-claw", "workspace", "skills")],
-      claude: [join15(homedir5(), ".claude", "skills")],
-      gemini: [join15(homedir5(), ".gemini", "skills")],
-      codex: [join15(homedir5(), ".agents", "skills")]
+      "cc-claw": [join17(homedir5(), ".cc-claw", "workspace", "skills")],
+      claude: [join17(homedir5(), ".claude", "skills")],
+      gemini: [join17(homedir5(), ".gemini", "skills")],
+      codex: [join17(homedir5(), ".agents", "skills")]
     };
   }
 });
@@ -12768,17 +13124,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 join16 } from "path";
+import { join as join18 } from "path";
 import dotenv from "dotenv";
 function migrateLayout() {
   const moves = [
-    [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")]
+    [join18(CC_CLAW_HOME, "cc-claw.db"), join18(DATA_PATH, "cc-claw.db")],
+    [join18(CC_CLAW_HOME, "cc-claw.db-shm"), join18(DATA_PATH, "cc-claw.db-shm")],
+    [join18(CC_CLAW_HOME, "cc-claw.db-wal"), join18(DATA_PATH, "cc-claw.db-wal")],
+    [join18(CC_CLAW_HOME, "cc-claw.log"), join18(LOGS_PATH, "cc-claw.log")],
+    [join18(CC_CLAW_HOME, "cc-claw.log.1"), join18(LOGS_PATH, "cc-claw.log.1")],
+    [join18(CC_CLAW_HOME, "cc-claw.error.log"), join18(LOGS_PATH, "cc-claw.error.log")],
+    [join18(CC_CLAW_HOME, "cc-claw.error.log.1"), join18(LOGS_PATH, "cc-claw.error.log.1")]
   ];
   for (const [from, to] of moves) {
     if (existsSync16(from) && !existsSync16(to)) {
@@ -12884,10 +13240,10 @@ async function main() {
   try {
     const { generateAiSkill: generateAiSkill2 } = await Promise.resolve().then(() => (init_ai_skill(), ai_skill_exports));
     const { writeFileSync: writeFileSync8, mkdirSync: mkdirSync11 } = await import("fs");
-    const { join: join19 } = await import("path");
-    const skillDir = join19(SKILLS_PATH, "cc-claw-cli");
+    const { join: join21 } = await import("path");
+    const skillDir = join21(SKILLS_PATH, "cc-claw-cli");
     mkdirSync11(skillDir, { recursive: true });
-    writeFileSync8(join19(skillDir, "SKILL.md"), generateAiSkill2(), "utf-8");
+    writeFileSync8(join21(skillDir, "SKILL.md"), generateAiSkill2(), "utf-8");
     log("[cc-claw] AI skill updated");
   } catch {
   }
@@ -12970,6 +13326,106 @@ var init_index = __esm({
   }
 });
 
+// src/cli/api-client.ts
+var api_client_exports = {};
+__export(api_client_exports, {
+  apiGet: () => apiGet,
+  apiPost: () => apiPost,
+  isDaemonRunning: () => isDaemonRunning
+});
+import { readFileSync as readFileSync11, existsSync as existsSync17 } from "fs";
+import { request as httpRequest } from "http";
+function getToken() {
+  if (process.env.CC_CLAW_API_TOKEN) return process.env.CC_CLAW_API_TOKEN;
+  try {
+    if (existsSync17(TOKEN_PATH)) return readFileSync11(TOKEN_PATH, "utf-8").trim();
+  } catch {
+  }
+  return null;
+}
+async function isDaemonRunning() {
+  try {
+    const res = await apiGet("/api/health");
+    return res.ok;
+  } catch {
+    return false;
+  }
+}
+async function apiGet(path) {
+  const token = getToken();
+  return new Promise((resolve, reject) => {
+    const url = new URL(path, BASE_URL);
+    const req = httpRequest(url, {
+      method: "GET",
+      headers: token ? { "Authorization": `Bearer ${token}` } : {},
+      timeout: 3e3
+    }, (res) => {
+      const chunks = [];
+      res.on("data", (c) => chunks.push(c));
+      res.on("end", () => {
+        const body = Buffer.concat(chunks).toString();
+        try {
+          const data = JSON.parse(body);
+          resolve({ ok: res.statusCode === 200, status: res.statusCode ?? 0, data });
+        } catch {
+          resolve({ ok: false, status: res.statusCode ?? 0, data: body });
+        }
+      });
+    });
+    req.on("error", reject);
+    req.on("timeout", () => {
+      req.destroy();
+      reject(new Error("Request timed out"));
+    });
+    req.end();
+  });
+}
+async function apiPost(path, body) {
+  const token = getToken();
+  const payload = JSON.stringify(body);
+  return new Promise((resolve, reject) => {
+    const url = new URL(path, BASE_URL);
+    const req = httpRequest(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Content-Length": Buffer.byteLength(payload).toString(),
+        ...token ? { "Authorization": `Bearer ${token}` } : {}
+      },
+      timeout: 3e4
+    }, (res) => {
+      const chunks = [];
+      res.on("data", (c) => chunks.push(c));
+      res.on("end", () => {
+        const responseBody = Buffer.concat(chunks).toString();
+        try {
+          const data = JSON.parse(responseBody);
+          resolve({ ok: res.statusCode === 200, status: res.statusCode ?? 0, data });
+        } catch {
+          resolve({ ok: false, status: res.statusCode ?? 0, data: responseBody });
+        }
+      });
+    });
+    req.on("error", reject);
+    req.on("timeout", () => {
+      req.destroy();
+      reject(new Error("Request timed out"));
+    });
+    req.write(payload);
+    req.end();
+  });
+}
+var TOKEN_PATH, DEFAULT_PORT, BASE_URL;
+var init_api_client = __esm({
+  "src/cli/api-client.ts"() {
+    "use strict";
+    init_paths();
+    TOKEN_PATH = `${DATA_PATH}/api-token`;
+    DEFAULT_PORT = parseInt(process.env.DASHBOARD_PORT ?? "3141", 10);
+    BASE_URL = `http://127.0.0.1:${DEFAULT_PORT}`;
+  }
+});
+
 // src/service.ts
 var service_exports = {};
 __export(service_exports, {
@@ -12977,10 +13433,10 @@ __export(service_exports, {
   serviceStatus: () => serviceStatus,
   uninstallService: () => uninstallService
 });
-import { existsSync as existsSync17, mkdirSync as mkdirSync8, writeFileSync as writeFileSync6, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync18, mkdirSync as mkdirSync8, writeFileSync as writeFileSync6, unlinkSync as unlinkSync3 } from "fs";
 import { execFileSync as execFileSync2, execSync as execSync5 } from "child_process";
 import { homedir as homedir6, platform } from "os";
-import { join as join17, dirname as dirname3 } from "path";
+import { join as join19, dirname as dirname3 } from "path";
 function resolveExecutable2(name) {
   try {
     return execFileSync2("which", [name], { encoding: "utf-8" }).trim();
@@ -12993,14 +13449,14 @@ function getPathDirs() {
   const home = homedir6();
   const dirs = /* @__PURE__ */ new Set([
     nodeBin,
-    join17(home, ".local", "bin"),
+    join19(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(join17(prefix, "bin"));
+    if (prefix) dirs.add(join19(prefix, "bin"));
   } catch {
   }
   return [...dirs].join(":");
@@ -13055,9 +13511,9 @@ function generatePlist() {
 }
 function installMacOS() {
   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)) {
+  if (!existsSync18(agentsDir)) mkdirSync8(agentsDir, { recursive: true });
+  if (!existsSync18(LOGS_PATH)) mkdirSync8(LOGS_PATH, { recursive: true });
+  if (existsSync18(PLIST_PATH)) {
     try {
       execFileSync2("launchctl", ["unload", PLIST_PATH]);
     } catch {
@@ -13069,7 +13525,7 @@ function installMacOS() {
   console.log("  Service loaded and starting.");
 }
 function uninstallMacOS() {
-  if (!existsSync17(PLIST_PATH)) {
+  if (!existsSync18(PLIST_PATH)) {
     console.log("  No service found to uninstall.");
     return;
   }
@@ -13077,9 +13533,27 @@ function uninstallMacOS() {
     execFileSync2("launchctl", ["unload", PLIST_PATH]);
   } catch {
   }
-  unlinkSync2(PLIST_PATH);
+  unlinkSync3(PLIST_PATH);
   console.log("  Service uninstalled.");
 }
+function formatUptime(seconds) {
+  seconds = Math.floor(seconds);
+  if (seconds < 60) return `${seconds}s`;
+  if (seconds < 3600) return `${Math.floor(seconds / 60)}m`;
+  if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ${Math.floor(seconds % 3600 / 60)}m`;
+  return `${Math.floor(seconds / 86400)}d ${Math.floor(seconds % 86400 / 3600)}h`;
+}
+async function getUptimeFromDaemon() {
+  try {
+    const { isDaemonRunning: isDaemonRunning2, apiGet: apiGet2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+    if (!await isDaemonRunning2()) return null;
+    const res = await apiGet2("/api/health");
+    const sec = res.data?.uptime;
+    return sec ? formatUptime(sec) : null;
+  } catch {
+    return null;
+  }
+}
 function statusMacOS() {
   try {
     const out = execSync5("launchctl list | grep cc-claw", { shell: "/bin/sh", encoding: "utf-8" }).trim();
@@ -13088,7 +13562,12 @@ function statusMacOS() {
       const pid = parts[0];
       const exitCode = parts[1];
       if (pid !== "-") {
-        console.log(`  Running (PID ${pid})`);
+        getUptimeFromDaemon().then((uptime) => {
+          const uptimeStr = uptime ? `, uptime ${uptime}` : "";
+          console.log(`  Running (PID ${pid}${uptimeStr})`);
+        }).catch(() => {
+          console.log(`  Running (PID ${pid})`);
+        });
       } else {
         console.log(`  Not running (last exit code: ${exitCode})`);
       }
@@ -13120,8 +13599,8 @@ WantedBy=default.target
 `;
 }
 function installLinux() {
-  if (!existsSync17(SYSTEMD_DIR)) mkdirSync8(SYSTEMD_DIR, { recursive: true });
-  if (!existsSync17(LOGS_PATH)) mkdirSync8(LOGS_PATH, { recursive: true });
+  if (!existsSync18(SYSTEMD_DIR)) mkdirSync8(SYSTEMD_DIR, { recursive: true });
+  if (!existsSync18(LOGS_PATH)) mkdirSync8(LOGS_PATH, { recursive: true });
   writeFileSync6(UNIT_PATH, generateUnit());
   console.log(`  Installed: ${UNIT_PATH}`);
   execFileSync2("systemctl", ["--user", "daemon-reload"]);
@@ -13130,7 +13609,7 @@ function installLinux() {
   console.log("  Service enabled and started.");
 }
 function uninstallLinux() {
-  if (!existsSync17(UNIT_PATH)) {
+  if (!existsSync18(UNIT_PATH)) {
     console.log("  No service found to uninstall.");
     return;
   }
@@ -13142,7 +13621,7 @@ function uninstallLinux() {
     execFileSync2("systemctl", ["--user", "disable", "cc-claw"]);
   } catch {
   }
-  unlinkSync2(UNIT_PATH);
+  unlinkSync3(UNIT_PATH);
   execFileSync2("systemctl", ["--user", "daemon-reload"]);
   console.log("  Service uninstalled.");
 }
@@ -13155,7 +13634,7 @@ function statusLinux() {
   }
 }
 function installService() {
-  if (!existsSync17(join17(CC_CLAW_HOME, ".env"))) {
+  if (!existsSync18(join19(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;
@@ -13184,9 +13663,9 @@ var init_service = __esm({
     "use strict";
     init_paths();
     PLIST_LABEL = "com.cc-claw";
-    PLIST_PATH = join17(homedir6(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
-    SYSTEMD_DIR = join17(homedir6(), ".config", "systemd", "user");
-    UNIT_PATH = join17(SYSTEMD_DIR, "cc-claw.service");
+    PLIST_PATH = join19(homedir6(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
+    SYSTEMD_DIR = join19(homedir6(), ".config", "systemd", "user");
+    UNIT_PATH = join19(SYSTEMD_DIR, "cc-claw.service");
   }
 });
 
@@ -13353,13 +13832,13 @@ var init_daemon = __esm({
 });
 
 // src/cli/resolve-chat.ts
-import { readFileSync as readFileSync12 } from "fs";
+import { readFileSync as readFileSync13 } from "fs";
 function resolveChatId(globalOpts) {
   const explicit = globalOpts.chat;
   if (explicit) return explicit;
   if (_cachedDefault) return _cachedDefault;
   try {
-    const content = readFileSync12(ENV_PATH, "utf-8");
+    const content = readFileSync13(ENV_PATH, "utf-8");
     const match = content.match(/^ALLOWED_CHAT_ID=(.+)$/m);
     if (match) {
       _cachedDefault = match[1].split(",")[0].trim();
@@ -13378,106 +13857,6 @@ var init_resolve_chat = __esm({
   }
 });
 
-// src/cli/api-client.ts
-var api_client_exports = {};
-__export(api_client_exports, {
-  apiGet: () => apiGet,
-  apiPost: () => apiPost,
-  isDaemonRunning: () => isDaemonRunning
-});
-import { readFileSync as readFileSync13, existsSync as existsSync18 } from "fs";
-import { request as httpRequest } from "http";
-function getToken() {
-  if (process.env.CC_CLAW_API_TOKEN) return process.env.CC_CLAW_API_TOKEN;
-  try {
-    if (existsSync18(TOKEN_PATH)) return readFileSync13(TOKEN_PATH, "utf-8").trim();
-  } catch {
-  }
-  return null;
-}
-async function isDaemonRunning() {
-  try {
-    const res = await apiGet("/api/health");
-    return res.ok;
-  } catch {
-    return false;
-  }
-}
-async function apiGet(path) {
-  const token = getToken();
-  return new Promise((resolve, reject) => {
-    const url = new URL(path, BASE_URL);
-    const req = httpRequest(url, {
-      method: "GET",
-      headers: token ? { "Authorization": `Bearer ${token}` } : {},
-      timeout: 3e3
-    }, (res) => {
-      const chunks = [];
-      res.on("data", (c) => chunks.push(c));
-      res.on("end", () => {
-        const body = Buffer.concat(chunks).toString();
-        try {
-          const data = JSON.parse(body);
-          resolve({ ok: res.statusCode === 200, status: res.statusCode ?? 0, data });
-        } catch {
-          resolve({ ok: false, status: res.statusCode ?? 0, data: body });
-        }
-      });
-    });
-    req.on("error", reject);
-    req.on("timeout", () => {
-      req.destroy();
-      reject(new Error("Request timed out"));
-    });
-    req.end();
-  });
-}
-async function apiPost(path, body) {
-  const token = getToken();
-  const payload = JSON.stringify(body);
-  return new Promise((resolve, reject) => {
-    const url = new URL(path, BASE_URL);
-    const req = httpRequest(url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Content-Length": Buffer.byteLength(payload).toString(),
-        ...token ? { "Authorization": `Bearer ${token}` } : {}
-      },
-      timeout: 3e4
-    }, (res) => {
-      const chunks = [];
-      res.on("data", (c) => chunks.push(c));
-      res.on("end", () => {
-        const responseBody = Buffer.concat(chunks).toString();
-        try {
-          const data = JSON.parse(responseBody);
-          resolve({ ok: res.statusCode === 200, status: res.statusCode ?? 0, data });
-        } catch {
-          resolve({ ok: false, status: res.statusCode ?? 0, data: responseBody });
-        }
-      });
-    });
-    req.on("error", reject);
-    req.on("timeout", () => {
-      req.destroy();
-      reject(new Error("Request timed out"));
-    });
-    req.write(payload);
-    req.end();
-  });
-}
-var TOKEN_PATH, DEFAULT_PORT, BASE_URL;
-var init_api_client = __esm({
-  "src/cli/api-client.ts"() {
-    "use strict";
-    init_paths();
-    TOKEN_PATH = `${DATA_PATH}/api-token`;
-    DEFAULT_PORT = parseInt(process.env.DASHBOARD_PORT ?? "3141", 10);
-    BASE_URL = `http://127.0.0.1:${DEFAULT_PORT}`;
-  }
-});
-
 // src/cli/commands/status.ts
 var status_exports = {};
 __export(status_exports, {
@@ -13575,7 +13954,7 @@ async function statusCommand(globalOpts, localOpts) {
         kvLine("Voice", s.voice ? success("on") : muted("off"))
       ];
       if (localOpts.deep) {
-        lines.push(kvLine("Daemon", s.daemon.running ? success(`running${s.daemon.uptime_seconds ? ` (uptime ${formatUptime(s.daemon.uptime_seconds)})` : ""}`) : error2("offline")));
+        lines.push(kvLine("Daemon", s.daemon.running ? success(`running${s.daemon.uptime_seconds ? ` (uptime ${formatUptime2(s.daemon.uptime_seconds)})` : ""}`) : error2("offline")));
       }
       lines.push(
         "",
@@ -13593,7 +13972,7 @@ async function statusCommand(globalOpts, localOpts) {
     process.exit(1);
   }
 }
-function formatUptime(seconds) {
+function formatUptime2(seconds) {
   if (seconds < 60) return `${seconds}s`;
   if (seconds < 3600) return `${Math.floor(seconds / 60)}m`;
   if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ${Math.floor(seconds % 3600 / 60)}m`;
@@ -13665,10 +14044,12 @@ async function doctorCommand(globalOpts, localOpts) {
     const { isDaemonRunning: isDaemonRunning2, apiGet: apiGet2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
     const running = await isDaemonRunning2();
     if (running) {
-      checks.push({ name: "Daemon", status: "ok", message: "running" });
       try {
         const health = await apiGet2("/api/health");
         const daemonVersion = health.data?.version;
+        const uptimeSec = health.data?.uptime;
+        const uptimeStr = uptimeSec ? ` (uptime ${formatUptime3(uptimeSec)})` : "";
+        checks.push({ name: "Daemon", status: "ok", message: `running${uptimeStr}` });
         if (daemonVersion && daemonVersion !== VERSION) {
           checks.push({
             name: "Version",
@@ -13680,6 +14061,7 @@ async function doctorCommand(globalOpts, localOpts) {
           checks.push({ name: "Version", status: "ok", message: `v${VERSION}` });
         }
       } catch {
+        checks.push({ name: "Daemon", status: "ok", message: "running" });
       }
     } else {
       checks.push({ name: "Daemon", status: "warning", message: "not running", fix: "cc-claw service start" });
@@ -13818,6 +14200,13 @@ async function doctorCommand(globalOpts, localOpts) {
   });
   process.exit(errors > 0 ? 1 : warnings > 0 ? 2 : 0);
 }
+function formatUptime3(seconds) {
+  seconds = Math.floor(seconds);
+  if (seconds < 60) return `${seconds}s`;
+  if (seconds < 3600) return `${Math.floor(seconds / 60)}m`;
+  if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ${Math.floor(seconds % 3600 / 60)}m`;
+  return `${Math.floor(seconds / 86400)}d ${Math.floor(seconds % 86400 / 3600)}h`;
+}
 var init_doctor = __esm({
   "src/cli/commands/doctor.ts"() {
     "use strict";
@@ -14588,7 +14977,7 @@ __export(db_exports, {
   dbPath: () => dbPath,
   dbStats: () => dbStats
 });
-import { existsSync as existsSync27, statSync as statSync5, copyFileSync, mkdirSync as mkdirSync9 } from "fs";
+import { existsSync as existsSync27, statSync as statSync5, copyFileSync as copyFileSync2, mkdirSync as mkdirSync9 } from "fs";
 import { dirname as dirname4 } from "path";
 async function dbStats(globalOpts) {
   if (!existsSync27(DB_PATH)) {
@@ -14640,9 +15029,9 @@ async function dbBackup(globalOpts, destPath) {
   const dest = destPath ?? `${DB_PATH}.backup-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
   try {
     mkdirSync9(dirname4(dest), { recursive: true });
-    copyFileSync(DB_PATH, dest);
+    copyFileSync2(DB_PATH, dest);
     const walPath = DB_PATH + "-wal";
-    if (existsSync27(walPath)) copyFileSync(walPath, dest + "-wal");
+    if (existsSync27(walPath)) copyFileSync2(walPath, dest + "-wal");
     output({ path: dest, sizeBytes: statSync5(dest).size }, (d) => {
       const b = d;
       return `
@@ -16037,10 +16426,10 @@ var init_completion = __esm({
 
 // src/setup.ts
 var setup_exports = {};
-import { existsSync as existsSync38, writeFileSync as writeFileSync7, 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 copyFileSync3, mkdirSync as mkdirSync10, statSync as statSync6 } from "fs";
 import { execFileSync as execFileSync4 } from "child_process";
 import { createInterface as createInterface5 } from "readline";
-import { join as join18 } from "path";
+import { join as join20 } from "path";
 function divider2() {
   console.log(dim("\u2500".repeat(55)));
 }
@@ -16127,13 +16516,13 @@ async function setup() {
       if (match) env[match[1].trim()] = match[2].trim();
     }
   }
-  const cwdDb = join18(process.cwd(), "cc-claw.db");
+  const cwdDb = join20(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)`));
     const migrate = await confirm("Copy database to ~/.cc-claw/? (preserves memories & history)", true);
     if (migrate) {
-      copyFileSync2(cwdDb, DB_PATH);
+      copyFileSync3(cwdDb, DB_PATH);
       console.log(green(`  Database copied to ${DB_PATH}`));
     }
     console.log("");