ever-terminal 1.0.1 → 1.0.2

package/dist/claude/provider.js

@@ -1,7 +1,10 @@
 import { readFileSync, existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
+import { exec } from "node:child_process";
+import { promisify } from "node:util";
 import { listSessions, getSessionMessages, } from "@anthropic-ai/claude-agent-sdk";
+const execAsync = promisify(exec);
 import { ClaudeSession } from "./session.js";
 /** Find the jsonl file for a Claude session by scanning project dirs. */
 function findSessionFile(sessionId) {
@@ -55,11 +58,11 @@ export function claudeSessionStatus(sessionId) {
         if (text.includes("Request interrupted by user"))
             return "idle";
     }
-    if (last.timestamp) {
-        const ageMs = Date.now() - new Date(last.timestamp).getTime();
-        if (ageMs > 120_000)
-            return "idle";
-    }
+    if (!last.timestamp)
+        return "idle"; // ponytail: no timestamp → not in-progress
+    const ageMs = Date.now() - new Date(last.timestamp).getTime();
+    if (ageMs > 120_000)
+        return "idle";
     return "busy";
 }
 // ── Provider factory ────────────────────────────────────
@@ -108,11 +111,11 @@ export function createClaudeProvider(emit) {
             "";
         return { sessionId: resolvedId, provider: "claude" };
     }
-    function respondPermission(sessionId, decision) {
-        sessions.get(sessionId)?.respondPermission(decision);
+    function respondPermission(sessionId, decision, toolUseId) {
+        sessions.get(sessionId)?.respondPermission(decision, toolUseId);
     }
-    function respondQuestion(sessionId, answer) {
-        sessions.get(sessionId)?.respondQuestion(answer);
+    function respondQuestion(sessionId, answer, toolUseId) {
+        sessions.get(sessionId)?.respondQuestion(answer, toolUseId);
     }
     function interrupt(sessionId) {
         sessions.get(sessionId)?.interrupt();
@@ -144,9 +147,6 @@ export function createClaudeProvider(emit) {
         }));
     }
     async function getInfo() {
-        const { exec } = await import("node:child_process");
-        const { promisify } = await import("node:util");
-        const execAsync = promisify(exec);
         let version = "";
         try {
             const { stdout } = await execAsync("claude --version", {

package/dist/claude/session.js

@@ -2,6 +2,8 @@ import { query } from "@anthropic-ai/claude-agent-sdk";
 import { existsSync } from "node:fs";
 import { summarizeClaudeToolCall } from "./summarize.js";
 import { debugLog } from "../debug.js";
+// ponytail: shell metachar check — rejects chained commands, keeps the regex simple
+const SHELL_META = /[&|;`$><\n]/;
 function buildClaudePermissionOptions(suggestions, description) {
     const options = [{ text: "Yes", key: "allow" }];
     const alwaysText = describeClaudePermissionSuggestions(suggestions, description);
@@ -71,8 +73,8 @@ export class ClaudeSession {
     statsTimer = null;
     queryHandle = null;
     runningQuery = null;
-    pendingPermissions = [];
-    pendingQuestions = [];
+    pendingPermissions = new Map();
+    pendingQuestions = new Map();
     alwaysAllowedTools = new Set();
     pendingToolCalls = new Map();
     /** Tracks the type of the currently-open content block ("thinking" | "text" | null). */
@@ -99,8 +101,7 @@ export class ClaudeSession {
     /** Tracked session status: 'awaiting' if there's an unanswered permission
      *  request or user question, otherwise 'busy'/'idle' based on _busy. */
     get status() {
-        if (this.pendingPermissions.length > 0 ||
-            this.pendingQuestions.length > 0) {
+        if (this.pendingPermissions.size > 0 || this.pendingQuestions.size > 0) {
             return "awaiting";
         }
         return this._busy ? "busy" : "idle";
@@ -113,10 +114,11 @@ export class ClaudeSession {
                 this.idResolve = resolve;
             });
         }
-        return Promise.race([
-            this.idPromise,
-            new Promise((_, reject) => setTimeout(() => reject(new Error("Timed out waiting for session ID")), timeoutMs)),
-        ]);
+        let timer;
+        const timeout = new Promise((_, reject) => {
+            timer = setTimeout(() => reject(new Error("Timed out waiting for session ID")), timeoutMs);
+        });
+        return Promise.race([this.idPromise, timeout]).finally(() => clearTimeout(timer));
     }
     onIdReady(cb) {
         if (this.sessionId) {
@@ -153,37 +155,50 @@ export class ClaudeSession {
     }
     /**
      * Wait for a user response with timeout and SDK abort signal as fallbacks.
-     * Multiple requests can be pending (e.g. subagents); resolved FIFO.
+     * Multiple requests can be pending (e.g. subagents); keyed by toolUseId.
      */
-    waitForUser(queue, signal, timeoutMs, defaultValue) {
+    waitForUser(map, toolUseId, signal, timeoutMs, defaultValue) {
         return new Promise((resolve) => {
             let settled = false;
-            const entry = (value) => finish(value);
             const finish = (value) => {
                 if (settled)
                     return;
                 settled = true;
                 clearTimeout(timer);
                 signal.removeEventListener("abort", onAbort);
-                const idx = queue.indexOf(entry);
-                if (idx !== -1)
-                    queue.splice(idx, 1);
+                map.delete(toolUseId);
                 resolve(value);
             };
             const timer = setTimeout(() => finish(defaultValue), timeoutMs);
             const onAbort = () => finish(defaultValue);
             signal.addEventListener("abort", onAbort, { once: true });
-            queue.push(entry);
+            map.set(toolUseId, (value) => finish(value));
         });
     }
-    respondPermission(decision) {
-        this.pendingPermissions.shift()?.({
+    respondPermission(decision, toolUseId) {
+        const resolver = this.resolveFromPending(this.pendingPermissions, toolUseId);
+        resolver?.({
             allow: decision === "allow" || decision === "allowAlways",
             allowAlways: decision === "allowAlways",
         });
     }
-    respondQuestion(answer) {
-        this.pendingQuestions.shift()?.(answer);
+    respondQuestion(answer, toolUseId) {
+        const resolver = this.resolveFromPending(this.pendingQuestions, toolUseId);
+        resolver?.(answer);
+    }
+    /** Resolve a pending entry by toolUseId (exact match) or fall back to the oldest entry. */
+    resolveFromPending(map, toolUseId) {
+        if (toolUseId && map.has(toolUseId)) {
+            const fn = map.get(toolUseId);
+            map.delete(toolUseId);
+            return fn;
+        }
+        // ponytail: fallback to oldest entry for clients that don't send toolUseId yet
+        const first = map.entries().next();
+        if (first.done)
+            return undefined;
+        map.delete(first.value[0]);
+        return first.value[1];
     }
     stopStatsTimer() {
         if (this.statsTimer) {
@@ -246,7 +261,7 @@ export class ClaudeSession {
             options: {
                 resume: this.sessionId,
                 cwd: this.lockedCwd,
-                model: "claude-opus-4-6",
+                model: process.env.CLAUDE_MODEL || "claude-opus-4-8",
                 allowedTools: [
                     "Read",
                     "Edit",
@@ -283,7 +298,7 @@ export class ClaudeSession {
                 },
                 includePartialMessages: true,
                 maxTurns: 50,
-                settingSources: ["user", "project"],
+                // ponytail: omit settingSources to load all three (user/project/local), matching CLI defaults
                 stderr: (data) => {
                     const trimmed = data.trim();
                     if (trimmed)
@@ -337,6 +352,7 @@ export class ClaudeSession {
         });
     }
     interrupt() {
+        this.promptQueue.length = 0;
         this.queryHandle?.interrupt().catch(() => { });
     }
     async close() {
@@ -346,8 +362,9 @@ export class ClaudeSession {
         };
         console.log(`[session] close: session=${this.sessionId ?? "none"} had=${JSON.stringify(had)}`);
         this.stopStatsTimer();
-        this.pendingPermissions.length = 0;
-        this.pendingQuestions.length = 0;
+        this.pendingPermissions.clear();
+        this.pendingQuestions.clear();
+        this.pendingToolCalls.clear();
         this.promptQueue.length = 0;
         if (this.queryHandle) {
             this.queryHandle.close();
@@ -364,6 +381,8 @@ export class ClaudeSession {
     async reset(cwd) {
         await this.close();
         this.sessionId = undefined;
+        this.idPromise = null;
+        this.idResolve = null;
         this.lockedCwd = cwd;
     }
     // ── Tool handlers ──────────────────────────────────
@@ -376,21 +395,23 @@ export class ClaudeSession {
             console.log(`[session] Auto-approve (allowAlways): ${toolName}`);
             return { behavior: "allow", updatedInput: input };
         }
-        const PERMISSION_TOOLS = new Set([
-            "KillShell",
-            "Config",
-            "Mcp",
-            "RemoteTrigger",
+        // ponytail: known safe read-only tools — auto-allow, no prompt
+        const READ_ONLY_TOOLS = new Set([
+            "Read",
+            "Glob",
+            "Grep",
+            "WebSearch",
+            "WebFetch",
+            "ToolSearch",
+            "ListMcpResources",
+            "ReadMcpResource",
+            "ExitPlanMode",
+            "TaskOutput",
+            "TaskGet",
+            "TaskList",
         ]);
-        if (PERMISSION_TOOLS.has(toolName)) {
-            return this.handlePermissionConfirm(toolName, input, options.toolUseID, options.signal, options.suggestions);
-        }
-        if (toolName === "Bash") {
-            const cmd = String(input.command || "").trim();
-            if (/^\s*(ls|cat|head|tail|wc|pwd|echo|printf|date|whoami|which|where|type|file|stat|du|df|env|printenv|uname|hostname|id|git\s+(status|log|diff|branch|show|remote|rev-parse))\b/.test(cmd)) {
-                return { behavior: "allow", updatedInput: input };
-            }
-            return this.handlePermissionConfirm(toolName, input, options.toolUseID, options.signal, options.suggestions);
+        if (READ_ONLY_TOOLS.has(toolName)) {
+            return { behavior: "allow", updatedInput: input };
         }
         if (toolName === "TodoWrite") {
             const todos = input.todos || [];
@@ -420,8 +441,18 @@ export class ClaudeSession {
             }
             return { behavior: "allow", updatedInput: input };
         }
-        console.log(`[session] canUseTool auto-approve: ${toolName} input_keys=${Object.keys(input).join(",")}`);
-        return { behavior: "allow", updatedInput: input };
+        if (toolName === "Bash") {
+            const cmd = String(input.command || "").trim();
+            // ponytail: only auto-allow simple read-only commands with NO shell metachars
+            if (!SHELL_META.test(cmd) &&
+                /^\s*(ls|cat|head|tail|wc|pwd|echo|printf|date|whoami|which|where|type|file|stat|du|df|env|printenv|uname|hostname|id|git\s+(status|log|diff|branch|show|remote|rev-parse))\b/.test(cmd)) {
+                return { behavior: "allow", updatedInput: input };
+            }
+            return this.handlePermissionConfirm(toolName, input, options.toolUseID, options.signal, options.suggestions);
+        }
+        // ponytail: everything else (Write, MCP tools, Agent, Skill, etc.) — prompt the user
+        console.log(`[session] canUseTool prompt-required: ${toolName} input_keys=${Object.keys(input).join(",")}`);
+        return this.handlePermissionConfirm(toolName, input, options.toolUseID, options.signal, options.suggestions);
     }
     async handleAskUserQuestion(toolInput, toolUseID, signal) {
         const questions = toolInput.questions || [];
@@ -440,7 +471,7 @@ export class ClaudeSession {
             })),
             toolUseId: toolUseID,
         });
-        const answer = await this.waitForUser(this.pendingQuestions, signal, 120000, "skip");
+        const answer = await this.waitForUser(this.pendingQuestions, toolUseID, signal, 120000, "skip");
         let answers = {};
         try {
             answers = JSON.parse(answer);
@@ -493,7 +524,7 @@ export class ClaudeSession {
             options: permissionOptions,
             suggestions: suggestions ?? null,
         });
-        const result = await this.waitForUser(this.pendingPermissions, signal, 60000, { allow: false, allowAlways: false });
+        const result = await this.waitForUser(this.pendingPermissions, toolUseID, signal, 60000, { allow: false, allowAlways: false });
         let sdkDecision;
         if (result.allowAlways) {
             this.alwaysAllowedTools.add(toolName);
@@ -674,7 +705,10 @@ export class ClaudeSession {
         let outputTokens = 0;
         if (msg.modelUsage) {
             for (const m of Object.values(msg.modelUsage)) {
-                inputTokens += m.inputTokens ?? 0;
+                inputTokens +=
+                    (m.inputTokens ?? 0) +
+                        (m.cacheReadInputTokens ?? 0) +
+                        (m.cacheCreationInputTokens ?? 0);
                 outputTokens += m.outputTokens ?? 0;
             }
         }

package/dist/cli.js

@@ -64,6 +64,11 @@ const optionDefinitions = {
         type: "string",
         describe: "Tee all logs to a file (default: ./ever-terminal-<ts>.log)",
     },
+    model: {
+        alias: "m",
+        type: "string",
+        describe: "Claude model (default: claude-opus-4-8)",
+    },
     verbose: {
         type: "boolean",
         describe: "Print raw SDK messages for debugging",
@@ -178,6 +183,8 @@ async function run(argv) {
         process.env.PROJECT_DIR = resolve(argv.cwd);
     if (argv.provider)
         process.env.DEFAULT_PROVIDER = argv.provider;
+    if (argv.model)
+        process.env.CLAUDE_MODEL = argv.model;
     if (argv.verbose)
         process.env.VERBOSE = "1";
     {

package/dist/routes/core.js

@@ -136,8 +136,8 @@ router.post("/prompt", async (req, res) => {
 });
 // POST /api/permission-response
 router.post("/permission-response", (req, res) => {
-    const { sessionId, decision, provider } = req.body ?? {};
-    console.log(`[permission-response] sessionId=${sessionId ?? "(none)"} provider=${provider ?? "(default)"} decision=${decision ?? "deny"}`);
+    const { sessionId, decision, provider, toolUseId } = req.body ?? {};
+    console.log(`[permission-response] sessionId=${sessionId ?? "(none)"} provider=${provider ?? "(default)"} decision=${decision ?? "deny"} toolUseId=${toolUseId ?? "(none)"}`);
     debugLog("api", "permission-response body", toOneLineJson(req.body ?? {}));
     if (!sessionId) {
         res.status(400).json({ error: "Missing 'sessionId'" });
@@ -148,13 +148,13 @@ router.post("/permission-response", (req, res) => {
         res.status(404).json({ error: "Session not found" });
         return;
     }
-    targetProvider.respondPermission(sessionId, decision || "deny");
+    targetProvider.respondPermission(sessionId, decision || "deny", toolUseId);
     res.json({ ok: true });
 });
 // POST /api/question-response
 router.post("/question-response", (req, res) => {
-    const { sessionId, answer, provider } = req.body ?? {};
-    console.log(`[question-response] sessionId=${sessionId ?? "(none)"} provider=${provider ?? "(default)"} answer=${String(answer ?? "skip").slice(0, 120)}`);
+    const { sessionId, answer, provider, toolUseId } = req.body ?? {};
+    console.log(`[question-response] sessionId=${sessionId ?? "(none)"} provider=${provider ?? "(default)"} answer=${String(answer ?? "skip").slice(0, 120)} toolUseId=${toolUseId ?? "(none)"}`);
     debugLog("api", "question-response body", toOneLineJson(req.body ?? {}));
     if (!sessionId) {
         res.status(400).json({ error: "Missing 'sessionId'" });
@@ -165,7 +165,7 @@ router.post("/question-response", (req, res) => {
         res.status(404).json({ error: "Session not found" });
         return;
     }
-    targetProvider.respondQuestion(sessionId, answer || "skip");
+    targetProvider.respondQuestion(sessionId, answer || "skip", toolUseId);
     res.json({ ok: true });
 });
 // POST /api/interrupt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ever-terminal",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "description": "Ever Terminal — AI Coding CLI on Smart Glasses & Flutter App",
   "license": "MIT",