s-app-scoder-agent 0.8.20 → 0.9.2

package/dist/tui/state.js

@@ -20,6 +20,14 @@ export function initialState() {
         phases: [],
         mcpServers: {},
         streamingOutputChars: 0,
+        streamStartedAt: null,
+        llmCallStartedAt: null,
+        lastLlmTokPerSec: null,
+        agent: "build",
+        context: null,
+        queue: { pending: 0, steering: 0 },
+        verification: null,
+        subagents: [],
     };
 }
 const MAX_ITEMS = 400;
@@ -41,6 +49,8 @@ export function estimateItemRows(item) {
             return 1 + Math.ceil((item.text?.length ?? 0) / 80) + (item.text ? item.text.split("\n").length : 0);
         case "tool":
             return 1 + 2; // title + preview 2 lines
+        case "compaction":
+            return 1;
         case "diff":
             return 3 + Math.min(24, (item.text?.split("\n").length ?? 0)); // header + ≤24 lines + border
         case "todo":
@@ -111,12 +121,18 @@ function capTail(text, max = MAX_OUTPUT_CHARS) {
 export function toolPhase(name) {
     if (name === "write_todos")
         return "plan";
-    if (name === "list_files" || name === "read_file" || name === "web_fetch" || name === "load_skill")
+    if (name === "list_files" || name === "read_file" || name === "grep" || name === "glob" || name === "web_fetch" || name === "load_skill" || name === "repo_map")
         return "explore";
-    if (name === "write_file" || name === "edit_file")
+    if (name === "write_file" || name === "edit_file" || name === "apply_patch")
         return "edit";
     if (name === "run_command")
         return "build";
+    if (name === "task")
+        return "delegate";
+    if (name === "ask_user")
+        return "clear";
+    if (name.startsWith("mcp__"))
+        return "mcp";
     return null;
 }
 /** Guardrail event: đếm + giữ decision gần nhất (ngắn, tự giải thích cho header). */
@@ -156,6 +172,11 @@ export function applyEvent(state, ev) {
             state.buildCmd = ev.buildCmd;
             state.buildLamp = "none";
             state.permission = ev.permission;
+            state.agent = ev.agent ?? "build";
+            state.context = null;
+            state.queue = { pending: 0, steering: 0 };
+            state.verification = null;
+            state.subagents = [];
             state.startedAt = Date.now();
             state.endedAt = null;
             state.status = "running";
@@ -167,6 +188,9 @@ export function applyEvent(state, ev) {
             state.lastGuardrail = null;
             state.phases = [];
             state.streamingOutputChars = 0;
+            state.streamStartedAt = null;
+            state.llmCallStartedAt = null;
+            state.lastLlmTokPerSec = null;
             // The TUI pushes the user's message itself when submitting; avoid a
             // duplicate when run_start carries the same task.
             const last = lastItem(state);
@@ -194,6 +218,10 @@ export function applyEvent(state, ev) {
         case "step": {
             state.step = ev.step;
             state.maxSteps = ev.maxSteps;
+            // New LLM turn: reset per-stream tracking.
+            state.streamingOutputChars = 0;
+            state.streamStartedAt = null;
+            state.llmCallStartedAt = Date.now();
             // A new step starts: close any still-"streaming" assistant message.
             const last = lastItem(state);
             if (last && last.kind === "assistant" && last.streaming)
@@ -203,6 +231,9 @@ export function applyEvent(state, ev) {
             break;
         }
         case "llm_delta": {
+            if (state.streamStartedAt == null) {
+                state.streamStartedAt = state.llmCallStartedAt ?? Date.now();
+            }
             state.streamingOutputChars += ev.delta.length;
             const last = lastItem(state);
             if (last && last.kind === "assistant" && last.streaming) {
@@ -226,6 +257,17 @@ export function applyEvent(state, ev) {
             state.usage.inputTokens += ev.usage.input_tokens ?? 0;
             state.usage.outputTokens += ev.usage.output_tokens ?? 0;
             state.usage.cachedTokens += ev.usage.cached_tokens ?? 0;
+            // Per-call speed from the actual call duration, not the whole run.
+            const start = state.streamStartedAt ?? state.llmCallStartedAt;
+            if (start != null) {
+                const elapsedMs = Math.max(1, Date.now() - start);
+                const out = ev.usage.output_tokens ?? 0;
+                if (out > 0) {
+                    state.lastLlmTokPerSec = Math.round(out / (elapsedMs / 1000));
+                }
+            }
+            state.streamingOutputChars = 0;
+            state.streamStartedAt = null;
             break;
         }
         case "tool_call": {
@@ -320,10 +362,67 @@ export function applyEvent(state, ev) {
             appendItem(state, { kind: "notice", text: ev.line, level: ev.line.includes("unavailable") ? "warn" : "info" });
             break;
         }
+        case "steer_queued": {
+            // Pending depth tracked via the absolute `queue` event; nothing else.
+            state.queue = { ...state.queue, pending: state.queue.pending + 1, steering: state.queue.steering + (ev.mode === "steer" ? 1 : 0) };
+            break;
+        }
+        case "steer_delivered": {
+            state.queue = { pending: 0, steering: 0 };
+            appendItem(state, { kind: "notice", text: `steer: ${ev.count} message(s) delivered`, level: "info" });
+            break;
+        }
+        case "queue": {
+            state.queue = { pending: ev.pending, steering: ev.steering };
+            break;
+        }
+        case "compaction": {
+            appendItem(state, { kind: "compaction", tokensBefore: ev.tokensBefore, tokensAfter: ev.tokensAfter, manual: ev.manual });
+            break;
+        }
+        case "context": {
+            state.context = { tokens: ev.tokens, window: ev.window, pct: ev.pct };
+            break;
+        }
+        case "agent_start": {
+            // Track in the tree list; rendering lands in the sidebar (Phase 7).
+            const rest = state.subagents.filter((s) => s.id !== ev.id);
+            rest.push({ id: ev.id, name: ev.name, description: ev.description, status: "running" });
+            state.subagents = rest.slice(-20);
+            break;
+        }
+        case "agent_end": {
+            state.subagents = state.subagents.map((s) => s.id === ev.id ? { ...s, status: ev.ok ? "ok" : "failed", steps: ev.steps, summary: ev.summary } : s);
+            break;
+        }
+        case "tool_progress": {
+            // Attach latest progress message to the running tool card (if any).
+            for (let i = state.items.length - 1; i >= 0; i--) {
+                const it = state.items[i];
+                if (it.kind === "tool" && it.ok === null && (it.callId === ev.id || it.name === ev.name)) {
+                    if (ev.message)
+                        it.output = capTail(`${it.output}\n… ${ev.message}`.trim());
+                    break;
+                }
+                if (it.kind === "tool")
+                    break;
+            }
+            break;
+        }
+        case "question_request": {
+            // Surfaced via the dedicated ask_user modal (Phase 3/7); queue a notice
+            // so the transcript isn't silent while waiting for user input.
+            appendItem(state, { kind: "notice", text: `❓ ${ev.question}`, level: "info" });
+            break;
+        }
         case "finish": {
             state.status = ev.success ? "success" : /interrupted|aborted/i.test(ev.summary) ? "aborted" : "failed";
             state.summary = ev.summary;
             state.endedAt = Date.now();
+            if (ev.usage)
+                state.usage = { ...ev.usage };
+            if (ev.verification)
+                state.verification = { ...ev.verification };
             // Close ALL dangling streaming assistant messages — not just the last
             // item: a notice/tool item appended after the assistant text would
             // otherwise leave it stuck in raw streaming mode (invisible text).

package/dist/tui/theme.js

@@ -37,6 +37,10 @@ export const THEMES = {
     light: LIGHT, "high-contrast": HIGH_CONTRAST, solarized: SOLARIZED,
 };
 export function defaultThemeName(env = process.env) {
+    if (env.SCODER_THEME && THEMES[env.SCODER_THEME])
+        return env.SCODER_THEME;
+    if (env.SCODER_PLAIN === "1" || env.NO_COLOR === "1" || process.env.NO_COLOR === "1")
+        return "mono";
     if (env.TERM === "dumb" || !env.TERM)
         return "mono";
     if (env.COLOR_COUNT && Number(env.COLOR_COUNT) < 16)

package/dist/tui/transcript.js

@@ -0,0 +1,145 @@
+// ── Export ────────────────────────────────────────────────────────────────────
+/** Render a ChatItem to its plain-text representation for export. */
+export function itemToText(item) {
+    switch (item.kind) {
+        case "user": return `## you\n\n${item.text}`;
+        case "assistant": return `## agent\n\n${item.text}`;
+        case "thinking": return `## thinking\n\n${item.text}`;
+        case "tool": {
+            const args = Object.entries(item.args).map(([k, v]) => `  ${k}=${JSON.stringify(v)}`).join("\n");
+            const elapsed = item.durationMs != null ? ` (${item.durationMs}ms)` : "";
+            const status = item.ok === null ? "running" : item.ok ? "ok" : "FAILED";
+            return `## tool: ${item.name}${elapsed}\n\n${status}${args ? "\n" + args : ""}\n\n${item.output}`;
+        }
+        case "diff":
+            return `## diff: ${item.path} (+${item.added}/-${item.removed})\n\n${item.text}`;
+        case "build":
+            return `## build: ${item.command}\n\n${item.success ? "✓ passed" : "✗ FAILED"}`;
+        case "todo": {
+            const rows = item.items.map((t) => `- [${t.status === "completed" ? "x" : t.status === "in_progress" ? ">" : " "}] ${t.content}`);
+            return `## plan\n\n${rows.join("\n")}`;
+        }
+        case "compaction":
+            return `## compacted (${item.tokensBefore} → ${item.tokensAfter} tokens)${item.manual ? " [manual]" : ""}`;
+        case "notice":
+            return `${item.level === "error" ? "✗" : item.level === "warn" ? "⚠" : ""} ${item.text}`;
+    }
+}
+/** Format a chat item as Markdown (GitHub-flavored). */
+export function itemToMarkdown(item) {
+    const ts = item.kind === "tool" ? `[${item.step.toString().padStart(2, "0")}]` : "";
+    switch (item.kind) {
+        case "user":
+            return `## you\n\n> ${item.text}`;
+        case "assistant":
+            return `## agent\n\n${item.text}`;
+        case "thinking":
+            return `> ⊙ ${item.text.split("\n").slice(-4).join(" | ")}`;
+        case "tool": {
+            const elapsed = item.durationMs != null ? ` — ${(item.durationMs / 1000).toFixed(1)}s` : "";
+            const ok = item.ok === null ? "⏳ running" : item.ok ? "✅" : "❌";
+            const args = Object.keys(item.args).length > 0
+                ? `\`${item.name}(${Object.entries(item.args).map(([k, v]) => `${k}=${JSON.stringify(v)}`).join(", ")})\``
+                : `\`${item.name}\``;
+            return `${ts} ${ok} **${args}**${elapsed}\n\n\`\`\`\n${item.output}\n\`\`\``;
+        }
+        case "diff":
+            return `${ts} ✎ \`${item.path}\` \`+${item.added}/-${item.removed}\`\n\`\`\`diff\n${item.text}\n\`\`\``;
+        case "build":
+            return `${item.success ? "✅" : "❌"} **build**: \`${item.command}\``;
+        case "todo": {
+            const rows = item.items.map((t) => `- [${t.status === "completed" ? "x" : t.status === "in_progress" ? ">" : " "}] ${t.content}`);
+            return `## plan\n\n${rows.join("\n")}`;
+        }
+        case "compaction":
+            return `\n---\n*compacted: ${item.tokensBefore} → ${item.tokensAfter} tokens*${item.manual ? " (manual)" : ""}\n---\n`;
+        case "notice":
+            return `${item.level === "error" ? "> ❌" : item.level === "warn" ? "> ⚠" : ">"} ${item.text}`;
+    }
+}
+/** Export transcript to the requested format. */
+export function exportTranscript(items, format = "md") {
+    if (format === "json") {
+        return JSON.stringify(items, null, 2);
+    }
+    return items.map(itemToMarkdown).join("\n\n");
+}
+/** Case-insensitive search over transcript items.
+ *  Returns all items whose text representation matches `query`.
+ *  Searches: assistant/thinking text, tool name+output, diff path+text, notice text.
+ */
+export function findInTranscript(items, query) {
+    if (!query.trim())
+        return [];
+    const lc = query.toLowerCase();
+    const results = [];
+    for (let i = 0; i < items.length; i++) {
+        const item = items[i];
+        const matched = (text) => text.toLowerCase().includes(lc);
+        let hit = false;
+        let snippet = "";
+        switch (item.kind) {
+            case "assistant":
+            case "thinking":
+                if (matched(item.text)) {
+                    hit = true;
+                    snippet = snippetOf(item.text, query);
+                }
+                break;
+            case "tool":
+                if (matched(item.name) || matched(item.output) || matched(JSON.stringify(item.args))) {
+                    hit = true;
+                    snippet = snippetOf(`${item.name}: ${item.output}`, query);
+                }
+                break;
+            case "diff":
+                if (matched(item.path) || matched(item.text)) {
+                    hit = true;
+                    snippet = snippetOf(`${item.path} · ${item.text}`, query);
+                }
+                break;
+            case "user":
+                if (matched(item.text)) {
+                    hit = true;
+                    snippet = snippetOf(item.text, query);
+                }
+                break;
+            case "notice":
+                if (matched(item.text)) {
+                    hit = true;
+                    snippet = snippetOf(item.text, query);
+                }
+                break;
+            case "build":
+                if (matched(item.command)) {
+                    hit = true;
+                    snippet = snippetOf(item.command, query);
+                }
+                break;
+            default:
+                break;
+        }
+        if (hit)
+            results.push({ index: i, kind: item.kind, snippet });
+    }
+    return results;
+}
+/** Return a ~120-char snippet around the first occurrence of `query` in `text`. */
+function snippetOf(text, query) {
+    const pos = text.toLowerCase().indexOf(query.toLowerCase());
+    if (pos === -1)
+        return text.slice(0, 120);
+    const start = Math.max(0, pos - 40);
+    const end = Math.min(text.length, pos + query.length + 80);
+    return (start > 0 ? "…" : "") + text.slice(start, end) + (end < text.length ? "…" : "");
+}
+// ── Copy ─────────────────────────────────────────────────────────────────────
+/** Return the copyable text for a chat item (for clipboard). */
+export function copyTextForItem(item) {
+    switch (item.kind) {
+        case "diff": return item.text;
+        case "tool": return item.output;
+        case "assistant": return item.text;
+        default: return itemToText(item);
+    }
+}

package/dist/watch.js

@@ -29,6 +29,14 @@ export function watchWorkdir(workdir, onChange) {
         }
         catch { /* race — file removed between existsSync and watch */ }
     }
+    // Watch the parent too so a skills directory created after startup is seen.
+    const scoderDir = join(workdir, ".scoder");
+    if (existsSync(scoderDir)) {
+        try {
+            watchers.push(watch(scoderDir, () => fire("skills")));
+        }
+        catch { /* ignore */ }
+    }
     // .scoder/skills/ — skill files added/removed/edited.
     const skillsDir = join(workdir, ".scoder", "skills");
     if (existsSync(skillsDir)) {

package/dist/webfetch.js

@@ -39,8 +39,8 @@ function isPrivateAddress(ip) {
         const lower = ip.toLowerCase();
         if (lower === "::1" || lower === "::")
             return true;
-        if (lower.startsWith("fe80"))
-            return true; // link-local
+        if (/^fe[89ab][0-9a-f]{2}:/.test(lower))
+            return true; // link-local fe80::/10
         if (/^f[cd][0-9a-f]{2}:/.test(lower))
             return true; // unique local fc00::/7
         // IPv4-mapped ::ffff:10.0.0.1
@@ -166,6 +166,9 @@ export async function toolWebFetch(ctx, args) {
             if (signal.aborted) {
                 return { ok: false, output: `ERROR: fetch aborted (${signal.reason?.message ?? "aborted"})` };
             }
+            if (current.protocol !== "http:" && current.protocol !== "https:") {
+                return { ok: false, output: `ERROR: redirect target uses unsupported protocol ${current.protocol}` };
+            }
             await assertPublicHost(current.hostname);
             const res = await fetch(current, {
                 method: "GET",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s-app-scoder-agent",
-  "version": "0.8.20",
+  "version": "0.9.2",
   "description": "Autonomous coding agent CLI — writes, edits, and builds code autonomously until the project compiles without errors.",
   "type": "module",
   "main": "dist/index.js",