pikiclaw 0.3.73 → 0.3.75

package/dist/agent/drivers/claude-tui.js

@@ -45,7 +45,7 @@ import { encodePathAsDirName, getHome, whichSync } from '../../core/platform.js'
 import { createRetainedLogSink } from '../../core/logging.js';
 import { stripAnsiEscapes } from '../../core/utils.js';
 import { AGENT_STREAM_HARD_KILL_GRACE_MS, CLAUDE_TUI_STALL_QUIET_MS, CLAUDE_TUI_STALL_PENDING_TOOL_MS, CLAUDE_TUI_STALL_PTY_DEAD_MS, CLAUDE_TUI_STOP_HOLD_QUIET_TTL_MS, } from '../../core/constants.js';
-import { claudeParse, createClaudeStreamState, claudeContextWindowFromModel, claudeEffectiveContextWindow, registerClaudeBackgroundAgentLaunch, pendingClaudeBackgroundAgentCount, registerClaudeBackgroundBashLaunch, pendingClaudeBackgroundBashCount, extractClaudeBackgroundTaskId, extractClaudeWorkflowRunId, } from './claude.js';
+import { claudeParse, createClaudeStreamState, claudeContextWindowFromModel, claudeEffectiveContextWindow, registerClaudeBackgroundAgentLaunch, pendingClaudeBackgroundAgentCount, registerClaudeBackgroundBashLaunch, pendingClaudeBackgroundBashCount, extractClaudeBackgroundTaskId, extractClaudeWorkflowRunId, claudeEffortAndWorkflowArgs, } from './claude.js';
 // ---------------------------------------------------------------------------
 // Stall diagnostics (capture-only)
 // ---------------------------------------------------------------------------
@@ -323,6 +323,32 @@ export function detectClaudeTuiTerminalLimitNotice(msgOrText) {
         return null;
     return limitNoticeFromText(extractTextBlocks(msgOrText.content));
 }
