pikiclaw 0.3.69 → 0.3.71

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

@@ -356,6 +356,35 @@ export function detectClaudeBypassPrompt(screen) {
         && t.includes('yes,iaccept')
         && t.includes('no,exit');
 }
+/**
+ * Capture-only classifier for the stall watchdog. When the turn goes quiet we
+ * cannot tell from timing alone whether the TUI is (a) frozen mid-turn (the
+ * known CLI bug — PTY dead), (b) just thinking for a long time (PTY repaints a
+ * spinner), or (c) blocked on an interactive prompt that bypass mode does NOT
+ * suppress and that's waiting for input it will never get (trust-a-new-folder,
+ * a "Do you want to proceed?" confirmation, an expired-login prompt, …). The
+ * raw PTY screen is the only thing that disambiguates them, and we don't
+ * otherwise persist it — so on a stall we record a compact stripped sample plus
+ * a conservative "looks like an interactive prompt" flag. Changes no control
+ * flow; it exists purely to make the next stall diagnosable from data.
+ */
+export function classifyStallScreen(screen) {
+    if (typeof screen !== 'string' || !screen)
+        return { looksLikePrompt: false, sample: '' };
+    const stripped = stripAnsiEscapes(screen);
+    const sample = stripped.replace(/\s+/g, ' ').trim().slice(-400);
+    // Claude positions words with cursor moves, so the live screen is spaceless;
+    // match against the despaced form (see detectClaudeBypassPrompt).
+    const ds = stripped.replace(/\s+/g, '').toLowerCase();
+    const looksLikePrompt = ds.includes('esctocancel') // claude's confirm-dialog footer ("Enter to confirm · Esc to cancel")
+        || ds.includes('doyouwant')
+        || ds.includes('wouldyoulike')
+        || ds.includes('trustthisfolder')
+        || ds.includes('yes,iaccept')
+        || ds.includes('(y/n)')
+        || (ds.includes('❯') && ds.includes('1.') && ds.includes('2.')); // numbered select with cursor
+    return { looksLikePrompt, sample };
+}
 /**
  * Extract text / thinking blocks from an assistant JSONL event and route them:
  * text → the chunked stream buffer (slow drain), thinking → `s.thinking`
@@ -1601,6 +1630,9 @@ export async function doClaudeTuiStream(opts) {
                         stallDiagPtyAliveWhileQuiet = true;
                     if (nowMs - lastStallDiagHeartbeatAt >= STALL_DIAG_HEARTBEAT_INTERVAL_MS) {
                         lastStallDiagHeartbeatAt = nowMs;
+                        // Snapshot the screen so a quiet stretch can later be classified as
+                        // a frozen stream vs a long think vs a blocking interactive prompt.
+                        const screenInfo = classifyStallScreen(screenTail);
                         writeStallDiag({
                             kind: 'quiet',
                             sessionId: activeSessionId,
@@ -1616,6 +1648,8 @@ export async function doClaudeTuiStream(opts) {
                             pendingHookTools: pendingHookToolIds.size,
                             pendingBgAgents: pendingBgForStall,
                             pendingBgBash: pendingClaudeBackgroundBashCount(s),
+                            looksLikePrompt: screenInfo.looksLikePrompt,
+                            screenSample: screenInfo.sample,
                         });
                     }
                 }
@@ -1631,6 +1665,7 @@ export async function doClaudeTuiStream(opts) {
                 const quietMin = Math.round((Date.now() - lastProgressAt) / 60_000);
                 const ptyQuietS = Math.round((Date.now() - lastPtyDataAt) / 1000);
                 s.stopReason = 'stalled';
+                const stallScreen = classifyStallScreen(screenTail);
                 writeStallDiag({
                     kind: 'stall',
                     sessionId: activeSessionId,
@@ -1645,6 +1680,11 @@ export async function doClaudeTuiStream(opts) {
                     lastJsonlType: lastMainJsonlType,
                     pendingHookTools: pendingHookToolIds.size,
                     pendingBgAgents: pendingBgForStall,
+                    // looksLikePrompt=true here is the signal that the "stall" was really
+                    // a blocking interactive prompt waiting for input bypass can't skip —
+                    // the mid-turn dialog-hang hypothesis, confirmable from screenSample.
+                    looksLikePrompt: stallScreen.looksLikePrompt,
+                    screenSample: stallScreen.sample,
                 });
                 if (!s.errors) {
                     s.errors = [`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.`];

package/dist/bot/bot.js

@@ -1886,12 +1886,40 @@ export class Bot {
     }
     switchEffortForChat(chatId, effort) {
         const cs = this.chat(chatId);
-        this.setEffortForAgent(cs.agent, effort);
+        // "ultra" is a synthetic top rung in the effort picker, NOT a real --effort
+        // value (the claude CLI rejects anything outside low|medium|high|xhigh|max).
+        // It bundles "max reasoning depth + permit multi-agent Workflow
+        // orchestration" — the same pairing as Claude's own `ultracode` mode. Decode
+        // it here, the single apply choke point, so the rest of the pipeline only
+        // ever sees a concrete effort value plus the orthogonal workflow flag.
+        // Because the rungs are mutually exclusive, picking any concrete level also
+        // clears the workflow opt-in (capability-gated — only claude advertises it).
+        const ultra = effort === 'ultra';
+        const realEffort = ultra ? 'max' : effort;
+        this.setEffortForAgent(cs.agent, realEffort);
         const session = this.getSelectedSession(cs);
         if (session)
-            session.thinkingEffort = effort;
-        this.persistAgentPreference(cs.agent, 'effort', effort);
-        this.log(`effort switched to ${effort} for ${cs.agent} chat=${chatId}`);
+            session.thinkingEffort = realEffort;
+        this.persistAgentPreference(cs.agent, 'effort', realEffort);
+        if (getDriverCapabilities(cs.agent).workflow) {
+            this.setWorkflowEnabledForAgent(cs.agent, ultra);
+            this.persistAgentPreference(cs.agent, 'workflow', ultra ? '1' : '0');
+        }
+        this.log(`effort switched to ${effort} (effort=${realEffort}, workflow=${ultra}) for ${cs.agent} chat=${chatId}`);
+    }
+    /**
+     * Effort value to *display* in the picker. Workflow is orthogonal under the
+     * hood, but the UI folds "max depth + workflow on" into the single synthetic
+     * `ultra` rung (see {@link switchEffortForChat}), so report it as current when
+     * the agent has orchestration enabled. Mirrors the decomposition above.
+     */
+    effortSelectionForAgent(agent) {
+        const effort = this.effortForAgent(agent);
+        if (!effort)
+            return null;
+        if (getDriverCapabilities(agent).workflow && this.workflowEnabledForAgent(agent))
+            return 'ultra';
+        return effort;
     }
     switchPermissionModeForChat(chatId, mode) {
         const cs = this.chat(chatId);

package/dist/bot/command-ui.js

@@ -387,22 +387,20 @@ export function buildModeCommandView(bot, chatId) {
         ],
     ];
     const metaLines = [];
