thepopebot 1.2.76-beta.6 → 1.2.76-beta.8

package/bin/cli.js

@@ -329,13 +329,6 @@ async function init() {
     console.log('  Created .kimi/skills → ../skills/active');
   }
 
-  // Create .agents/skills → ../skills/active symlink
-  const agentsSkillsLink = path.join(cwd, '.agents', 'skills');
-  if (!fs.existsSync(agentsSkillsLink)) {
-    fs.mkdirSync(path.dirname(agentsSkillsLink), { recursive: true });
-    createDirLink('../skills/active', agentsSkillsLink);
-    console.log('  Created .agents/skills → ../skills/active');
-  }
 
   // Report backed-up files
   if (backedUp.length > 0) {

package/lib/ai/index.js

@@ -182,10 +182,10 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
     }
 
     try {
-      await ensureWorkspaceRepo({ workspaceDir: repoDir, repo, branch, featureBranch });
+      const setupOutput = await ensureWorkspaceRepo({ workspaceDir: repoDir, repo, branch, featureBranch });
       ensureSkills(repoDir, isCodeMode ? 'code' : 'agent');
       if (needsSetup) {
-        const result = `Workspace ready on ${featureBranch || branch}`;
+        const result = setupOutput || `Workspace ready on ${featureBranch || branch}`;
         yield { type: 'tool-result', toolCallId: setupToolCallId, result };
         persistMessage(threadId, 'assistant', JSON.stringify({
           type: 'tool-invocation',
@@ -221,6 +221,8 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
         sessionId,
         permissionMode: codeModeType,
         attachments,
+        workspaceId,
+        chatMode: isCodeMode ? 'code' : 'agent',
       })) {
         // Write session ID on first meta chunk
         if (chunk.type === 'meta' && chunk.sessionId) {

package/lib/ai/sdk-adapters/claude-code.js

@@ -3,6 +3,8 @@ import fs from 'fs';
 import { query } from '@anthropic-ai/claude-agent-sdk';
 import { getConfig } from '../../config.js';
 import { buildAgentAuthEnv } from '../../tools/docker.js';
+import { createAgentJobApiKey } from '../../db/api-keys.js';
+import { getAllAgentJobSecrets } from '../../db/config.js';
 
 /**
  * Claude Agent SDK adapter. Wraps the SDK's query() and yields
@@ -62,7 +64,7 @@ function ensureSessionSymlink(wsBaseDir, workspaceDir) {
   } catch {}
 }
 
-export async function* claudeCodeStream({ prompt, workspaceDir, systemPrompt, sessionId, permissionMode, attachments }) {
+export async function* claudeCodeStream({ prompt, workspaceDir, systemPrompt, sessionId, permissionMode, attachments, workspaceId, chatMode }) {
   // Point HOME at the workspace volume so the SDK stores session data on the
   // shared volume (not the EH container's ephemeral filesystem).
   const wsBaseDir = path.dirname(workspaceDir);
@@ -94,6 +96,23 @@ export async function* claudeCodeStream({ prompt, workspaceDir, systemPrompt, se
     // Fall through — env may already have the right vars from process.env
   }
 
+  // Inject agent job secrets when in agent chat mode
+  if (chatMode === 'agent') {
+    const shortId = (workspaceId || '').replace(/-/g, '').slice(0, 8);
+    const { key: agentJobToken } = createAgentJobApiKey(`claude-code-sdk-${shortId}`);
+    env.AGENT_JOB_TOKEN = agentJobToken;
+    const appUrl = getConfig('APP_URL');
+    if (appUrl) env.APP_URL = appUrl;
+
+    // Inject plain secrets as env vars (oauth types are null — agent fetches via skill)
+    const jobSecrets = getAllAgentJobSecrets();
+    for (const { key, value } of jobSecrets) {
+      if (value !== null && !env[key]) {
+        env[key] = value;
+      }
+    }
+  }
+
   const options = {
     cwd: workspaceDir,
     env,
@@ -134,6 +153,7 @@ export async function* claudeCodeStream({ prompt, workspaceDir, systemPrompt, se
 
   // Track tool call state for mapping stream events
   const activeToolCalls = new Map(); // index → { id, name, argsJson }
+  const toolNamesById = new Map(); // toolCallId → toolName (persists for tool-result lookup)
   const activeThinkingBlocks = new Set(); // indices of active thinking blocks
 
   try {
@@ -157,6 +177,7 @@ export async function* claudeCodeStream({ prompt, workspaceDir, systemPrompt, se
           const block = event.content_block;
           if (block.type === 'tool_use') {
             activeToolCalls.set(event.index, { id: block.id, name: block.name, argsJson: '' });
+            toolNamesById.set(block.id, block.name);
             yield { type: 'tool-call', toolCallId: block.id, toolName: block.name, args: {} };
           } else if (block.type === 'thinking') {
             activeThinkingBlocks.add(event.index);
@@ -208,14 +229,23 @@ export async function* claudeCodeStream({ prompt, workspaceDir, systemPrompt, se
               : Array.isArray(block.content)
                 ? block.content.map(b => b.type === 'text' ? b.text : JSON.stringify(b)).join('\n')
                 : JSON.stringify(block.content);
-            yield { type: 'tool-result', toolCallId: block.tool_use_id, result: content };
+            yield { type: 'tool-result', toolCallId: block.tool_use_id, toolName: toolNamesById.get(block.tool_use_id), result: content };
           }
         }
         continue;
       }
 
       // ── assistant messages — redundant with streaming, skip ──
-      if (message.type === 'assistant') continue;
+      // But extract tool names so resumed tool-results can carry them.
+      if (message.type === 'assistant') {
+        const blocks = message.message?.content || [];
+        for (const block of blocks) {
+          if (block.type === 'tool_use' && block.id && block.name) {
+            toolNamesById.set(block.id, block.name);
+          }
+        }
+        continue;
+      }
 
       // ── result ──
       if (message.type === 'result') {

package/lib/ai/workspace-setup.js

@@ -32,20 +32,24 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
   if (ghToken) env.GH_TOKEN = ghToken;
 
   const execOpts = { cwd: workspaceDir, env };
+  const log = [];
 
   // 1. Create workspace directory
   mkdirSync(workspaceDir, { recursive: true });
 
   // 2. Configure git to use GH_TOKEN for GitHub HTTPS URLs (mirrors setup-git.sh)
   if (ghToken) {
-    await run('gh', ['auth', 'setup-git'], execOpts);
+    const out = await run('gh', ['auth', 'setup-git'], execOpts);
+    if (out) log.push(out);
   }
 
   // 3. Clone if not already a git repo
   const hasGit = existsSync(path.join(workspaceDir, '.git'));
   if (!hasGit) {
     if (!repo) throw new Error('ensureWorkspaceRepo: repo is required for initial clone');
-    await run('git', ['clone', '--branch', branch || 'main', `https://github.com/${repo}`, '.'], execOpts);
+    const out = await run('git', ['clone', '--branch', branch || 'main', `https://github.com/${repo}`, '.'], execOpts);
+    log.push(`Cloned ${repo} (branch: ${branch || 'main'})`);
+    if (out) log.push(out);
   }
 
   // 3. Git identity (only if not already configured)
@@ -61,6 +65,7 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
         const email = user.email || `${user.id}+${user.login}@users.noreply.github.com`;
         await run('git', ['config', 'user.name', name], execOpts);
         await run('git', ['config', 'user.email', email], execOpts);
+        log.push(`Git identity: ${name} <${email}>`);
       } catch (err) {
         console.error('[workspace-setup] Failed to set git identity:', err.message);
       }
@@ -68,7 +73,7 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
   }
 
   // 4. Feature branch checkout
-  if (!featureBranch) return;
+  if (!featureBranch) return log.join('\n');
 
   // Already on the right branch locally?
   try {
@@ -77,8 +82,11 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
     const current = await run('git', ['rev-parse', '--abbrev-ref', 'HEAD'], execOpts);
     if (current !== featureBranch) {
       await run('git', ['checkout', featureBranch], execOpts);
+      log.push(`Checked out ${featureBranch}`);
+    } else {
+      log.push(`Already on ${featureBranch}`);
     }
-    return;
+    return log.join('\n');
   } catch {
     // Branch doesn't exist locally — check remote
   }
@@ -88,15 +96,20 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
     if (remoteCheck) {
       // Remote branch exists — checkout tracking it
       await run('git', ['checkout', '-B', featureBranch, `origin/${featureBranch}`], execOpts);
+      log.push(`Checked out ${featureBranch} (tracking origin)`);
     } else {
       // Create new branch and push
       await run('git', ['checkout', '-b', featureBranch], execOpts);
-      await run('git', ['push', '-u', 'origin', featureBranch], execOpts);
+      const pushOut = await run('git', ['push', '-u', 'origin', featureBranch], execOpts);
+      log.push(`Created and pushed ${featureBranch}`);
+      if (pushOut) log.push(pushOut);
     }
   } catch (err) {
     console.error('[workspace-setup] Feature branch error:', err.message);
     throw err;
   }
+
+  return log.join('\n');
 }
 
 /**

package/lib/chat/components/chat-input.js

@@ -146,6 +146,7 @@ function ChatInput({ input, setInput, onSubmit, status, stop, files, setFiles, d
     if (e) e.preventDefault();
     if (disabled || !input.trim() && !partialText.trim() && files.length === 0 || isStreaming) return;
     if (canSendOverride !== void 0 && !canSendOverride) return;
+    if (isRecording) stopRecording();
     if (partialText) {
       const needsSpace = input && !input.endsWith(" ");
       setInput(input + (needsSpace ? " " : "") + partialText);
@@ -339,12 +340,12 @@ function ChatInput({ input, setInput, onSubmit, status, stop, files, setFiles, d
                   onClick: () => codeModeSettings.onInteractiveToggle(),
                   onContextMenu: (e) => {
                     e.preventDefault();
-                    if (!codeModeSettings.togglingMode && codeModeSettings.availableAgents?.length > 1) {
+                    if (!codeModeSettings.togglingMode && codeModeSettings.availableAgents?.length > 1 && codeModeSettings.hasMessages) {
                       setAgentPickerOpen((prev) => !prev);
                     }
                   },
                   disabled: codeModeSettings.togglingMode || codeModeSettings.isInteractiveActive,
-                  title: codeModeSettings.availableAgents?.length > 1 ? "Left-click to launch \xB7 Right-click to pick agent" : void 0,
+                  title: codeModeSettings.availableAgents?.length > 1 && codeModeSettings.hasMessages ? "Left-click to launch \xB7 Right-click to pick agent" : void 0,
                   className: "inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-xs text-muted-foreground hover:text-foreground transition-colors",
                   children: [
                     codeModeSettings.togglingMode && /* @__PURE__ */ jsxs("svg", { className: "animate-spin h-3 w-3", xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", children: [

package/lib/chat/components/chat-input.jsx

@@ -140,6 +140,7 @@ export function ChatInput({ input, setInput, onSubmit, status, stop, files, setF
     if (e) e.preventDefault();
     if (disabled || (!input.trim() && !partialText.trim() && files.length === 0) || isStreaming) return;
     if (canSendOverride !== undefined && !canSendOverride) return;
+    if (isRecording) stopRecording();
     if (partialText) {
       const needsSpace = input && !input.endsWith(' ');
       setInput(input + (needsSpace ? ' ' : '') + partialText);
@@ -352,12 +353,12 @@ export function ChatInput({ input, setInput, onSubmit, status, stop, files, setF
                     onClick={() => codeModeSettings.onInteractiveToggle()}
                     onContextMenu={(e) => {
                       e.preventDefault();
-                      if (!codeModeSettings.togglingMode && codeModeSettings.availableAgents?.length > 1) {
+                      if (!codeModeSettings.togglingMode && codeModeSettings.availableAgents?.length > 1 && codeModeSettings.hasMessages) {
                         setAgentPickerOpen(prev => !prev);
                       }
                     }}
                     disabled={codeModeSettings.togglingMode || codeModeSettings.isInteractiveActive}
-                    title={codeModeSettings.availableAgents?.length > 1 ? 'Left-click to launch · Right-click to pick agent' : undefined}
+                    title={codeModeSettings.availableAgents?.length > 1 && codeModeSettings.hasMessages ? 'Left-click to launch · Right-click to pick agent' : undefined}
                     className="inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
                   >
                     {codeModeSettings.togglingMode && (

package/lib/chat/components/chat.js

@@ -204,7 +204,8 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
     isInteractiveActive,
     onInteractiveToggle: handleInteractiveToggle,
     togglingMode,
-    availableAgents
+    availableAgents,
+    hasMessages: messages.length > 0
   };
   const handleBranchChange = useCallback((newBranch) => {
     setBranch(newBranch);

package/lib/chat/components/chat.jsx

@@ -255,6 +255,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
     onInteractiveToggle: handleInteractiveToggle,
     togglingMode,
     availableAgents,
+    hasMessages: messages.length > 0,
   };
 
   const handleBranchChange = useCallback((newBranch) => {

package/lib/chat/components/code-mode-toggle.js

@@ -200,7 +200,7 @@ function WorkspaceBar({
       repoName && /* @__PURE__ */ jsx("span", { className: "shrink-0 cursor-default hidden md:inline", title: repo, children: repoName }),
       branch && /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { className: "shrink-0 text-muted-foreground/30 hidden md:inline", children: "/" }),
-        /* @__PURE__ */ jsx("div", { className: "shrink-0 max-w-[120px]", children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx("div", { className: "min-w-0 max-w-[120px] md:max-w-[160px]", children: /* @__PURE__ */ jsx(
           Combobox,
           {
             options: branches.map((b) => ({ value: b.name, label: b.name })),
@@ -327,14 +327,6 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
   }, []);
   const handleRun = useCallback(async () => {
     if (commandRunning) return;
-    const fresh = await onDiffStatsRefresh?.();
-    const stats = fresh || diffStats;
-    if (!(stats?.insertions || 0) && !(stats?.deletions || 0)) {
-      setDialogOpen(true);
-      setCommandLogs([{ stream: "stderr", raw: "You have no changes.", parsed: [{ type: "text", text: "You have no changes." }] }]);
-      setCommandExitCode(1);
-      return;
-    }
     setCommandRunning(true);
     setDialogOpen(true);
     setCommandLogs([]);

package/lib/chat/components/code-mode-toggle.jsx

@@ -225,7 +225,7 @@ export function WorkspaceBar({
         {branch && (
           <>
             <span className="shrink-0 text-muted-foreground/30 hidden md:inline">/</span>
-            <div className="shrink-0 max-w-[120px]">
+            <div className="min-w-0 max-w-[120px] md:max-w-[160px]">
               <Combobox
                 options={branches.map((b) => ({ value: b.name, label: b.name }))}
                 value={branch}
@@ -370,16 +370,6 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
   const handleRun = useCallback(async () => {
     if (commandRunning) return;
 
-    // Refresh diff stats and check for changes before running
-    const fresh = await onDiffStatsRefresh?.();
-    const stats = fresh || diffStats;
-    if (!(stats?.insertions || 0) && !(stats?.deletions || 0)) {
-      setDialogOpen(true);
-      setCommandLogs([{ stream: 'stderr', raw: 'You have no changes.', parsed: [{ type: 'text', text: 'You have no changes.' }] }]);
-      setCommandExitCode(1);
-      return;
-    }
-
     setCommandRunning(true);
     setDialogOpen(true);
     setCommandLogs([]);

package/lib/chat/components/message.js

@@ -83,32 +83,6 @@ function formatContent(content) {
   }
   return JSON.stringify(content, null, 2);
 }
-function ThinkingBlock({ part }) {
-  const [expanded, setExpanded] = useState(false);
-  const isStreaming = part.state === "input-streaming" || part.state === "input-available";
-  const content = typeof part.input === "string" ? part.input : "";
-  return /* @__PURE__ */ jsxs("div", { className: "my-1", children: [
-    /* @__PURE__ */ jsxs(
-      "button",
-      {
-        onClick: () => setExpanded(!expanded),
-        className: "flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors py-0.5",
-        children: [
-          /* @__PURE__ */ jsx(
-            ChevronDownIcon,
-            {
-              size: 12,
-              className: cn("transition-transform shrink-0", !expanded && "-rotate-90")
-            }
-          ),
-          isStreaming && /* @__PURE__ */ jsx(SpinnerIcon, { size: 12, className: "shrink-0" }),
-          isStreaming ? /* @__PURE__ */ jsx("span", { className: "thinking-shimmer", children: "Thinking..." }) : /* @__PURE__ */ jsx("span", { children: "Thoughts" })
-        ]
-      }
-    ),
-    expanded && /* @__PURE__ */ jsx("div", { className: "mt-1.5 ml-4 pl-3 border-l border-border/50 text-xs text-muted-foreground/80 whitespace-pre-wrap leading-relaxed max-h-64 overflow-y-auto", children: content || /* @__PURE__ */ jsx("span", { className: "italic opacity-50", children: "..." }) })
-  ] });
-}
 function ToolCall({ part, className }) {
   const [expanded, setExpanded] = useState(false);
   const toolName = part.toolName || (part.type?.startsWith("tool-") ? part.type.slice(5) : "tool");
@@ -260,7 +234,7 @@ function PreviewMessage({ message, isLoading, onRetry, onEdit }) {
       return;
     }
     setShowWorking(false);
-    const timer = setTimeout(() => setShowWorking(true), 250);
+    const timer = setTimeout(() => setShowWorking(true), 500);
     return () => clearTimeout(timer);
   }, [isLoading, partsLength, textLength, hasRunningTool]);
   const fileParts = message.parts?.filter((p) => p.type === "file") || [];
@@ -399,9 +373,6 @@ function PreviewMessage({ message, isLoading, onRetry, onEdit }) {
                   ] }, i);
                 }
                 if (part.type?.startsWith("tool-")) {
-                  if (part.toolName === "__thinking__") {
-                    return /* @__PURE__ */ jsx(ThinkingBlock, { part }, part.toolCallId || i);
-                  }
                   const prevPart = message.parts[i - 1];
                   const afterText = prevPart?.type === "text";
                   return /* @__PURE__ */ jsx(ToolCall, { part, className: afterText ? "mt-3" : void 0 }, part.toolCallId || i);

package/lib/chat/components/message.jsx

@@ -77,37 +77,6 @@ function formatContent(content) {
   return JSON.stringify(content, null, 2);
 }
 
-function ThinkingBlock({ part }) {
-  const [expanded, setExpanded] = useState(false);
-  const isStreaming = part.state === 'input-streaming' || part.state === 'input-available';
-  const content = typeof part.input === 'string' ? part.input : '';
-
-  return (
-    <div className="my-1">
-      <button
-        onClick={() => setExpanded(!expanded)}
-        className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors py-0.5"
-      >
-        <ChevronDownIcon
-          size={12}
-          className={cn('transition-transform shrink-0', !expanded && '-rotate-90')}
-        />
-        {isStreaming && <SpinnerIcon size={12} className="shrink-0" />}
-        {isStreaming ? (
-          <span className="thinking-shimmer">Thinking...</span>
-        ) : (
-          <span>Thoughts</span>
-        )}
-      </button>
-      {expanded && (
-        <div className="mt-1.5 ml-4 pl-3 border-l border-border/50 text-xs text-muted-foreground/80 whitespace-pre-wrap leading-relaxed max-h-64 overflow-y-auto">
-          {content || <span className="italic opacity-50">...</span>}
-        </div>
-      )}
-    </div>
-  );
-}
-
 function ToolCall({ part, className }) {
   const [expanded, setExpanded] = useState(false);
 
@@ -310,7 +279,7 @@ export function PreviewMessage({ message, isLoading, onRetry, onEdit }) {
       return;
     }
     setShowWorking(false);
-    const timer = setTimeout(() => setShowWorking(true), 250);
+    const timer = setTimeout(() => setShowWorking(true), 500);
     return () => clearTimeout(timer);
   }, [isLoading, partsLength, textLength, hasRunningTool]);
 
@@ -482,9 +451,6 @@ export function PreviewMessage({ message, isLoading, onRetry, onEdit }) {
                           );
                         }
                         if (part.type?.startsWith('tool-')) {
-                          if (part.toolName === '__thinking__') {
-                            return <ThinkingBlock key={part.toolCallId || i} part={part} />;
-                          }
                           const prevPart = message.parts[i - 1];
                           const afterText = prevPart?.type === 'text';
                           return <ToolCall key={part.toolCallId || i} part={part} className={afterText ? 'mt-3' : undefined} />;

package/lib/code/terminal-view.js

@@ -812,14 +812,6 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
   }, [dropupOpen]);
   const handleRun = useCallback(async () => {
     if (commandRunning) return;
-    const fresh = await onDiffStatsRefresh?.();
-    const stats = fresh || diffStats;
-    if (!(stats?.insertions || 0) && !(stats?.deletions || 0)) {
-      setDialogOpen(true);
-      setCommandOutput("You have no changes.");
-      setCommandExitCode(1);
-      return;
-    }
     setCommandRunning(true);
     setDialogOpen(true);
     setCommandOutput("");

package/lib/code/terminal-view.jsx

@@ -872,15 +872,6 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
   const handleRun = useCallback(async () => {
     if (commandRunning) return;
 
-    const fresh = await onDiffStatsRefresh?.();
-    const stats = fresh || diffStats;
-    if (!(stats?.insertions || 0) && !(stats?.deletions || 0)) {
-      setDialogOpen(true);
-      setCommandOutput('You have no changes.');
-      setCommandExitCode(1);
-      return;
-    }
-
     setCommandRunning(true);
     setDialogOpen(true);
     setCommandOutput('');

package/lib/maintenance.js

@@ -4,44 +4,54 @@ import { getDb } from './db/index.js';
 import { settings } from './db/schema.js';
 
 const TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;
+const ONE_HOUR = 60 * 60 * 1000;
 
 async function cleanExpiredAgentJobKeys() {
   try {
     const db = getDb();
-    const cutoff = Date.now() - TWENTY_FOUR_HOURS;
     const rows = db
       .select({ id: settings.id, key: settings.key, lastUsedAt: settings.lastUsedAt, createdAt: settings.createdAt })
       .from(settings)
       .where(eq(settings.type, 'agent_job_api_key'))
       .all();
 
-    // Filter to candidates not used in the last 24 hours
-    const candidates = rows.filter(r =>
-      (r.lastUsedAt !== null ? r.lastUsedAt : r.createdAt) < cutoff
-    );
+    // Split into SDK keys (no container) vs container-backed keys
+    const sdkRows = rows.filter(r => r.key.includes('sdk'));
+    const containerRows = rows.filter(r => !r.key.includes('sdk'));
 
-    if (candidates.length === 0) {
-      console.log(`[maintenance] No expired agent job keys (${rows.length} active)`);
-      return;
-    }
+    let deleted = 0;
 
-    // Check if the container still exists for each candidate
-    const { inspectContainer } = await import('./tools/docker.js');
-    const expiredIds = [];
-    for (const r of candidates) {
-      const info = await inspectContainer(r.key);
-      if (!info) {
-        expiredIds.push(r.id);
+    // SDK keys: delete any older than 1 hour (no container to inspect)
+    const sdkCutoff = Date.now() - ONE_HOUR;
+    for (const r of sdkRows) {
+      const age = r.lastUsedAt !== null ? r.lastUsedAt : r.createdAt;
+      if (age < sdkCutoff) {
+        db.delete(settings).where(eq(settings.id, r.id)).run();
+        deleted++;
       }
     }
 
-    if (expiredIds.length > 0) {
-      for (const id of expiredIds) {
-        db.delete(settings).where(eq(settings.id, id)).run();
+    // Container-backed keys: existing logic — 24h expiry + container inspect
+    const containerCutoff = Date.now() - TWENTY_FOUR_HOURS;
+    const candidates = containerRows.filter(r =>
+      (r.lastUsedAt !== null ? r.lastUsedAt : r.createdAt) < containerCutoff
+    );
+
+    if (candidates.length > 0) {
+      const { inspectContainer } = await import('./tools/docker.js');
+      for (const r of candidates) {
+        const info = await inspectContainer(r.key);
+        if (!info) {
+          db.delete(settings).where(eq(settings.id, r.id)).run();
+          deleted++;
+        }
       }
-      console.log(`[maintenance] Deleted ${expiredIds.length} orphaned agent job key(s)`);
+    }
+
+    if (deleted > 0) {
+      console.log(`[maintenance] Deleted ${deleted} expired agent job key(s)`);
     } else {
-      console.log(`[maintenance] ${candidates.length} candidate(s) checked, all containers still running`);
+      console.log(`[maintenance] No expired agent job keys (${rows.length} active)`);
     }
   } catch (err) {
     console.error('[maintenance] cleanExpiredAgentJobKeys failed:', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.76-beta.6",
+  "version": "1.2.76-beta.8",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {