termux-dev 1.8.2 → 1.9.1

package/dist/core/locales/zh.js

@@ -20,25 +20,23 @@ export const zh = {
     'conn.classicRestored': '✓ 连接已恢复！继续生成...',
     'stop.connection': '连接已取消',
     'stop.stopped': '已停止',
-    'stop.interrupted': '已中断，正在发送你的消息',
     'stop.classicConnection': '连接已取消 (Ctrl+C)。',
     'stop.classicStopped': '生成已停止 (Ctrl+C)。',
-    'stop.classicInterrupted': '已中断：正在发送你的消息。',
     'status.waiting': '等待模型',
     'status.thinking': '思考中',
     'status.writing': '撰写中',
     'status.running': '运行中',
     'status.reconnecting': '重连中',
-    'status.stop': 'ctrl+c 停止',
+    'status.stop': 'esc 停止',
     'status.thinkingLine': '思考',
     'status.thoughtFor': '思考了 {sec} 秒',
     'composer.placeholder': '描述任务或提出问题…',
     'composer.queued': '已排队',
     'composer.queuedMany': '{n} 条已排队',
-    'composer.queuedHint': 'ctrl+enter 立即发送 · ↓ 编辑',
-    'composer.hint1': 'enter 排队 · ctrl+c 停止',
+    'composer.queuedHint': '↓ 编辑',
+    'composer.hint1': 'enter 排队 · esc 停止',
     'composer.hint2': 'enter 排队',
-    'composer.hint3': 'enter 排队 · ctrl+c 停止',
+    'composer.hint3': 'enter 排队 · esc 停止',
     'composer.hint4': 'enter 排队',
     'summary.toolOne': '{n} 个工具',
     'summary.toolMany': '{n} 个工具',
@@ -54,6 +52,7 @@ export const zh = {
     'settings.row.layout': '界面',
     'settings.row.pureBlack': '黑色背景',
     'settings.row.autoApprove': '自动批准 (YOLO)',
+    'settings.row.extra': 'Extra（不再询问）',
     'settings.row.maxIterations': '最大步数',
     'settings.row.memory': '项目记忆',
     'settings.row.updates': '检查更新',
@@ -63,6 +62,7 @@ export const zh = {
     'settings.short.layout': '界面',
     'settings.short.pureBlack': '黑背景',
     'settings.short.autoApprove': 'YOLO',
+    'settings.short.extra': 'Extra',
     'settings.short.maxIterations': '步数',
     'settings.short.memory': '记忆',
     'settings.short.updates': '更新',
@@ -78,12 +78,15 @@ export const zh = {
     'settings.hint.layout': '简洁：带边框的输入框、卡片和安静的工具行。经典：原来的 ASCII 布局。',
     'settings.hint.pureBlack': '将终端背景设为深邃的 OLED 黑 (#0a0a0c)。关闭则保留你自己的背景。',
     'settings.hint.autoApprove': '跳过常规的权限确认。危险命令和凭据文件仍会先询问。仅在本次会话有效：下次启动 devx 时会重新关闭。',
+    'settings.hint.extra': '不经询问执行任何命令：包括破坏性命令（rm -rf、sudo、git push --force）、下载的脚本、读取密钥和机密，以及新的 MCP 服务器。这里没有沙箱。仅在本次会话有效。',
     'settings.hint.maxIterations': '智能体处理一次请求最多可执行多少个工具步骤（编辑文件、运行命令）。',
     'settings.hint.memory': '每次会话都会加载 .devx/memory.md 中的规则。',
     'settings.hint.updates': '启动时在 GitHub 上查找 devx 新版本。无论开关，/update 都可用。',
     'settings.hint.language': '界面语言：消息、设置和提示。代码和工具名称保持英文。',
     'settings.hint.about': 'ApvCode 出品的终端原生 AI 编程智能体。MIT 许可证。github.com/apvcode/Termux-Dev',
     'settings.warnYolo': '已开启：智能体将不经询问直接运行命令并编辑文件。',
+    'settings.warnExtra': '警告：不再询问任何事，仅在可承受全部丢失的环境中使用。',
+    'settings.extraEnabled': 'Extra 已开启：智能体将不经询问执行任何命令，包括危险命令。下次启动 devx 时会再次关闭。',
     'settings.keys.move': '移动',
     'settings.keys.change': '更改',
     'settings.keys.toggle': '切换',
@@ -219,9 +222,68 @@ export const zh = {
     'onboard.language.note': '之后可以在 /settings 中更改。',
     'onboard.provider.title': '服务商',
     'onboard.provider.placeholder': '输入以查找服务商',
-    'onboard.provider.note': '提供模型的服务。没有找到？请选择自定义地址。',
+    'onboard.provider.note': '为你提供模型的服务。不在列表里？用“添加提供商”添加你自己的。',
     'onboard.custom': '自定义地址',
     'onboard.customDetail': '任何兼容 OpenAI 的地址',
+    'update.title': '更新',
+    'update.titleBusy': '正在更新',
+    'update.titleDone': '已更新',
+    'update.titleFailed': '更新失败',
+    'update.checking': '正在检查更新',
+    'update.upToDate': 'devx 已是最新版本（{version}）',
+    'update.offline': '无法检查更新（{reason}）',
+    'update.available': 'devx {version} 已发布',
+    'update.have': '你当前是 {version}',
+    'update.released': '发布于 {date}',
+    'update.whatsNew': '新内容',
+    'update.viaNpm': '通过 npm 安装：更新会执行 npm install -g termux-dev。',
+    'update.viaGit': '从 git 克隆安装：更新会拉取、构建并链接。',
+    'update.now': '立即更新',
+    'update.nowDetail': '安装 {version} 并重启 devx',
+    'update.later': '稍后',
+    'update.laterDetail': '暂时保留此版本',
+    'update.skip': '跳过此版本',
+    'update.skipDetail': '不再询问 {version}',
+    'update.step.registry': '正在检查注册表',
+    'update.step.install': '正在安装 devx {version}',
+    'update.step.verify': '正在检查新版本',
+    'update.step.pull': '正在从 GitHub 拉取',
+    'update.step.build': '正在安装并构建',
+    'update.step.link': '正在链接命令',
+    'update.keepOpen': '请保持 devx 打开，这需要一点时间。',
+    'update.installed': 'devx {version} 已安装',
+    'update.restarting': '正在重启 devx…',
+    'update.failedStep': '停在：{step}',
+    'update.keepsRunning': 'devx 继续运行在 {version}。',
+    'update.byHand': '手动更新：',
+    'update.notPublished': 'npm 上还没有 {version}，请几分钟后再试。',
+    'update.skipped': '明白：不再询问 {version}。',
+    'provider.add': '添加提供商',
+    'provider.addDetail': '任何兼容 OpenAI 或 Anthropic 的地址',
+    'provider.customTag': '自定义',
+    'provider.new': '新提供商',
+    'provider.name.label': '提供商名称',
+    'provider.name.placeholder': '我的网关',
+    'provider.name.empty': '请输入名称。',
+    'provider.name.long': '名称太长（最多 40 个字符）。',
+    'provider.name.taken': '已有同名的提供商。',
+    'provider.url.note': '到 /chat/completions 或 /messages 之前的地址，例如 https://api.example.com/v1。',
+    'provider.url.invalid': '这不是有效的地址。示例：https://api.example.com/v1',
+    'provider.url.scheme': '地址必须以 http:// 或 https:// 开头。',
+    'provider.key.none': '不需要密钥',
+    'provider.key.noneDetail': '本机或本网络上的服务器',
+    'provider.key.enter': '输入密钥',
+    'provider.menu.use': '使用此提供商',
+    'provider.menu.rename': '修改名称',
+    'provider.menu.url': '修改地址',
+    'provider.menu.key': '修改密钥',
+    'provider.menu.delete': '删除',
+    'provider.menu.deleteDetail': '连同密钥一起移除',
+    'provider.delete.question': '删除提供商 {name} 及其密钥？',
+    'provider.delete.active': '这是正在使用的提供商：在你选择其他提供商之前它仍可继续使用。',
+    'provider.saved': '提供商 {name} 已保存',
+    'provider.updated': '提供商 {name} 已更新',
+    'provider.deleted': '提供商 {name} 已删除',
     'onboard.baseUrl.title': '地址',
     'onboard.baseUrl.label': 'API 的基础 URL',
     'onboard.baseUrl.placeholder': 'https://api.example.com/v1',

package/dist/core/loop.js

@@ -61,6 +61,15 @@ export function getActionDescription(toolName, args) {
     return `→ Executing ${toolName}...`;
 }
 const CONTEXT_LENGTH_ERROR = /context[_ ]length|maximum context|context window|too many tokens|prompt is too long|reduce the length|input is too long|exceeds? the (?:model|maximum|max)/i;
+/**
+ * A request that failed in a way that usually still costs money: the connection broke or timed out
+ * after the request had gone out (no HTTP status), or a gateway gave up waiting for a slow model
+ * (504, 524) that went on working. Rejections (400, 401, 429, ...) are not billed.
+ */
+function probablyBilled(err) {
+    const status = err?.status ?? err?.statusCode;
+    return status === undefined || status === 0 || status === 504 || status === 524;
+}
 function isContextLengthError(err) {
     const status = err?.status;
     if (status !== undefined && status !== 400 && status !== 413 && status !== 422)
@@ -120,21 +129,32 @@ export class Agent {
             let attempt = 0;
             let contextRetries = 0;
             const maxRetries = 4;
+            // A request that goes out and gets no answer (cancelled, connection lost, gateway timeout) is
+            // usually billed all the same, and a retry sends the whole conversation again. Such requests
+            // are counted as an estimate instead of being left out of the cost.
+            let receivedChars = 0;
+            const lostUsage = () => this.provider.lostRequestUsage?.(this.history.getTotalTokens() + schemaTokens, Math.ceil(receivedChars * 0.33));
             while (true) {
                 if (signal?.aborted)
                     return;
+                receivedChars = 0;
                 try {
                     if (this.provider.chatStream) {
                         let receivedAnyChunk = false;
                         for await (const chunk of this.provider.chatStream(request)) {
                             if (signal?.aborted) {
+                                const lost = lostUsage();
+                                if (lost)
+                                    yield { type: 'usage', usage: lost };
                                 return;
                             }
                             receivedAnyChunk = true;
                             if (chunk.type === 'reasoning_delta') {
+                                receivedChars += chunk.delta.length;
                                 yield { type: 'reasoning_delta', delta: chunk.delta };
                             }
                             else if (chunk.type === 'content_delta') {
+                                receivedChars += chunk.delta.length;
                                 yield { type: 'text_delta', delta: chunk.delta };
                             }
                             else if (chunk.type === 'tool_generating') {
@@ -159,6 +179,9 @@ export class Agent {
                 }
                 catch (err) {
                     if (signal?.aborted || err.name === 'AbortError' || err.message?.includes('aborted')) {
+                        const lost = lostUsage();
+                        if (lost)
+                            yield { type: 'usage', usage: lost };
                         return;
                     }
                     // The provider says the prompt is too long (our estimate was too optimistic):
@@ -172,6 +195,11 @@ export class Agent {
                         continue;
                     }
                     const isNetwork = isNetworkOrRetryableError(err);
+                    if (isNetwork && probablyBilled(err)) {
+                        const lost = lostUsage();
+                        if (lost)
+                            yield { type: 'usage', usage: lost };
+                    }
                     if (isNetwork && attempt < maxRetries) {
                         attempt++;
                         const delayMs = Math.min(1500 * Math.pow(1.5, attempt - 1), 8000);
@@ -240,6 +268,8 @@ export class Agent {
                     if (signal?.aborted)
                         return;
                     let result = '';
+                    // Pictures a tool wants the model to see (read_file on an image) travel with its result.
+                    const pictures = [];
                     const tool = this.tools.get(call.name);
                     if (!tool) {
                         result = `Error: Tool '${call.name}' not found.`;
@@ -263,7 +293,7 @@ export class Agent {
                                 if (signal?.aborted)
                                     return;
                                 result = allowed
-                                    ? await tool.execute(call.arguments, this.config, { signal })
+                                    ? await tool.execute(call.arguments, this.config, { signal, attachImage: (image) => pictures.push(image) })
                                     : 'Action denied by user.';
                                 if (allowed) {
                                     const post = await runHooks(this.config.hooks, 'PostToolUse', tool.name, call.arguments, result);
@@ -286,6 +316,7 @@ export class Agent {
                         content: result,
                         tool_call_id: call.id,
                         name: call.name,
+                        ...(pictures.length > 0 ? { images: pictures } : {}),
                     });
                     executedToolCallIds.add(call.id);
                     yield { type: 'tool_end', id: call.id, name: call.name, result };

package/dist/core/prices.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { NATIVE_PROVIDERS, devxDir, normalizeModelKey, readJsonFile } from './catalog-util.js';
 import { ensureSecureDir } from './secure-file.js';
-import { computeCost, isFreeModel, reportedCost, } from './cost.js';
+import { costParts, isFreeModel, reportedCost, scaleParts, } from './cost.js';
 /**
  * Prices of models: where they come from and how a request is priced.
  *
@@ -240,10 +240,14 @@ export function priceUsage(ctx, counts, rawUsage) {
     const tokens = (counts.promptTokens || 0) + (counts.completionTokens || 0);
     if (reported !== undefined) {
         const suspicious = reported === 0 && tokens > 0 && !!info && info.source !== 'free' && info.rates.input + info.rates.output > 0;
-        if (!suspicious)
-            return { cost: reported, costSource: reported === 0 && info?.source === 'free' ? 'free' : 'reported' };
+        if (!suspicious) {
+            // The provider gave only the total: split it in the proportions of the known rates.
+            const parts = info ? scaleParts(costParts(info.rates, counts), reported) : undefined;
+            return { cost: reported, costSource: reported === 0 && info?.source === 'free' ? 'free' : 'reported', parts };
+        }
     }
     if (!info)
         return {};
-    return { cost: computeCost(info.rates, counts), costSource: info.source };
+    const parts = costParts(info.rates, counts);
+    return { cost: parts.input + parts.cacheRead + parts.cacheWrite + parts.output, costSource: info.source, parts };
 }

package/dist/core/session-media.js

@@ -0,0 +1,115 @@
+import crypto from 'crypto';
+import fs from 'fs/promises';
+import path from 'path';
+import { ensureSecureDir } from './secure-file.js';
+/**
+ * Pictures of a saved chat live in files next to it, not inside its JSON. A picture is a data URL
+ * of up to several megabytes; written into the chat file it made every save (after every turn)
+ * rewrite all of them, and the list of chats (/resume) had to read and parse every one.
+ *
+ * On disk a message carries `{ path, file }`; the bytes are in `<chat id>.images/<file>`, named by
+ * their hash, so the same picture is stored once however often it is saved.
+ */
+const EXT_BY_MIME = {
+    'image/png': 'png',
+    'image/jpeg': 'jpg',
+    'image/webp': 'webp',
+    'image/gif': 'gif',
+};
+const MIME_BY_EXT = Object.fromEntries(Object.entries(EXT_BY_MIME).map(([mime, ext]) => [ext, mime]));
+export const imagesDirFor = (sessionsDir, sessionId) => path.join(sessionsDir, `${sessionId}.images`);
+const DATA_URL = /^data:([^;,]+);base64,(.*)$/s;
+/**
+ * The messages as they are written to disk: pictures replaced by the name of their file, the
+ * files written. Returns the names in use, so the others can be removed. The messages passed in
+ * are not changed.
+ */
+export async function externalizeImages(messages, dir, index = new Map()) {
+    const used = new Set();
+    let dirReady = false;
+    const store = async (image) => {
+        const match = DATA_URL.exec(image.dataUrl ?? '');
+        const ext = match ? EXT_BY_MIME[match[1]] : undefined;
+        if (!match || !ext)
+            return image; // not something we can store: keep it as it is
+        let file = index.get(image.dataUrl);
+        if (!file) {
+            file = `${crypto.createHash('sha256').update(image.dataUrl).digest('hex').slice(0, 32)}.${ext}`;
+            index.set(image.dataUrl, file);
+        }
+        used.add(file);
+        const target = path.join(dir, file);
+        try {
+            await fs.access(target);
+        }
+        catch {
+            if (!dirReady) {
+                await ensureSecureDir(dir);
+                dirReady = true;
+            }
+            // Written aside and renamed: a crash must not leave half a picture under the real name.
+            const part = `${target}.part`;
+            await fs.writeFile(part, Buffer.from(match[2], 'base64'), { mode: 0o600 });
+            await fs.rename(part, target);
+        }
+        return { path: image.path, dataUrl: '', file };
+    };
+    const out = [];
+    for (const message of messages) {
+        if (!message.images || message.images.length === 0) {
+            out.push(message);
+            continue;
+        }
+        const images = [];
+        for (const image of message.images)
+            images.push(await store(image));
+        out.push({ ...message, images });
+    }
+    return { messages: out, used };
+}
+/**
+ * The messages of a loaded chat with their pictures read back from the files. A picture whose
+ * file is gone is dropped (the text of the message still says what it was); a chat saved by an
+ * older devx, with the data inside, is left as it is.
+ */
+export async function internalizeImages(messages, dir) {
+    const out = [];
+    for (const message of messages) {
+        if (!message.images || message.images.length === 0) {
+            out.push(message);
+            continue;
+        }
+        const images = [];
+        for (const image of message.images) {
+            const file = image.file;
+            if (!file) {
+                if (image.dataUrl)
+                    images.push(image);
+                continue;
+            }
+            const mime = MIME_BY_EXT[path.extname(file).slice(1).toLowerCase()];
+            // A name from a file on disk must not lead out of the folder.
+            if (!mime || path.basename(file) !== file)
+                continue;
+            try {
+                const data = await fs.readFile(path.join(dir, file));
+                images.push({ path: image.path, dataUrl: `data:${mime};base64,${data.toString('base64')}` });
+            }
+            catch { }
+        }
+        const { images: _dropped, ...rest } = message;
+        out.push(images.length > 0 ? { ...rest, images } : rest);
+    }
+    return out;
+}
+/** Removes the picture files that no message uses any more (after a /rewind, for example). */
+export async function pruneImages(dir, used) {
+    let names;
+    try {
+        names = await fs.readdir(dir);
+    }
+    catch {
+        return;
+    }
+    await Promise.all(names.filter((n) => !used.has(n)).map((n) => fs.rm(path.join(dir, n), { force: true }).catch(() => { })));
+}

package/dist/core/session.js

@@ -3,9 +3,12 @@ import fsSync from 'fs';
 import path from 'path';
 import os from 'os';
 import { ensureSecureDir, writeSecureFile } from './secure-file.js';
+import { externalizeImages, imagesDirFor, internalizeImages, pruneImages } from './session-media.js';
 const SESSIONS_DIR = path.join(os.homedir(), '.devx', 'sessions');
 export class SessionManager {
     currentSession;
+    /** The files of the pictures already seen (see session-media.ts). */
+    media = new Map();
     constructor(model, planMode) {
         this.currentSession = this.createEmptySession(model, planMode);
     }
@@ -36,6 +39,7 @@ export class SessionManager {
     }
     startNewSession(model, planMode) {
         this.currentSession = this.createEmptySession(model, planMode);
+        this.media = new Map();
         return this.currentSession;
     }
     async save(messages, totalCost, model, planMode, costEstimated) {
@@ -61,8 +65,12 @@ export class SessionManager {
                 this.currentSession.title = title || 'Session';
             }
         }
+        // Pictures go into their own files; the chat file keeps only their names.
+        const imagesDir = imagesDirFor(SESSIONS_DIR, this.currentSession.id);
+        const stored = await externalizeImages(messages, imagesDir, this.media);
         const filePath = path.join(SESSIONS_DIR, `${this.currentSession.id}.json`);
-        await writeSecureFile(filePath, JSON.stringify(this.currentSession, null, 2));
+        await writeSecureFile(filePath, JSON.stringify({ ...this.currentSession, messages: stored.messages }, null, 2));
+        await pruneImages(imagesDir, stored.used);
     }
     static async listSessions() {
         if (!fsSync.existsSync(SESSIONS_DIR)) {
@@ -95,7 +103,9 @@ export class SessionManager {
             return null;
         try {
             const content = await fs.readFile(filePath, 'utf8');
-            return JSON.parse(content);
+            const session = JSON.parse(content);
+            session.messages = await internalizeImages(session.messages ?? [], imagesDirFor(SESSIONS_DIR, sessionId));
+            return session;
         }
         catch {
             return null;
@@ -104,6 +114,7 @@ export class SessionManager {
     static async deleteSession(sessionId) {
         const filePath = path.join(SESSIONS_DIR, `${sessionId}.json`);
         try {
+            await fs.rm(imagesDirFor(SESSIONS_DIR, sessionId), { recursive: true, force: true }).catch(() => { });
             if (fsSync.existsSync(filePath)) {
                 await fs.unlink(filePath);
                 return true;
@@ -128,6 +139,10 @@ export class SessionManager {
                 }
                 catch { }
             }
+            // The pictures of the chats, and those of chats whose file is already gone.
+            for (const name of files.filter(f => f.endsWith('.images'))) {
+                await fs.rm(path.join(SESSIONS_DIR, name), { recursive: true, force: true }).catch(() => { });
+            }
             return count;
         }
         catch {

package/dist/core/title.js

@@ -31,9 +31,15 @@ export function cleanTitle(raw) {
 export function provisionalTitle(firstUserMessage) {
     return cleanTitle(firstUserMessage.replace(/\s+/g, ' ').slice(0, 80));
 }
-/** Asks the model for the name. Never throws: on a failure or a timeout the answer is ''. */
+/**
+ * Asks the model for the name. Never throws: on a failure or a timeout the answer is ''. When the
+ * time is up the request is cut off, so a slow thinking model does not go on (and bill) for a
+ * title nobody waits for.
+ */
 export async function generateChatTitle(provider, firstUser, firstReply, timeoutMs = 20000) {
     const sample = `User: ${firstUser.slice(0, 600)}\n\nAssistant: ${firstReply.slice(0, 600)}`;
+    const controller = new AbortController();
+    let timer;
     try {
         const answer = await Promise.race([
             provider.chat({
@@ -41,14 +47,25 @@ export async function generateChatTitle(provider, firstUser, firstReply, timeout
                     { role: 'system', content: TITLE_SYSTEM_PROMPT },
                     { role: 'user', content: sample },
                 ],
+                signal: controller.signal,
+            }),
+            // Also for a provider that ignores the signal: the title is given up on when the time is up.
+            new Promise((_, reject) => {
+                timer = setTimeout(() => {
+                    controller.abort();
+                    reject(new Error('timeout'));
+                }, timeoutMs);
+                timer.unref?.();
             }),
-            new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeoutMs).unref?.()),
         ]);
         return cleanTitle(answer.content);
     }
     catch {
         return '';
     }
+    finally {
+        clearTimeout(timer);
+    }
 }
 // ───────────────────────── terminal window title ─────────────────────────
 /** The escape sequence that sets the title of the terminal window (OSC 0): `◈ Short title`. */

package/dist/core/types.js

@@ -1 +1 @@
-export const DEVX_VERSION = '1.8.2';
+export const DEVX_VERSION = '1.9.1';

package/dist/core/usage.js

@@ -14,6 +14,11 @@ export class UsageTracker {
     ledger = new CostLedger();
     cacheReadTokens = 0;
     cacheWriteTokens = 0;
+    uncachedTokens = 0;
+    parts = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+    /** Priced requests that came without a split. */
+    unsplit = 0;
+    restored = 0;
     lastPromptTokens = 0;
     dataSaverLimitMB;
     warnedThreshold = false;
@@ -37,9 +42,22 @@ export class UsageTracker {
         this.ledger.reset();
         this.cacheReadTokens = 0;
         this.cacheWriteTokens = 0;
+        this.uncachedTokens = 0;
+        this.parts = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+        this.unsplit = 0;
+        this.restored = 0;
         this.lastPromptTokens = 0;
         this.warnedThreshold = false;
     }
+    /**
+     * A saved chat was resumed: what it cost so far is the starting point of the total, so that
+     * /usage and the prompt frame show the same number. Counting starts from zero before this.
+     */
+    restoreCost(total, estimated = false) {
+        this.reset();
+        this.ledger.restore(total, estimated);
+        this.restored = Number.isFinite(total) && total > 0 ? total : 0;
+    }
     recordRequest(payloadBytes) {
         this.bytesSent += payloadBytes;
         this.requestsCount += 1;
@@ -48,15 +66,29 @@ export class UsageTracker {
         this.bytesReceived += chunkBytes;
     }
     /** Records the tokens of one request; an undefined cost means the price is not known. */
-    recordTokens(promptTokens, completionTokens, cost, costSource) {
+    recordTokens(promptTokens, completionTokens, cost, costSource, parts) {
         this.promptTokens += promptTokens;
         this.completionTokens += completionTokens;
         this.ledger.add({ cost, costSource });
+        if (typeof cost === 'number' && Number.isFinite(cost)) {
+            if (parts) {
+                this.parts.input += parts.input;
+                this.parts.cacheRead += parts.cacheRead;
+                this.parts.cacheWrite += parts.cacheWrite;
+                this.parts.output += parts.output;
+            }
+            else {
+                this.unsplit++;
+            }
+        }
     }
     recordUsage(usage) {
-        this.recordTokens(usage.promptTokens, usage.completionTokens, usage.cost, usage.costSource);
-        this.cacheReadTokens += usage.cacheReadTokens || 0;
-        this.cacheWriteTokens += usage.cacheWriteTokens || 0;
+        this.recordTokens(usage.promptTokens, usage.completionTokens, usage.cost, usage.costSource, usage.costParts);
+        const read = Math.min(usage.promptTokens, usage.cacheReadTokens || 0);
+        const written = Math.min(usage.promptTokens - read, usage.cacheWriteTokens || 0);
+        this.cacheReadTokens += read;
+        this.cacheWriteTokens += written;
+        this.uncachedTokens += Math.max(0, usage.promptTokens - read - written);
         if (!usage.tokensEstimated)
             this.lastPromptTokens = usage.promptTokens;
     }
@@ -72,6 +104,11 @@ export class UsageTracker {
             totalCost: this.ledger.total,
             costState: this.ledger.state(),
             cacheReadTokens: this.cacheReadTokens,
+            cacheWriteTokens: this.cacheWriteTokens,
+            uncachedTokens: this.uncachedTokens,
+            // The split covers only what was counted since launch: with a restored total it would not add up.
+            costParts: this.unsplit === 0 && this.restored === 0 && this.ledger.priced > 0 ? { ...this.parts } : undefined,
+            restoredCost: this.restored > 0 ? this.restored : undefined,
             lastPromptTokens: this.lastPromptTokens,
             dataSaverLimitMB: this.dataSaverLimitMB
         };

package/dist/permissions/guard.js

@@ -328,6 +328,9 @@ export class CLIConsoleGuard {
         const t = (toolName || '').toLowerCase();
         const cmd = (args?.command || args?.cmd || '').trim();
         const target = pathArg(args);
+        // Extra: the agent does anything it likes, nothing is asked.
+        if (this.options.extra && this.autoApprove)
+            return false;
         // Critical safety net. These ask for confirmation even in YOLO mode.
         if (SHELL_TOOLS.has(t) && (isDangerousBashCommand(cmd) || shellTouchesSecrets(cmd)))
             return true;