+/**
+ * Evidence-based arbitration for a detected limit notice. The banner text is
+ * deliberately matched broadly (wording shifts across CLI versions and some
+ * notices are informational — "You're now using usage credits · Your session
+ * limit resets 3pm" means the turn CONTINUES on extra-usage credits), so a
+ * match alone must never fail the turn. What decides the outcome is whether
+ * the turn produced anything substantive after the banner:
+ *
+ *  - 'info'  — assistant text exists, or a substantive signal (non-synthetic
+ *              assistant JSONL, hook tool event, sub-agent sidecar) postdates
+ *              the notice. The turn is alive; the notice is informational.
+ *  - 'fatal' — nothing substantive after the banner. The limit genuinely ate
+ *              the turn; surface the banner text as a rate_limit failure.
+ *  - 'none'  — no notice was seen.
+ *
+ * Worst case of the broad matching is therefore an activity line, not a
+ * killed turn (the bug this replaced: the credits banner used to SIGTERM the
+ * process mid-answer).
+ */
+export function resolveClaudeTuiLimitOutcome(input) {
+    if (!input.noticeText)
+        return 'none';
+    if (input.hasOutputText || input.lastSubstantiveEventAt > input.noticeAt)
+        return 'info';
+    return 'fatal';
+}
 /**
  * Detect Claude Code's startup "Bypass Permissions mode" confirmation dialog in
  * a slice of (ANSI-stripped) PTY screen output. When pikiclaw spawns the TUI
@@ -976,8 +1002,9 @@ export async function doClaudeTuiStream(opts) {
         claudeArgs.push('--model', model);
     if (opts.claudePermissionMode)
         claudeArgs.push('--permission-mode', opts.claudePermissionMode);
-    if (opts.thinkingEffort)
-        claudeArgs.push('--effort', opts.thinkingEffort);
+    // Effort + Workflow gate — same source of truth as the `claude -p` driver, so
+    // the TUI path drops the Workflow tool unless orchestration was opted in.
+    claudeArgs.push(...claudeEffortAndWorkflowArgs(opts));
     if (opts.claudeAppendSystemPrompt)
         claudeArgs.push('--append-system-prompt', opts.claudeAppendSystemPrompt);
     if (opts.mcpConfigPath)
@@ -1048,6 +1075,7 @@ export async function doClaudeTuiStream(opts) {
     let exitCode = null;
     let exitSignal = null;
     let terminalLimitNotice = null;
+    let terminalLimitNoticeAt = 0;
     let proc;
     const emit = () => {
         try {
@@ -1069,16 +1097,20 @@ export async function doClaudeTuiStream(opts) {
             }
         }, after);
     };
-    const markTerminalLimitNotice = (notice) => {
+    // Record-only: a limit banner is EVIDENCE, not a verdict. Some banners are
+    // informational (extra-usage credits kick in and the turn continues), so
+    // killing here would shoot healthy turns. resolveClaudeTuiLimitOutcome
+    // arbitrates later — at the stall watchdog and at result assembly — based
+    // on whether the turn produced anything substantive after the banner.
+    const noteTerminalLimitNotice = (notice) => {
         if (terminalLimitNotice)
             return;
         terminalLimitNotice = notice;
-        s.stopReason = 'rate_limit';
-        s.errors = [notice];
-        agentWarn(`[claude-tui] terminal limit notice detected: ${notice}`);
+        terminalLimitNoticeAt = Date.now();
+        agentWarn(`[claude-tui] limit notice observed (watching turn liveness): ${notice}`);
+        pushRecentActivity(s.recentActivity, `Claude usage notice: ${notice}`);
+        s.activity = s.recentActivity.join('\n');
         emit();
-        if (!processExited)
-            killProc('SIGTERM', 1500);
     };
     // Simulated streaming. See TuiStreamBuffer / applyAssistantStreaming above.
     const streamBuf = makeTuiStreamBuffer();
@@ -1317,7 +1349,7 @@ export async function doClaudeTuiStream(opts) {
                 stderrCapture = stderrCapture.slice(0, 4096);
             const notice = detectClaudeTuiTerminalLimitNotice(stderrCapture);
             if (notice)
-                markTerminalLimitNotice(notice);
+                noteTerminalLimitNotice(notice);
         }
     });
     // 7. Abort handling.
@@ -1367,6 +1399,11 @@ export async function doClaudeTuiStream(opts) {
     // decideClaudeTuiStall for why this exists (claude CLI mid-turn freeze).
     let lastToolEventAt = start;
     let lastSidecarEventAt = 0;
+    // Last non-synthetic assistant JSONL event — substantive-progress signal
+    // for the limit-notice arbitration (resolveClaudeTuiLimitOutcome). Distinct
+    // from lastMainJsonlEventAt, which also counts bookkeeping lines (mode,
+    // last-prompt, …) that land right after submit and prove nothing.
+    let lastAssistantEventAt = 0;
     let stallKilled = false;
     // Stall diagnostics (capture-only) — see writeStallDiag.
     let observedClaudeVersion = '';
@@ -1590,13 +1627,14 @@ export async function doClaudeTuiStream(opts) {
                 if (!isSubAgentEvent && ev.type === 'assistant') {
                     const notice = detectClaudeTuiTerminalLimitNotice(ev.message);
                     if (notice) {
-                        markTerminalLimitNotice(notice);
+                        noteTerminalLimitNotice(notice);
                         touched = true;
                         continue;
                     }
                     applyAssistantStreaming(s, ev.message, streamBuf);
                     applyAssistantUsage(s, ev.message);
                     if (ev.message?.model && ev.message.model !== '<synthetic>' && typeof ev.message.model === 'string') {
+                        lastAssistantEventAt = Date.now();
                         s.model = ev.message.model;
                         applyModelContextWindow(s);
                     }
@@ -1788,15 +1826,34 @@ export async function doClaudeTuiStream(opts) {
                     screenSample: stallScreen.sample,
                 });
                 if (!s.errors) {
-                    // Be honest about which kind of stall this is. looksLikePrompt here
-                    // means the auto-answer (detectClaudeProceedPrompt) did NOT clear an
-                    // interactive prompt — so it's a blocking dialog, not the CLI freeze.
-                    s.errors = [stallScreen.looksLikePrompt
-                            ? `Claude blocked mid-turn on an interactive prompt (PTY quiet ${ptyQuietS}s) that auto-answer couldn't clear. Terminated for auto-resume.`
-                            : `Claude process went silent mid-turn for ${quietMin}m (no JSONL, hook, or sub-agent events; PTY quiet ${ptyQuietS}s) — known claude CLI freeze. Terminated for auto-resume.`];
+                    // Limit-notice arbitration first: a turn that showed a limit banner
+                    // and then produced nothing substantive didn't freeze — the limit
+                    // ate it. Label it rate_limit with the banner's own text (which
+                    // carries the reset time) so the user gets the real reason, and so
+                    // doClaudeWithRetry doesn't auto-resume into the same wall.
+                    const limitOutcome = resolveClaudeTuiLimitOutcome({
+                        noticeText: terminalLimitNotice,
+                        noticeAt: terminalLimitNoticeAt,
+                        lastSubstantiveEventAt: Math.max(lastAssistantEventAt, lastToolEventAt, lastSidecarEventAt),
+                        hasOutputText: !!s.text.trim(),
+                    });
+                    if (limitOutcome === 'fatal') {
+                        s.stopReason = 'rate_limit';
+                        s.errors = [terminalLimitNotice];
+                    }
+                    else {
+                        // Be honest about which kind of stall this is. looksLikePrompt here
+                        // means the auto-answer (detectClaudeProceedPrompt) did NOT clear an
+                        // interactive prompt — so it's a blocking dialog, not the CLI freeze.
+                        s.errors = [stallScreen.looksLikePrompt
+                                ? `Claude blocked mid-turn on an interactive prompt (PTY quiet ${ptyQuietS}s) that auto-answer couldn't clear. Terminated for auto-resume.`
+                                : `Claude process went silent mid-turn for ${quietMin}m (no JSONL, hook, or sub-agent events; PTY quiet ${ptyQuietS}s) — known claude CLI freeze. Terminated for auto-resume.`];
+                    }
                 }
-                agentWarn(`[claude-tui] stall detected: no progress for ${quietMin}m (pendingTools=${pendingHookToolIds.size}, ptyQuiet=${ptyQuietS}s) — terminating TUI pid=${proc.pid} for auto-resume`);
-                pushRecentActivity(s.recentActivity, `Agent stalled (${quietMin}m silent) — restarting turn`);
+                agentWarn(`[claude-tui] stall detected: no progress for ${quietMin}m (pendingTools=${pendingHookToolIds.size}, ptyQuiet=${ptyQuietS}s) — terminating TUI pid=${proc.pid}${s.stopReason === 'rate_limit' ? ' (usage limit)' : ' for auto-resume'}`);
+                pushRecentActivity(s.recentActivity, s.stopReason === 'rate_limit'
+                    ? 'Usage limit blocked the turn — stopping'
+                    : `Agent stalled (${quietMin}m silent) — restarting turn`);
                 s.activity = s.recentActivity.join('\n');
                 emit();
                 killProc('SIGTERM');
@@ -1845,13 +1902,14 @@ export async function doClaudeTuiStream(opts) {
             if (!isSubAgentEvent && ev.type === 'assistant') {
                 const notice = detectClaudeTuiTerminalLimitNotice(ev.message);
                 if (notice) {
-                    markTerminalLimitNotice(notice);
+                    noteTerminalLimitNotice(notice);
                     touched = true;
                     continue;
                 }
                 applyAssistantStreaming(s, ev.message, streamBuf);
                 applyAssistantUsage(s, ev.message);
                 if (ev.message?.model && ev.message.model !== '<synthetic>' && typeof ev.message.model === 'string') {
+                    lastAssistantEventAt = Date.now();
                     s.model = ev.message.model;
                     applyModelContextWindow(s);
                 }
@@ -1908,6 +1966,23 @@ export async function doClaudeTuiStream(opts) {
         if (!s.errors)
             s.errors = [`Anthropic API error: ${apiErrorReason}`];
     }
+    // Limit-notice arbitration (see resolveClaudeTuiLimitOutcome). Covers the
+    // paths the stall watchdog never reaches: the TUI painted a limit banner,
+    // then Stop fired on an empty turn or the process exited — nothing
+    // substantive ever followed the banner, so the limit ate the turn. A banner
+    // followed by real output stays informational (already in the activity log).
+    if (!interrupted && !timedOut && !s.errors) {
+        const limitOutcome = resolveClaudeTuiLimitOutcome({
+            noticeText: terminalLimitNotice,
+            noticeAt: terminalLimitNoticeAt,
+            lastSubstantiveEventAt: Math.max(lastAssistantEventAt, lastToolEventAt, lastSidecarEventAt),
+            hasOutputText: !!s.text.trim(),
+        });
+        if (limitOutcome === 'fatal') {
+            s.stopReason = 'rate_limit';
+            s.errors = [terminalLimitNotice];
+        }
+    }
     const errorText = joinErrorMessages(s.errors);
     // "ok" requires: process exited cleanly (or via our own SIGTERM after Stop
     // hook fired, which yields a non-zero exit), no errors from the parser, no

package/dist/agent/drivers/claude.js

@@ -42,6 +42,29 @@ function claudeUsesStreamJsonInput(o) {
     return !!o.attachments?.length || !!o.onSteerReady;
 }
 const CLAUDE_STEER_IDLE_CLOSE_MS = 1200;
+/**
+ * Effort + multi-agent-Workflow gate args, shared by BOTH Claude spawn paths
+ * (`claude -p` in claudeCmd below and the PTY/TUI driver in claude-tui.ts).
+ * Kept in one place so the gate can never drift between them — the omission
+ * that once left the Workflow tool always-on under the TUI driver.
+ *
+ * "ultra" is a synthetic picker rung (max depth + Workflow orchestration), never
+ * a real --effort value — translate it to `max` so a stray "ultra" can't reach
+ * and break the CLI, and treat it as an implicit workflow opt-in. The Workflow
+ * tool ships in the default toolset and triggers on a bare "workflow" keyword;
+ * under the bypassPermissions mode pikiclaw runs by default that could auto-spawn
+ * a fleet of sub-agents, so drop it entirely unless orchestration was explicitly
+ * enabled (the workflow flag or the "ultra" rung).
+ */
+export function claudeEffortAndWorkflowArgs(o) {
+    const args = [];
+    const ultraEffort = o.thinkingEffort === 'ultra';
+    if (o.thinkingEffort)
+        args.push('--effort', ultraEffort ? 'max' : o.thinkingEffort);
+    if (!o.claudeWorkflowEnabled && !ultraEffort)
+        args.push('--disallowed-tools', 'Workflow');
+    return args;
+}
 // ---------------------------------------------------------------------------
 // Command & parser
 // ---------------------------------------------------------------------------