-    if (!isClaude && !supportsWorkflow)
+    if (!isClaude)
         metaLines.push('Permission mode is only available for Claude.');
+    // Workflow orchestration is no longer a standalone toggle here — it folded
+    // into the effort picker as the top "Ultra" rung (max depth + multi-agent
+    // fan-out). Surface its state and point users to /models so the capability
+    // stays discoverable.
     if (supportsWorkflow) {
-        metaLines.push(`Workflow orchestration: ${workflowOn ? 'On' : 'Off'} — multi-agent fan-out for large tasks.`);
-        rows.push([
-            { label: 'Workflow On', action: { kind: 'workflow.toggle', enabled: true },
-                state: workflowOn ? 'current' : 'default', primary: workflowOn },
-            { label: 'Workflow Off', action: { kind: 'workflow.toggle', enabled: false },
-                state: workflowOn ? 'default' : 'current', primary: !workflowOn },
-        ]);
+        metaLines.push(`Workflow orchestration: ${workflowOn ? 'On (Ultra effort)' : 'Off'} — pick the Ultra rung in /models to toggle.`);
     }
     return {
         kind: 'mode',
         title: 'Agent Mode',
         detail: `Current: ${isPlanMode ? 'Plan (read-only)' : 'Code (full access)'}`
-            + (supportsWorkflow ? ` · Workflow ${workflowOn ? 'On' : 'Off'}` : ''),
+            + (supportsWorkflow && workflowOn ? ' · Ultra (workflow)' : ''),
         metaLines,
         items: [],
         rows,
@@ -515,7 +513,7 @@ export async function executeCommandAction(bot, chatId, action, opts = {}) {
         }
         case 'effort.set': {
             const chat = bot.chat(chatId);
-            const currentEffort = bot.effortForAgent(chat.agent);
+            const currentEffort = bot.effortSelectionForAgent(chat.agent);
             if (action.effort === currentEffort) {
                 return { kind: 'noop', message: `Already using ${action.effort} effort` };
             }
@@ -552,7 +550,7 @@ export async function executeCommandAction(bot, chatId, action, opts = {}) {
             if (!draft)
                 return { kind: 'noop', message: 'No changes' };
             const currentModel = bot.modelForAgent(chat.agent);
-            const currentEffort = bot.effortForAgent(chat.agent);
+            const currentEffort = bot.effortSelectionForAgent(chat.agent);
             const currentProfileId = bot.activeProfileIdForAgent(chat.agent);
             const profileChanged = (draft.profileId || null) !== (currentProfileId || null);
             const modelChanged = profileChanged

package/dist/bot/commands.js

@@ -30,7 +30,7 @@ export function getStartData(bot, chatId) {
         .map(a => ({
         agent: a.agent,
         model: bot.modelForAgent(a.agent) || '(default)',
-        effort: bot.effortForAgent(a.agent),
+        effort: bot.effortSelectionForAgent(a.agent),
     }));
     return {
         ...intro,
@@ -373,6 +373,10 @@ const EFFORT_LEVELS = {
         { id: 'high', label: 'High' },
         { id: 'xhigh', label: 'Very High' },
         { id: 'max', label: 'Max' },
+        // Synthetic top rung: "max depth + multi-agent Workflow orchestration", the
+        // same bundle as Claude's `ultracode` mode. Not a real --effort value — the
+        // bot decomposes it into (effort=max, workflow=on) at apply time.
+        { id: 'ultra', label: 'Ultra' },
     ],
     codex: [
         { id: 'low', label: 'Low' },
@@ -389,7 +393,9 @@ const EFFORT_LEVELS = {
     ],
 };
 function buildEffortData(bot, agent) {
-    const currentEffort = bot.effortForAgent(agent);
+    // Display value folds workflow into the synthetic `ultra` rung — see
+    // Bot.effortSelectionForAgent.
+    const currentEffort = bot.effortSelectionForAgent(agent);
     if (!currentEffort)
         return null;
     const levels = EFFORT_LEVELS[agent];

package/dist/bot/render-shared.js

@@ -276,12 +276,6 @@ function renderSubAgentsForPreview(meta) {
     }
     return lines.join('\n');
 }
-/** After this much wall-clock, a still-running turn shows a text-only "still
- *  working" banner (see StreamPreviewData.longRunHint) so a long silent
- *  operation (held background task, slow command) doesn't read as a frozen
- *  card. Deliberately above the chunked-stream cadence so quick turns never
- *  flash it. */
-const LONG_RUN_HINT_AFTER_MS = 60_000;
 export function extractStreamPreviewData(input) {
     const maxBody = 2400;
     const display = input.bodyText.trim();
@@ -299,13 +293,6 @@ export function extractStreamPreviewData(input) {
     // freshly-opened card doesn't flash "0s".
     const elapsedMs = Math.max(0, input.elapsedMs);
     const thinkingProgressText = elapsedMs >= 1000 ? fmtCompactUptime(elapsedMs) : null;
-    // After a turn has run a while, a long silent operation (a held background
-    // task, a slow command) can make the card look frozen. Surface a text-only
-    // "still working" line so the user knows it's alive and can switch away. No
-    // elapsed time here — the footer keeps the single clock, so no second timer.
-    const longRunHint = elapsedMs >= LONG_RUN_HINT_AFTER_MS
-        ? '⏳ Still working — the result will update in this card'
-        : null;
     return {
         display,
         rawThinking,
@@ -318,6 +305,5 @@ export function extractStreamPreviewData(input) {
         thinkSnippet,
         preview,
         thinkingProgressText,
-        longRunHint,
     };
 }

package/dist/channels/feishu/render.js

@@ -246,8 +246,6 @@ function buildPreviewMarkdown(input, options) {
         // heartbeat, so the card still visibly advances.
         parts.push(`**${data.label}**`);
     }
-    if (data.longRunHint)
-        parts.push(data.longRunHint);
     if (options?.includeFooter !== false) {
         parts.push(formatPreviewFooter(input.agent, input.elapsedMs, input.meta ?? null, {
             model: input.model,

package/dist/channels/telegram/render.js

@@ -345,8 +345,6 @@ export function buildStreamPreviewHtml(input) {
         // heartbeat, so the card still visibly advances.
         parts.push(`<blockquote><b>${escapeHtml(data.label)}</b></blockquote>`);
     }
-    if (data.longRunHint)
-        parts.push(`<i>${escapeHtml(data.longRunHint)}</i>`);
     parts.push(formatPreviewFooterHtml(input.agent, input.elapsedMs, input.meta ?? null, {
         model: input.model,
         effort: input.effort,

package/package.json

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