@datename/fastcode-termux 0.1.6-beta → 0.1.8-beta.0

package/src/agent/approval.ts

@@ -17,10 +17,10 @@ export type ApprovalPreview =
   | { kind: "choices"; items: ChoiceItem[] };
 
 export type ApprovalOption =
-  | { kind: "allow"; scope: ApprovalScope; label: string }
-  | { kind: "deny"; label: string }
-  | { kind: "choose"; label: string; value: string }
-  | { kind: "feedback"; label: string; prompt: string };
+  | { kind: "allow"; id?: string; scope: ApprovalScope; label: string }
+  | { kind: "deny"; id?: string; label: string }
+  | { kind: "choose"; id?: string; label: string; value: string; meta?: { recommended?: boolean; risk?: string; files?: number; reason?: string } }
+  | { kind: "feedback"; id?: string; label: string; prompt: string };
 
 export interface ApprovalRequest {
   id: string;
@@ -29,19 +29,66 @@ export interface ApprovalRequest {
   reason: ApprovalReason;
   options: ApprovalOption[];
   preview?: ApprovalPreview;
+  tier?: 0 | 1 | 2 | 3;
+  prompt?: string;
+  source?: "system" | "ai" | "free";
+  defaultIndex?: number;
+  timeoutMs?: number;
+  freeInput?: { enabled: true; prompt: string; hint?: string };
 }
 
 export type ApprovalDecision =
   | { kind: "allow"; scope: ApprovalScope }
-  | { kind: "deny"; reason?: string; feedback?: string }
-  | { kind: "pending"; request: ApprovalRequest };
+  | { kind: "deny"; reason?: string; feedback?: string; code?: string; target?: string }
+  | { kind: "pending"; request: ApprovalRequest }
+  | { kind: "choose"; value: string; input?: string }
+  | { kind: "feedback"; text: string };
 
 export type ApprovalResolver = (request: ApprovalRequest) => ApprovalDecision | Promise<ApprovalDecision>;
 
 export const DEFAULT_ALLOW_OPTIONS: ApprovalOption[] = [
-  { kind: "allow", scope: "once", label: "Allow once" },
-  { kind: "allow", scope: "session", label: "Allow for this session" },
-  { kind: "allow", scope: "always", label: "Always allow" },
-  { kind: "deny", label: "Deny" },
-  { kind: "feedback", label: "Deny with feedback", prompt: "Why should this be denied?" },
+  { kind: "allow", id: "allow-once", scope: "once", label: "Allow once" },
+  { kind: "allow", id: "allow-session", scope: "session", label: "Allow for this session" },
+  { kind: "allow", id: "allow-always", scope: "always", label: "Always allow" },
+  { kind: "deny", id: "deny", label: "Deny" },
+  { kind: "feedback", id: "feedback", label: "Deny with feedback", prompt: "Why should this be denied?" },
 ];
+
+export function approvalRequestId(): string {
+  return "ap_" + Date.now().toString(36) + "_" + Math.random().toString(36).slice(2, 7);
+}
+
+export function approvalOptionForDecision(request: ApprovalRequest, decision: ApprovalDecision): ApprovalOption | undefined {
+  if (decision.kind === "allow")
+    return request.options.find((option) => option.kind === "allow" && option.scope === decision.scope);
+  if (decision.kind === "deny")
+    return request.options.find((option) => option.kind === "deny");
+  if (decision.kind === "choose")
+    return request.options.find((option) => option.kind === "choose" && option.value === decision.value);
+  if (decision.kind === "feedback")
+    return request.options.find((option) => option.kind === "feedback");
+  return undefined;
+}
+
+export function parseApprovalChoice(request: ApprovalRequest, text: string): ApprovalOption | undefined {
+    const index = Number(String(text ?? "").trim()) - 1;
+    if (!Number.isInteger(index) || index < 0 || index >= request.options.length)
+        return undefined;
+    return request.options[index];
+}
+
+export function decisionForOption(option: ApprovalOption, input?: string): ApprovalDecision {
+  if (option.kind === "allow")
+    return { kind: "allow", scope: option.scope };
+  if (option.kind === "choose")
+    return { kind: "choose", value: option.value };
+  if (option.kind === "feedback") {
+    const text = typeof input === "string" ? input.trim() : "";
+    // The option's prompt is the question, not the user's answer. Without an
+    // actual answer, fail closed instead of sending the prompt back to the model.
+    return text
+      ? { kind: "feedback", text }
+      : { kind: "deny", reason: "feedback was required but not provided (fail closed)" };
+  }
+  return { kind: "deny", reason: "denied by user" };
+}

package/src/agent/compaction.ts

@@ -1,5 +1,5 @@
-import { mkdirSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { basename, join, resolve, sep } from "node:path";
 import { estMessagesTokens, estTokens } from "../lib/model-meta.js";
 import { getPaths } from "../config/paths.js";
 import type { ChatMessage } from "../types.js";
@@ -57,6 +57,15 @@ export function compactionConfigFromEnv(): CompactionConfig {
     const heap = Number(process.env["FASTCODE_HEAP_LIMIT_MB"]);
     if (Number.isFinite(heap) && heap > 0)
         config.heapLimitMb = heap;
+    const ratio = Number(process.env["FASTCODE_COMPACTION_RATIO"]);
+    if (Number.isFinite(ratio) && ratio > 0 && ratio < 1)
+        config.localThresholdRatio = ratio;
+    const keepTurns = Number(process.env["FASTCODE_COMPACTION_KEEP_TURNS"]);
+    if (Number.isFinite(keepTurns) && keepTurns > 0)
+        config.keepTurns = Math.floor(keepTurns);
+    const summaryTokens = Number(process.env["FASTCODE_COMPACTION_SUMMARY_TOKENS"]);
+    if (Number.isFinite(summaryTokens) && summaryTokens > 0)
+        config.maxSummaryTokens = Math.floor(summaryTokens);
     const server = (process.env["FASTCODE_SERVER_COMPACTION"] ?? "").trim().toLowerCase();
     if (["1", "true", "yes", "on"].includes(server))
         config.serverCompactionAware = true;
@@ -176,7 +185,7 @@ export function buildSummary(messages: ChatMessage[], config: CompactionConfig,
             continue;
         }
         if (message.role === "assistant") {
-            const calls = parseToolCalls(message.content);
+            const calls = parseToolCalls(message.content).calls;
             for (const call of calls)
                 actions.push(describeCall(call));
             const visible = stripToolCalls(message.content);
@@ -192,23 +201,31 @@ export function buildSummary(messages: ChatMessage[], config: CompactionConfig,
         }
         collectFiles(message.content, files);
     }
+    const fileList = Array.from(files);
     const sections = [
         "# Session summary",
         "",
-        "## Requests",
-        ...limitLines(requests, 8).map((line) => `- ${line}`),
-        "",
-        "## Actions",
-        ...limitLines(actions, 20).map((line) => `- ${line}`),
+        // Conclusions first: when the token budget runs out, keep what the
+        // session decided rather than the oldest requests.
+        "## Notes",
+        ...limitLines(notes, 10, "notes").map((line) => `- ${line}`),
         "",
         "## Outcomes",
-        ...limitLines(outcomes, 10).map((line) => `- ${line}`),
+        ...limitLines(outcomes, 10, "outcomes").map((line) => `- ${line}`),
         "",
         "## Files touched",
-        ...(files.size > 0 ? Array.from(files).slice(0, 40).map((file) => `- ${file}`) : ["- (none recorded)"]),
+        ...(fileList.length > 0
+            ? [
+                ...fileList.slice(0, 40).map((file) => `- ${file}`),
+                ...(fileList.length > 40 ? [`- (${fileList.length - 40} more files not listed)`] : []),
+            ]
+            : ["- (none recorded)"]),
         "",
-        "## Notes",
-        ...limitLines(notes, 10).map((line) => `- ${line}`),
+        "## Requests",
+        ...limitLines(requests, 8, "requests").map((line) => `- ${line}`),
+        "",
+        "## Actions",
+        ...limitLines(actions, 20, "actions").map((line) => `- ${line}`),
     ];
     const budget = Math.max(200, Math.floor(config.maxSummaryTokens));
     const kept: string[] = [];
@@ -243,9 +260,7 @@ function collectFiles(text: string, files: Set<string>): void {
     if (!matches)
         return;
     for (const match of matches) {
-        if (match.length <= 3 || match.length > 240)
-            continue;
-        if (/^\d+(\.\d+)+$/.test(match))
+        if (!looksLikeProjectFile(match))
             continue;
         files.add(match);
         if (files.size >= 200)
@@ -253,8 +268,20 @@ function collectFiles(text: string, files: Set<string>): void {
     }
 }
 
-function limitLines(lines: string[], max: number): string[] {
-    return lines.slice(0, max);
+function looksLikeProjectFile(value: string): boolean {
+    if (value.length <= 3 || value.length > 240)
+        return false;
+    if (/^summary-\d/.test(value) || value.includes("//") || value.includes("\\.") || value.startsWith("s/"))
+        return false;
+    if (/^\d+(\.\d+)+$/.test(value))
+        return false;
+    return /\.(ts|tsx|js|jsx|mjs|cjs|json|md|txt|py|rs|go|java|kt|kts|c|cc|cpp|h|hpp|sh|bash|zsh|fish|yml|yaml|toml|ini|conf|cfg|env|lock|sql|html|css|scss|sass|less|vue|svelte|rb|php|swift|dart|xml|gradle|properties)$/i.test(value);
+}
+
+function limitLines(lines: string[], max: number, label: string): string[] {
+    if (lines.length <= max)
+        return lines;
+    return [...lines.slice(0, max), `(${lines.length - max} more ${label} not listed)`];
 }
 
 function clip(text: string, max: number): string {
@@ -262,6 +289,24 @@ function clip(text: string, max: number): string {
     return oneLine.length > max ? oneLine.slice(0, max) + "…" : oneLine;
 }
 
+/** Delete a summary file only when it is one of our summary-*.md artifacts. */
+export function removeSummaryFile(file?: string): void {
+    if (!file)
+        return;
+    const name = basename(file);
+    if (!/^summary-\d+.*\.md$/i.test(name))
+        return;
+    const sessions = resolve(getPaths().sessions) + sep;
+    if (!resolve(file).startsWith(sessions))
+        return;
+    try {
+        rmSync(file, { force: true });
+    }
+    catch {
+        // Best effort; an orphan summary is not worth failing compaction.
+    }
+}
+
 function writeSummaryFile(summary: string): string | undefined {
     try {
         const dir = getPaths().sessions;