@miphamai/cli 0.59.0 → 0.60.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miphamai/cli",
-  "version": "0.59.0",
+  "version": "0.60.1",
   "description": "Mipham Code — Multi-model open-core intelligent coding terminal by MiphamAI",
   "keywords": [
     "ai",

package/src/commands/autoloop-journal.ts

@@ -8,7 +8,7 @@ function ensureDir(): void {
   if (!existsSync(AUTOLOOP_DIR)) mkdirSync(AUTOLOOP_DIR, { recursive: true })
 }
 
-interface AutoloopJournal {
+export interface AutoloopJournal {
   sessionId: string
   prompt: string
   status: 'active' | 'completed' | 'stopped'
@@ -16,6 +16,9 @@ interface AutoloopJournal {
   startedAt: string
   lastIteration?: string
   logs: string[]
+  startTokens?: number
+  totalTokens: number
+  maxIterations: number
 }
 
 function journalPath(sessionId: string): string {
@@ -23,7 +26,11 @@ function journalPath(sessionId: string): string {
 }
 
 /** Create or reset an autonomous loop journal. */
-export function createAutoloopJournal(sessionId: string, prompt: string): AutoloopJournal {
+export function createAutoloopJournal(
+  sessionId: string,
+  prompt: string,
+  startTokens = 0,
+): AutoloopJournal {
   ensureDir()
   const journal: AutoloopJournal = {
     sessionId,
@@ -32,11 +39,22 @@ export function createAutoloopJournal(sessionId: string, prompt: string): Autolo
     iterations: 0,
     startedAt: new Date().toISOString(),
     logs: [],
+    startTokens,
+    totalTokens: 0,
+    maxIterations: 100,
   }
   writeFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), 'utf-8')
   return journal
 }
 
+/** Accumulate token usage into the loop journal. */
+export function recordLoopTokens(sessionId: string, delta: number): void {
+  const journal = readAutoloopJournal(sessionId)
+  if (!journal) return
+  journal.totalTokens += delta
+  writeFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), 'utf-8')
+}
+
 /** Read the journal for an autonomous loop. */
 export function readAutoloopJournal(sessionId: string): AutoloopJournal | null {
   const path = journalPath(sessionId)
@@ -48,6 +66,19 @@ export function readAutoloopJournal(sessionId: string): AutoloopJournal | null {
   }
 }
 
+/** End-of-loop-turn accounting: log the iteration, record the token delta, and
+ *  stop the loop if it has reached its max-iteration guard (spec §七). */
+export function recordLoopTurn(sessionId: string, summary: string, delta: number): void {
+  const journal = readAutoloopJournal(sessionId)
+  if (!journal || journal.status !== 'active') return
+  logAutoloopIteration(sessionId, summary)
+  recordLoopTokens(sessionId, delta)
+  const updated = readAutoloopJournal(sessionId)
+  if (updated && updated.iterations >= updated.maxIterations) {
+    completeAutoloopJournal(sessionId, 'stopped')
+  }
+}
+
 /** Log an iteration in the autonomous loop journal. */
 export function logAutoloopIteration(sessionId: string, summary: string): void {
   const journal = readAutoloopJournal(sessionId)
@@ -85,6 +116,15 @@ export function listActiveAutoloops(): AutoloopJournal[] {
   return journals
 }
 
+/** Format active loop journals as one-line rows for the /usage panel. */
+export function formatLoopRows(journals: AutoloopJournal[]): string[] {
+  return journals.map((j) => {
+    const per = j.iterations > 0 ? Math.round(j.totalTokens / j.iterations) : 0
+    const last = j.lastIteration ? new Date(j.lastIteration).toLocaleString() : 'N/A'
+    return `${j.sessionId.slice(-8)}  🔄 ${j.iterations} iterations · ${j.totalTokens} tokens · ${per} /run · last ${last}`
+  })
+}
+
 /** Get the autonomous loop status message. */
 export function getAutoloopStatus(sessionId: string): string {
   const journal = readAutoloopJournal(sessionId)

package/src/config/defaults.ts

@@ -13,6 +13,9 @@ export const DEFAULT_CONFIG: MiphamConfig = {
   defaultProvider: 'deepseek',
   defaultModel: 'deepseek-v4-pro',
   permission: 'default',
+  showThinking: 'off',
+  showSchedulingNotices: false,
+  showCommandPicker: false,
   // Org 级权限限制（可选）：forbiddenModes 禁指定模式 / maxAllowedMode 封顶层级；
   // 请求被禁模式时 fail-closed 降级（如 forbiddenModes:['bypassPermissions']）。
   // permissionRestrictions: { forbiddenModes: ['bypassPermissions'] },

package/src/core/engine.ts

@@ -38,6 +38,7 @@ import { UsageTracker } from './usage-tracker'
 import { getMetrics } from './metrics'
 import { buildRequest, sendInferenceCheck, isInferenceHookEnabled } from './inference-hook'
 import { getFileInboxTransport } from '../agent/cross-session/file-inbox'
+import { registerWakeupHandler } from '../tools/scheduling/schedule-wakeup'
 import { accumulateGraftSavings } from '../shared/graft-savings'
 import { getMessageBus, type AgentMessage } from '../agent/message-bus'
 import { createT } from '../i18n-core/t'
@@ -101,6 +102,12 @@ export class QueryEngine {
   /** 注入的 LLM chat 缝。未设置时回退 this.registry（strangler-fig）。 */
   private llm?: Llm
 
+  /** Pending /loop re-invocation prompts, enqueued by the ScheduleWakeup timer. */
+  private wakeupQueue: Array<{ prompt: string; noop: boolean }> = []
+
+  /** Callback fired whenever a wakeup is enqueued (the ScheduleWakeup timer fired). */
+  private onWakeupEnqueued: (() => void) | null = null
+
   constructor(
     private registry: ProviderRegistry,
     private context: ContextManager,
@@ -109,6 +116,36 @@ export class QueryEngine {
     ruleEngine?: ExperienceRuleEngine,
   ) {
     this.ruleEngine = ruleEngine
+    // ScheduleWakeup 的 timer 到期后，把 loop prompt 交回本引擎 re-invoke。
+    registerWakeupHandler((_sessionId, prompt, noop) => this.enqueueWakeup(prompt, noop))
+  }
+
+  /** Enqueue a loop prompt for later re-invocation (keep-latest — drops older wakeups). */
+  enqueueWakeup(prompt: string, noop = false): void {
+    // 队列只保留最新（丢弃旧唤醒，防堆积）
+    this.wakeupQueue = [{ prompt, noop }]
+    this.onWakeupEnqueued?.()
+  }
+
+  /** Register a callback fired whenever a wakeup is enqueued (the ScheduleWakeup
+   *  timer fired). The app subscribes to drain the queue while idle. */
+  setOnWakeupEnqueued(cb: (() => void) | null): void {
+    this.onWakeupEnqueued = cb
+  }
+
+  /** Empty the wakeup queue (stops re-invocation at the max-iteration guard). */
+  clearWakeupQueue(): void {
+    this.wakeupQueue = []
+  }
+
+  /** Pop the next pending wakeup prompt, or null when the queue is empty. */
+  dequeueWakeup(): { prompt: string; noop: boolean } | null {
+    return this.wakeupQueue.shift() ?? null
+  }
+
+  /** Whether a wakeup prompt is pending re-invocation. */
+  hasPendingWakeup(): boolean {
+    return this.wakeupQueue.length > 0
   }
 
   /** Session identifier for cross-session messaging. Set by the app startup via setSessionId(). */
@@ -486,8 +523,11 @@ export class QueryEngine {
         yield chunk
 
         if (chunk.type === 'error') {
+          // #23: client-generated errors are system lines, not model output —
+          // store as `system` so resume renders an error line (⚠) rather than
+          // attributing the failure to the assistant.
           this.context.addMessage({
-            role: 'assistant',
+            role: 'system',
             content: t('errors.model_error', { error: chunk.error ?? 'Unknown error' }),
           })
           return
@@ -964,7 +1004,7 @@ export class QueryEngine {
       // P1-4: Increment consecutive block counter; if limit exceeded,
       // tell the model to move on instead of retrying.
       const limitExceeded = this.permission.incrementBlockCounter()
-      const baseError = t('errors.tool_not_allowed', { name })
+      const baseError = this.buildDenialError(name, tool, params)
       const moveOnHint = limitExceeded
         ? '\n(Consecutive block limit reached. Please try a different approach or ask the user for guidance.)'
         : ''
@@ -1297,6 +1337,29 @@ export class QueryEngine {
     return this.tools
   }
 
+  /**
+   * Build a rich permission-denial error naming the mode (level), the setting
+   * (rule/level) that caused the denial, and the correct fix (#52).
+   */
+  private buildDenialError(
+    name: string,
+    tool: ToolDefinition,
+    params: Record<string, unknown>,
+  ): string {
+    const { reason, rulePattern } = this.permission.explainDenial(tool, params)
+    const mode = this.permission.getMode()
+    switch (reason) {
+      case 'deny-rule':
+        return t('errors.tool_denied_deny_rule', { name, pattern: rulePattern ?? '?' })
+      case 'ask-rule':
+        return t('errors.tool_denied_ask_rule', { name, pattern: rulePattern ?? '?' })
+      default:
+        // mode-baseline / tool-default / legacy-rule / system-default — a mode
+        // switch (or /permissions) resolves it.
+        return t('errors.tool_denied_mode', { name, mode })
+    }
+  }
+
   getRuleEngine(): ExperienceRuleEngine | undefined {
     return this.ruleEngine
   }

package/src/core/permission.ts

@@ -62,6 +62,18 @@ function isVerificationCommand(input: Record<string, unknown>): boolean {
 
 const VALID_MODES: Set<string> = new Set<string>(MODE_CYCLE)
 
+/**
+ * Why a tool resolved to 'ask' — for rich denial errors (#52).
+ * Mirrors the resolution chain order in `check()` (first match wins).
+ */
+export type PermissionDenialReason =
+  | 'deny-rule' // org deny rule — overrides mode, cannot be switched away
+  | 'ask-rule' // explicit ask rule — still requires approval under any mode
+  | 'legacy-rule' // legacy exact-name rule (setRule)
+  | 'mode-baseline' // mode-specific default (acceptEdits/plan) → ask
+  | 'tool-default' // tool.permission === 'ask'
+  | 'system-default' // no rule, no tool permission → fallback ask
+
 export class PermissionSystem {
   private allowRules: PermissionRuleEntry[] = []
   private denyRules: PermissionRuleEntry[] = []
@@ -344,6 +356,39 @@ export class PermissionSystem {
     return this.check(tool, input) === 'bypass'
   }
 
+  /**
+   * Explain WHY a tool resolves to 'ask' (rich denial errors — #52).
+   *
+   * Only call after `check()` returns 'ask'; mirrors its resolution order
+   * (deny → ask → legacy → mode → tool → system). Returns the matched
+   * rule pattern when the denial came from a deny/ask rule.
+   */
+  explainDenial(
+    tool: ToolDefinition,
+    input: Record<string, unknown>,
+  ): { reason: PermissionDenialReason; rulePattern?: string } {
+    for (const rule of this.denyRules) {
+      if (this.ruleMatches(rule, tool, input)) {
+        return { reason: 'deny-rule', rulePattern: rule.pattern }
+      }
+    }
+    for (const rule of this.askRules) {
+      if (this.ruleMatches(rule, tool, input)) {
+        return { reason: 'ask-rule', rulePattern: rule.pattern }
+      }
+    }
+    if (this.legacyRules.has(tool.name)) {
+      return { reason: 'legacy-rule' }
+    }
+    if (this.modeBaseline(tool, input) !== 'mode-baseline') {
+      return { reason: 'mode-baseline' }
+    }
+    if (tool.permission) {
+      return { reason: 'tool-default' }
+    }
+    return { reason: 'system-default' }
+  }
+
   // ── Helpers ──
 
   private ruleMatches(

package/src/i18n-core/locales/en-US.json

@@ -364,6 +364,7 @@
       "provider_line": "Provider:         {provider}",
       "model_line": "Model:            {model}",
       "tool_section": "── Per-Tool ──",
+      "loops_header": "── Autonomous Loops ──",
       "hint": "Use /context for detailed stats, /compact to free space."
     },
     "reload_skills": {
@@ -940,6 +941,9 @@
   },
   "errors": {
     "tool_not_allowed": "Tool \"{name}\" requires user approval (permission: ask). The tool was not executed. Press Shift+Tab to switch permission mode, or run /permissions.",
+    "tool_denied_deny_rule": "Tool \"{name}\" blocked by a deny rule (\"{pattern}\"). Deny rules override permission mode — try a different approach.",
+    "tool_denied_ask_rule": "Tool \"{name}\" requires approval (ask rule: \"{pattern}\"). Approve when prompted, or adjust the rule via /permissions.",
+    "tool_denied_mode": "Tool \"{name}\" requires approval under \"{mode}\" mode. Press Shift+Tab to switch permission mode, or run /permissions.",
     "tool_blocked": "Tool \"{name}\" blocked by hook",
     "user_input_blocked": "User input blocked by hook.",
     "dlp_blocked": "Request blocked by DLP policy.",

package/src/i18n-core/locales/zh-CN.json

@@ -364,6 +364,7 @@
       "provider_line": "提供商:         {provider}",
       "model_line": "模型:            {model}",
       "tool_section": "── 按工具 ──",
+      "loops_header": "── 自动循环 ──",
       "hint": "使用 /context 查看详细统计，/compact 释放空间。"
     },
     "reload_skills": {
@@ -940,6 +941,9 @@
   },
   "errors": {
     "tool_not_allowed": "工具 \"{name}\" 需要用户批准（权限：ask），未执行。按 Shift+Tab 切换权限模式，或运行 /permissions。",
+    "tool_denied_deny_rule": "工具 \"{name}\" 被拒绝规则（\"{pattern}\"）阻止。拒绝规则优先于权限模式 — 请改用其他方式。",
+    "tool_denied_ask_rule": "工具 \"{name}\" 需要批准（ask 规则：\"{pattern}\"）。请在提示时批准，或通过 /permissions 调整规则。",
+    "tool_denied_mode": "工具 \"{name}\" 在 \"{mode}\" 模式下需要批准。按 Shift+Tab 切换权限模式，或运行 /permissions。",
     "tool_blocked": "工具 \"{name}\" 被钩子拦截",
     "user_input_blocked": "用户输入被钩子拦截。",
     "dlp_blocked": "请求被 DLP 策略阻止。",

package/src/providers/openai-compat.ts

@@ -21,7 +21,7 @@ export class OpenAICompatProvider implements ProviderInstance {
       model: req.model,
       messages: this.convertMessages(req.messages, req.systemPrompt),
       stream: true,
-      max_tokens: req.maxTokens,
+      max_tokens: req.maxTokens || 8192,
       temperature: req.temperature,
       tools: req.tools?.map((t) => ({ type: 'function', function: t })),
     }

package/src/shared/package-info.ts

@@ -9,7 +9,7 @@
 export const PACKAGE_NAME = '@miphamai/cli' as const
 
 /** 当前发布版本 */
-export const PACKAGE_VERSION = '0.59.0' as const
+export const PACKAGE_VERSION = '0.60.1' as const
 
 /** npm install 全局安装命令 */
 export const NPM_INSTALL_COMMAND = `npm install -g ${PACKAGE_NAME}` as const

package/src/shared/types.ts

@@ -135,6 +135,17 @@ export interface MiphamConfig {
   permissionRestrictions?: PermissionRestrictions
   /** User-defined permission rules (allow/deny patterns), wired into the runtime PermissionSystem. */
   permissionRules?: { allow?: string[]; deny?: string[] }
+  /**
+   * How to render the model's reasoning/thinking before the answer:
+   * - `off`     → hide entirely (default — clean output)
+   * - `minimal` → content-free "thinking…" indicator
+   * - `full`    → last 200 chars of the actual thinking text
+   */
+  showThinking?: 'off' | 'minimal' | 'full'
+  /** When false, hide the `⏰ Wakeup scheduled` scheduling confirmation notices. Default false. */
+  showSchedulingNotices?: boolean
+  /** When false, disable the slash-command picker auto-popup on `/`. Default false. */
+  showCommandPicker?: boolean
   providers: ProviderConfig[]
   skills?: { paths: string[]; mcpServers: McpServerConfig[] }
   marketplace?: {

package/src/tools/computer/app-launcher.ts

@@ -34,6 +34,12 @@ export function launchApp(appName: string): { success: boolean; message: string
     }
     return { success: true, message: `Launched: ${appName}` }
   } catch (err) {
-    return { success: false, message: `Failed to launch ${appName}: ${String(err)}` }
+    // #57: on macOS an `open -a` failure is often missing Automation permission —
+    // point the user at the fix instead of a raw error.
+    const macHint =
+      process.platform === 'darwin'
+        ? ' On macOS, grant Automation permission (System Settings → Privacy & Security → Automation) if prompted.'
+        : ''
+    return { success: false, message: `Failed to launch ${appName}: ${String(err)}${macHint}` }
   }
 }

package/src/tools/computer/screenshot.ts

@@ -52,6 +52,12 @@ $bitmap.Dispose()
     } catch {
       // ignore cleanup failures
     }
-    return { success: false, error: `Screenshot failed: ${String(err)}` }
+    // #57: on macOS a screencapture failure is almost always missing Screen
+    // Recording permission — point the user at the fix instead of a raw error.
+    const macHint =
+      process.platform === 'darwin'
+        ? '\n(macOS: grant Screen Recording permission in System Settings → Privacy & Security → Screen Recording)'
+        : ''
+    return { success: false, error: `Screenshot failed: ${String(err)}${macHint}` }
   }
 }

package/src/tools/scheduling/schedule-wakeup.ts

@@ -6,6 +6,15 @@ import type { ToolDefinition } from '../../shared/index.ts'
  */
 const activeTimers = new Map<string, ReturnType<typeof setTimeout>>()
 
+let wakeupHandler: ((sessionId: string, prompt: string, noop?: boolean) => void) | null = null
+
+/** 引擎在启动时注入——timer 到期后回调，把 loop prompt 交回引擎 re-invoke。 */
+export function registerWakeupHandler(
+  fn: (sessionId: string, prompt: string, noop?: boolean) => void,
+): void {
+  wakeupHandler = fn
+}
+
 export const scheduleWakeupTool: ToolDefinition = {
   name: 'ScheduleWakeup',
   description:
@@ -31,6 +40,10 @@ export const scheduleWakeupTool: ToolDefinition = {
         type: 'boolean',
         description: 'Set to true to end the dynamic loop immediately.',
       },
+      noop: {
+        type: 'boolean',
+        description: 'true = 本轮无事可报（仅用于 UI 折叠空闲提示，不改变 re-invoke 语义）',
+      },
     },
     required: [],
   },
@@ -58,6 +71,7 @@ export const scheduleWakeupTool: ToolDefinition = {
     const delaySeconds = params.delaySeconds as number
     const prompt = (params.prompt as string) || ''
     const reason = (params.reason as string) || 'scheduled wakeup'
+    const noop = params.noop === true
 
     if (!delaySeconds || typeof delaySeconds !== 'number') {
       return {
@@ -86,6 +100,7 @@ export const scheduleWakeupTool: ToolDefinition = {
     const timerKey = `${sessionId}:wakeup`
     const timeoutId = setTimeout(() => {
       activeTimers.delete(timerKey)
+      wakeupHandler?.(sessionId, prompt, noop)
     }, delaySeconds * 1000)
 
     activeTimers.set(timerKey, timeoutId)