@phnx-labs/agents-cli 1.20.58 → 1.20.59

package/dist/lib/session/discover.js

@@ -508,6 +508,7 @@ async function readClaudeMeta(filePath, sessionId, account, label) {
             label,
             messageCount: scan.messageCount,
             tokenCount: scan.tokenCount,
+            outputTokens: scan.outputTokens,
             costUsd: scan.costUsd,
             durationMs: scan.durationMs,
             isTeamOrigin,
@@ -533,6 +534,7 @@ async function readClaudeMeta(filePath, sessionId, account, label) {
             label,
             messageCount: scan.messageCount,
             tokenCount: scan.tokenCount,
+            outputTokens: scan.outputTokens,
             costUsd: scan.costUsd,
             durationMs: scan.durationMs,
             topic: scan.topic,
@@ -748,6 +750,7 @@ export async function readCodexMeta(filePath, resolveAccount, currentVersion) {
         topic: scan.topic,
         messageCount: scan.messageCount,
         tokenCount: scan.tokenCount,
+        outputTokens: scan.outputTokens,
         costUsd: scan.costUsd,
         durationMs: scan.durationMs,
         account: resolveAccount?.(),
@@ -873,6 +876,7 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
     let topic;
     let messageCount = 0;
     let tokenCount = 0;
+    let outputTokens = 0;
     let sawTokenCount = false;
     let costUsd = 0;
     let sawCost = false;
@@ -910,6 +914,16 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
             tokenCount += total;
             sawTokenCount = true;
         }
+        // Output tokens: sum directional generation fields per message (output +
+        // thoughts + tool), mirroring the cost path — never `tokens.total`, which
+        // may be cumulative and would double-count when summed.
+        const gtk = message.tokens;
+        if (gtk && typeof gtk === 'object') {
+            outputTokens +=
+                (typeof gtk.output === 'number' ? gtk.output : 0) +
+                    (typeof gtk.thoughts === 'number' ? gtk.thoughts : 0) +
+                    (typeof gtk.tool === 'number' ? gtk.tool : 0);
+        }
         // Per-message cost: directional tokens × this message's model price.
         const msgModel = (typeof message.model === 'string' ? message.model : undefined) || sessionModel;
         const tk = message.tokens;
@@ -944,6 +958,7 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
         topic,
         messageCount,
         tokenCount: sawTokenCount ? tokenCount : undefined,
+        outputTokens: sawTokenCount ? outputTokens : undefined,
         costUsd: sawCost ? costUsd : undefined,
         durationMs,
     };
@@ -1158,6 +1173,7 @@ async function scanOpenCodeIncremental() {
         s.time_updated AS time_updated,
         COALESCE(stats.message_count, 0) AS message_count,
         stats.token_count AS token_count,
+        stats.output_tokens AS output_tokens,
         COALESCE(stats.has_token_data, 0) AS has_token_data
       FROM session s
       LEFT JOIN (
@@ -1171,6 +1187,7 @@ async function scanOpenCodeIncremental() {
             COALESCE(json_extract(data, '$.tokens.cache.read'), 0) +
             COALESCE(json_extract(data, '$.tokens.cache.write'), 0)
           ) AS token_count,
+          SUM(COALESCE(json_extract(data, '$.tokens.output'), 0)) AS output_tokens,
           MAX(CASE WHEN json_type(data, '$.tokens') IS NOT NULL THEN 1 ELSE 0 END) AS has_token_data
         FROM message
         GROUP BY session_id
@@ -1194,6 +1211,7 @@ async function scanOpenCodeIncremental() {
             const timeUpdated = asInt(row.time_updated);
             const messageCount = asInt(row.message_count);
             const tokenCount = asInt(row.token_count);
+            const outputTokens = asInt(row.output_tokens);
             const hasTokenData = asInt(row.has_token_data) === 1;
             const timestamp = isNaN(timeCreated) ? new Date().toISOString() : new Date(timeCreated).toISOString();
             // OpenCode is one shared DB, not one file per session — its row carries a
@@ -1215,6 +1233,7 @@ async function scanOpenCodeIncremental() {
                 topic,
                 messageCount: Number.isNaN(messageCount) ? undefined : messageCount,
                 tokenCount: hasTokenData && !Number.isNaN(tokenCount) ? tokenCount : undefined,
+                outputTokens: hasTokenData && !Number.isNaN(outputTokens) ? outputTokens : undefined,
             };
             entries.push({ meta, content: topic || '', scan: currentScan });
         }
@@ -1653,6 +1672,7 @@ async function readDroidMeta(filePath, currentVersion) {
         topic: scan.topic,
         messageCount: scan.messageCount,
         tokenCount,
+        outputTokens: settings.usage?.outputTokens,
         costUsd: costUsd > 0 ? costUsd : undefined,
         durationMs: scan.durationMs,
     };
@@ -1801,6 +1821,7 @@ export async function scanClaudeSession(filePath) {
     let entrypoint;
     let messageCount = 0;
     let tokenCount = 0;
+    let outputTokens = 0;
     let sawTokenCount = false;
     let costUsd = 0;
     let sawCost = false;
@@ -1961,6 +1982,8 @@ export async function scanClaudeSession(filePath) {
                 tokenCount += usage;
                 sawTokenCount = true;
             }
+            if (typeof usageObj?.output_tokens === 'number')
+                outputTokens += usageObj.output_tokens;
             // Per-assistant-message cost: each event carries its own model, so we
             // multiply that event's raw token directions by that model's price.
             const model = parsed.message?.model;
@@ -2000,6 +2023,7 @@ export async function scanClaudeSession(filePath) {
         entrypoint,
         messageCount,
         tokenCount: sawTokenCount ? tokenCount : undefined,
+        outputTokens: sawTokenCount ? outputTokens : undefined,
         costUsd: sawCost ? costUsd : undefined,
         durationMs,
         lastActivity: lastTsMs !== undefined ? new Date(lastTsMs).toISOString() : undefined,
@@ -2167,6 +2191,9 @@ async function scanCodexSession(filePath) {
         topic,
         messageCount,
         tokenCount,
+        outputTokens: lastTotalTokenUsage
+            ? (lastTotalTokenUsage.output_tokens ?? 0) + (lastTotalTokenUsage.reasoning_output_tokens ?? 0)
+            : undefined,
         costUsd,
         durationMs,
         lastActivity: lastTsMs !== undefined ? new Date(lastTsMs).toISOString() : undefined,
@@ -2500,7 +2527,7 @@ export function readKimiMeta(filePath) {
         }
     }
     // Parse wire.jsonl to extract message count and token usage
-    const { messageCount, tokenCount } = parseKimiWireMetrics(sessionDir);
+    const { messageCount, tokenCount, outputTokens } = parseKimiWireMetrics(sessionDir);
     const meta = {
         id: sessionId,
         shortId,
@@ -2511,6 +2538,7 @@ export function readKimiMeta(filePath) {
         topic,
         messageCount,
         tokenCount: tokenCount > 0 ? tokenCount : undefined,
+        outputTokens: outputTokens > 0 ? outputTokens : undefined,
     };
     return { meta, content: lastPrompt || '' };
 }
@@ -2522,8 +2550,9 @@ function parseKimiWireMetrics(sessionDir) {
     const wirePath = path.join(sessionDir, 'agents', 'main', 'wire.jsonl');
     let messageCount = 0;
     let tokenCount = 0;
+    let outputTokens = 0;
     if (!fs.existsSync(wirePath)) {
-        return { messageCount: 0, tokenCount: 0 };
+        return { messageCount: 0, tokenCount: 0, outputTokens: 0 };
     }
     try {
         const lines = fs.readFileSync(wirePath, 'utf-8').split('\n');
@@ -2539,6 +2568,7 @@ function parseKimiWireMetrics(sessionDir) {
                     // Kimi usage structure: inputOther + output + inputCacheRead + inputCacheCreation
                     const u = event.usage;
                     tokenCount += (u.inputOther || 0) + (u.output || 0) + (u.inputCacheRead || 0) + (u.inputCacheCreation || 0);
+                    outputTokens += (u.output || 0);
                 }
             }
             catch {
@@ -2549,11 +2579,13 @@ function parseKimiWireMetrics(sessionDir) {
     catch {
         // If wire.jsonl can't be read, return 0s (graceful degradation)
     }
-    return { messageCount, tokenCount };
+    return { messageCount, tokenCount, outputTokens };
 }
 /** Parse a time filter string (relative like '7d' or ISO timestamp) into epoch milliseconds. */
 export function parseTimeFilter(input) {
-    const relativeMatch = input.match(/^(\d+)([mhdw])$/i);
+    // Units: m=minute, h=hour, d=day, w=week, mo=month(30d), y=year(365d). `mo`
+    // must precede the single-letter alternatives so "1mo" isn't read as "1m"+"o".
+    const relativeMatch = input.match(/^(\d+)(mo|[mhdwy])$/i);
     if (relativeMatch) {
         const value = parseInt(relativeMatch[1], 10);
         const unit = relativeMatch[2].toLowerCase();
@@ -2565,6 +2597,10 @@ export function parseTimeFilter(input) {
             return Date.now() - value * 86_400_000;
         if (unit === 'w')
             return Date.now() - value * 7 * 86_400_000;
+        if (unit === 'mo')
+            return Date.now() - value * 30 * 86_400_000;
+        if (unit === 'y')
+            return Date.now() - value * 365 * 86_400_000;
     }
     const ts = new Date(input).getTime();
     return Number.isNaN(ts) ? 0 : ts;

package/dist/lib/session/types.d.ts

@@ -66,6 +66,8 @@ export interface SessionMeta {
     gitBranch?: string;
     messageCount?: number;
     tokenCount?: number;
+    /** Real generated (output) tokens — excludes cache-read/-write context (issue: `agents output`). */
+    outputTokens?: number;
     /** Total USD cost, computed at scan time from per-model token usage (issue #323). */
     costUsd?: number;
     /** Wall-clock duration in ms (lastTs − firstTs), persisted at scan time. */

package/dist/lib/staleness/detectors/permissions.js

@@ -84,7 +84,7 @@ function buildOpenCodeDetector() {
         kind: 'permissions',
         agent: 'opencode',
         list({ versionHome }) {
-            const opencodeConfigPath = path.join(versionHome, '.opencode', 'opencode.jsonc');
+            const opencodeConfigPath = path.join(versionHome, '.config', 'opencode', 'opencode.jsonc');
             if (!fs.existsSync(opencodeConfigPath))
                 return [];
             try {
@@ -202,6 +202,26 @@ function buildCursorDetector() {
         },
     };
 }
+function buildDroidDetector() {
+    return {
+        kind: 'permissions',
+        agent: 'droid',
+        list({ versionHome }) {
+            const settingsPath = path.join(versionHome, '.factory', 'settings.json');
+            if (!fs.existsSync(settingsPath))
+                return [];
+            try {
+                const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+                const hasAllow = Array.isArray(settings.commandAllowlist) && settings.commandAllowlist.length > 0;
+                const hasDeny = Array.isArray(settings.commandDenylist) && settings.commandDenylist.length > 0;
+                if (hasAllow || hasDeny)
+                    return discoverPermissionGroups().map(g => g.name);
+            }
+            catch { /* parse fail */ }
+            return [];
+        },
+    };
+}
 function buildKiroDetector() {
     return {
         kind: 'permissions',
@@ -230,6 +250,7 @@ const handlers = {
     grok: buildGrokDetector,
     kimi: buildKimiDetector,
     cursor: buildCursorDetector,
+    droid: buildDroidDetector,
     kiro: buildKiroDetector,
 };
 export const permissionsDetectors = lazyAgentMap(() => {

package/dist/lib/staleness/detectors/subagents.js

@@ -85,32 +85,32 @@ function buildOpenclawDetector() {
         },
     };
 }
-function buildKiroDetector() {
+function buildKimiDetector() {
     return {
         kind: 'subagents',
-        agent: 'kiro',
+        agent: 'kimi',
         list({ versionHome }) {
-            const agentsDir = path.join(versionHome, '.kiro', 'agents');
+            const agentsDir = path.join(versionHome, '.kimi-code', 'agents');
             if (!fs.existsSync(agentsDir))
                 return [];
+            // Parent is `_agents-cli.yaml` (underscore-prefixed reserved name).
             return fs.readdirSync(agentsDir)
-                .filter(f => f.endsWith('.json'))
-                .map(f => f.replace('.json', ''));
+                .filter(f => f.endsWith('.yaml') && !f.startsWith('_'))
+                .map(f => f.replace(/\.yaml$/, ''));
         },
     };
 }
-function buildKimiDetector() {
+function buildKiroDetector() {
     return {
         kind: 'subagents',
-        agent: 'kimi',
+        agent: 'kiro',
         list({ versionHome }) {
-            const agentsDir = path.join(versionHome, '.kimi-code', 'agents');
+            const agentsDir = path.join(versionHome, '.kiro', 'agents');
             if (!fs.existsSync(agentsDir))
                 return [];
-            // Parent is `_agents-cli.yaml` (underscore-prefixed reserved name).
             return fs.readdirSync(agentsDir)
-                .filter(f => f.endsWith('.yaml') && !f.startsWith('_'))
-                .map(f => f.replace(/\.yaml$/, ''));
+                .filter(f => f.endsWith('.json'))
+                .map(f => f.replace(/\.json$/, ''));
         },
     };
 }

package/dist/lib/staleness/writers/commands.js

@@ -36,10 +36,10 @@ function buildCommandsWriter(agent) {
             const agentDir = path.join(versionHome, agentConfigDirName(agent));
             const commandsAsSkills = shouldInstallCommandAsSkill(agent, version);
             const supportsCommands = supports(agent, 'commands', version).ok;
-            // Writers fire only after supports() OR commands-as-skills says yes —
-            // both paths produce a usable result here.
+            // Version-gated agents (e.g. goose skills >= 1.25.0) are registered but
+            // may be called at a version too old for both paths — skip gracefully.
             if (!commandsAsSkills && !supportsCommands) {
-                throw new Error(`commands writer reached for ${agent}@${version} with no path (cmd=false, asSkill=false)`);
+                return { synced: [] };
             }
             const skillRoots = trustedSkillRoots();
             const commandsTarget = path.join(agentDir, agentConfig.commandsSubdir);

package/dist/lib/startup/command-registry.d.ts

@@ -65,6 +65,7 @@ export declare const loadDrive: ModuleLoader;
 export declare const loadFactory: ModuleLoader;
 export declare const loadUsage: ModuleLoader;
 export declare const loadCost: ModuleLoader;
+export declare const loadOutput: ModuleLoader;
 export declare const loadBudget: ModuleLoader;
 export declare const loadAlias: ModuleLoader;
 export declare const loadPty: ModuleLoader;

package/dist/lib/startup/command-registry.js

@@ -43,6 +43,7 @@ export const loadDrive = async () => (await import('../../commands/drive.js')).r
 export const loadFactory = async () => (await import('../../commands/factory.js')).registerFactoryCommands;
 export const loadUsage = async () => (await import('../../commands/usage.js')).registerUsageCommand;
 export const loadCost = async () => (await import('../../commands/cost.js')).registerCostCommand;
+export const loadOutput = async () => (await import('../../commands/output.js')).registerOutputCommand;
 export const loadBudget = async () => (await import('../../commands/budget.js')).registerBudgetCommand;
 export const loadAlias = async () => (await import('../../commands/alias.js')).registerAliasCommand;
 export const loadPty = async () => (await import('../../commands/pty.js')).registerPtyCommands;
@@ -137,6 +138,7 @@ export const COMMAND_LOADERS = {
     factory: [loadFactory],
     usage: [loadUsage],
     cost: [loadCost],
+    output: [loadOutput],
     budget: [loadBudget],
     alias: [loadAlias],
     pty: [loadPty],

package/dist/lib/subagents.d.ts

@@ -159,6 +159,7 @@ export declare function subagentContentMatches(installedDir: string, sourceDir:
  * List subagents installed to a specific agent's home
  * Claude: scans ~/.claude/agents/{name}.md
  * Kimi: scans ~/.kimi-code/agents/{name}.yaml (+ sibling .system.md)
+ * Kiro: scans ~/.kiro/agents/{name}.json
  * OpenClaw: scans ~/.openclaw/{name}/AGENTS.md
  */
 export declare function listSubagentsForAgent(agentId: AgentId, home: string): InstalledSubagent[];

package/dist/lib/subagents.js

@@ -393,21 +393,10 @@ export function writeKimiSubagentFiles(agentsDir, subagentDir, name) {
 export function transformSubagentForCodex(subagentDir) {
     const agentMd = path.join(subagentDir, 'AGENT.md');
     const frontmatter = parseSubagentFrontmatter(agentMd);
-    const body = getSubagentBody(agentMd);
     if (!frontmatter) {
         throw new Error(`Invalid AGENT.md in ${subagentDir}`);
     }
-    // Append other .md files into the developer_instructions body.
-    let instructions = body.trim();
-    const files = fs.readdirSync(subagentDir)
-        .filter(f => f.endsWith('.md') && f !== 'AGENT.md')
-        .sort();
-    for (const file of files) {
-        const content = fs.readFileSync(path.join(subagentDir, file), 'utf-8').trim();
-        const sectionName = file.replace('.md', '');
-        const title = sectionName.charAt(0).toUpperCase() + sectionName.slice(1).toLowerCase();
-        instructions += `\n\n## ${title}\n\n${content}`;
-    }
+    const instructions = flattenSubagentInstructions(subagentDir);
     // Escape TOML multi-line string (""") content — only """ needs escaping.
     const safeInstructions = instructions.replace(/"""/g, '\\"""');
     const safeName = frontmatter.name.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
@@ -421,6 +410,19 @@ export function transformSubagentForCodex(subagentDir) {
     toml += `developer_instructions = """\n${safeInstructions}\n"""\n`;
     return toml;
 }
+function flattenSubagentInstructions(subagentDir) {
+    let instructions = getSubagentBody(path.join(subagentDir, 'AGENT.md')).trim();
+    const files = fs.readdirSync(subagentDir)
+        .filter(f => f.endsWith('.md') && f !== 'AGENT.md')
+        .sort();
+    for (const file of files) {
+        const content = fs.readFileSync(path.join(subagentDir, file), 'utf-8').trim();
+        const sectionName = file.replace('.md', '');
+        const title = sectionName.charAt(0).toUpperCase() + sectionName.slice(1).toLowerCase();
+        instructions += `\n\n## ${title}\n\n${content}`;
+    }
+    return instructions;
+}
 /**
  * Transform a subagent into a Kiro CLI custom-agent JSON file.
  *
@@ -655,6 +657,7 @@ export function subagentContentMatches(installedDir, sourceDir) {
  * List subagents installed to a specific agent's home
  * Claude: scans ~/.claude/agents/{name}.md
  * Kimi: scans ~/.kimi-code/agents/{name}.yaml (+ sibling .system.md)
+ * Kiro: scans ~/.kiro/agents/{name}.json
  * OpenClaw: scans ~/.openclaw/{name}/AGENTS.md
  */
 export function listSubagentsForAgent(agentId, home) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.20.58",
+  "version": "1.20.59",
   "description": "One CLI for all your AI coding agents - versions, config, cloud dispatch, sessions, and teams (now with first-class Grok Build CLI support)",
   "type": "module",
   "main": "dist/index.js",