@@ -70,21 +93,9 @@ function claudeCmd(o) {
         if (o.attachments?.length)
             o._stdinOverride = buildClaudeUserMessage(o.prompt, o.attachments);
     }
-    // "ultra" is a synthetic picker rung (max depth + Workflow orchestration),
-    // never a real --effort value. The effort-write paths decompose it upstream;
-    // translate defensively here too so a stray "ultra" can never reach — and
-    // break — the CLI, and so it never suppresses the Workflow tool below.
-    const ultraEffort = o.thinkingEffort === 'ultra';
-    if (o.thinkingEffort)
-        args.push('--effort', ultraEffort ? 'max' : o.thinkingEffort);
-    // Multi-agent Workflow gate. The Workflow tool is always present in the
-    // toolset and triggers on a bare "workflow" keyword — combined with the
-    // bypassPermissions mode pikiclaw runs by default, that means an offhand
-    // mention could auto-spawn a fleet of sub-agents. Unless orchestration is
-    // explicitly enabled, drop the tool entirely so it can't fire at all. When
-    // enabled, the bot injects a standing opt-in directive via the system prompt.
-    if (!o.claudeWorkflowEnabled && !ultraEffort)
-        args.push('--disallowed-tools', 'Workflow');
+    // Effort + Workflow gate — shared with the TUI driver (claude-tui.ts) so the
+    // two spawn paths can never drift. See claudeEffortAndWorkflowArgs.
+    args.push(...claudeEffortAndWorkflowArgs(o));
     if (o.claudeAppendSystemPrompt)
         args.push('--append-system-prompt', o.claudeAppendSystemPrompt);
     if (o.mcpConfigPath)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pikiclaw",
-  "version": "0.3.73",
+  "version": "0.3.75",
   "description": "Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via IM. | 让最好用的 IM 变成你电脑上的顶级 Agent 控制台",
   "type": "module",
   "bin": {