tinker-agent 2.9.0 → 2.11.0

package/src/tools/shell-process.ts

@@ -14,6 +14,7 @@ export type ShellProcessHandle = {
   readonly mode: ShellProcessMode;
   readonly exitCode: number | null;
   readonly signalCode: NodeJS.Signals | null;
+  readonly outputClosed: boolean;
   wait(): Promise<ProcessExitResult>;
   waitForOutputClose(): Promise<void>;
   write?(chars: string): Promise<number>;
@@ -35,6 +36,8 @@ export async function spawnShellProcess(input: {
   command: string;
   cwd: string;
   cwdFilePath: string;
+  cols?: number;
+  rows?: number;
   onOutput(bytes: Uint8Array): void;
 }): Promise<ShellProcessHandle> {
   const env = {
@@ -65,7 +68,16 @@ async function spawnPipeShellProcess(input: {
   pipeOutput(child.stderr, (bytes) => input.onOutput(bytes));
 
   const exit = waitForNodeProcessExit(child);
-  const close = waitForNodeProcessClose(child);
+  let outputClosed = false;
+  let resolveOutputClose: () => void;
+  const close = new Promise<void>((resolve) => {
+    resolveOutputClose = resolve;
+  });
+  const settleOutputClose = () => {
+    outputClosed = true;
+    resolveOutputClose();
+  };
+  void waitForNodeProcessClose(child).then(settleOutputClose);
   if (child.pid === undefined) {
     const result = await exit;
     throw new Error(result.error ?? "Bash process failed to start.");
@@ -80,15 +92,25 @@ async function spawnPipeShellProcess(input: {
     get signalCode() {
       return child.signalCode;
     },
+    get outputClosed() {
+      return outputClosed;
+    },
     wait: () => exit,
     waitForOutputClose: () => close,
-    close() {},
+    close() {
+      child.stdin.destroy();
+      child.stdout.destroy();
+      child.stderr.destroy();
+      settleOutputClose();
+    },
   };
 }
 
 function spawnPtyShellProcess(input: {
   cwd: string;
   env: NodeJS.ProcessEnv;
+  cols?: number;
+  rows?: number;
   onOutput(bytes: Uint8Array): void;
 }): ShellProcessHandle {
   let terminalEnded = false;
@@ -125,8 +147,8 @@ function spawnPtyShellProcess(input: {
       GIT_PAGER: "cat",
     },
     terminal: {
-      cols: TERMINAL_SCREEN_COLUMNS,
-      rows: TERMINAL_SCREEN_ROWS,
+      cols: input.cols ?? TERMINAL_SCREEN_COLUMNS,
+      rows: input.rows ?? TERMINAL_SCREEN_ROWS,
       name: "xterm-256color",
       data(_terminal, bytes) {
         input.onOutput(new Uint8Array(bytes));
@@ -205,6 +227,9 @@ function spawnPtyShellProcess(input: {
     get signalCode() {
       return subprocess.signalCode;
     },
+    get outputClosed() {
+      return terminalEnded;
+    },
     wait: () => exit,
     waitForOutputClose: () => terminalExit,
     write,
@@ -212,6 +237,7 @@ function spawnPtyShellProcess(input: {
       if (!terminal.closed) {
         terminal.close();
       }
+      settleTerminalExit();
     },
   };
 }

package/src/tools/task-stop.ts

@@ -37,12 +37,13 @@ export function createTaskStopToolExecutor(options: {
       try {
         const result = await options.taskManager.stopTask(parsed.taskId, "tool");
         return {
-          ok: true,
+          ok: result.task.error === undefined,
           taskId: parsed.taskId,
           task: result.task,
           status: result.task.status,
           requestedSignal: result.requestedSignal,
           escalated: result.escalated,
+          ...(result.task.error === undefined ? {} : { error: result.task.error }),
         };
       } catch (error) {
         const inspection = options.taskManager.inspectTask(parsed.taskId);

package/src/tools/terminal-screen.ts

@@ -3,16 +3,25 @@ import { Terminal } from "@xterm/headless";
 
 export const TERMINAL_SCREEN_ROWS = 24;
 export const TERMINAL_SCREEN_COLUMNS = 80;
+export const MIN_TERMINAL_COLUMNS = 2;
+export const MAX_TERMINAL_DIMENSION = 1_000;
 
 export type TerminalScreen = {
+  readonly rows: number;
+  readonly columns: number;
   write(bytes: Uint8Array): Promise<void>;
   flush(): Promise<void>;
   text(): string;
   dispose(): void;
 };
 
-export function createTerminalScreen(): TerminalScreen {
-  return new HeadlessTerminalScreen(TERMINAL_SCREEN_ROWS, TERMINAL_SCREEN_COLUMNS);
+export function createTerminalScreen(
+  options: { cols?: number; rows?: number } = {},
+): TerminalScreen {
+  return new HeadlessTerminalScreen(
+    options.rows ?? TERMINAL_SCREEN_ROWS,
+    options.cols ?? TERMINAL_SCREEN_COLUMNS,
+  );
 }
 
 export class HeadlessTerminalScreen implements TerminalScreen {

package/src/tools/types.ts

@@ -92,16 +92,27 @@ export type DeleteFileRawResult = {
 
 export type GlobRawResult = {
   ok: boolean;
-  pattern: string;
+  pattern?: string;
   searchPath: string;
   absoluteSearchPath?: string;
   matches?: string[];
+  /** Number of paths returned, including in legacy unpaginated results. */
   matchCount?: number;
+  /** Exact total before pagination; absent in legacy results. */
+  totalMatches?: number;
+  returnedCount?: number;
+  appliedOffset?: number;
+  hasMore?: boolean;
+  nextOffset?: number;
   ignored?: string[];
   error?: string;
 };
 
-export type GrepOutputMode = "content" | "files_with_matches" | "count";
+export type GrepOutputMode =
+  | "content"
+  | "files_with_matches"
+  | "count"
+  | "count-matches";
 
 export type GrepRawResult = {
   ok: boolean;
@@ -113,10 +124,27 @@ export type GrepRawResult = {
   numFiles: number;
   content?: string;
   numLines?: number;
+  /** Structured count records; paths are unescaped and never parsed from display text. */
+  counts?: { filePath: string; count: number }[];
+  /** Sum on this page: matching lines for count, individual matches for count-matches. */
   numMatches?: number;
+  /** Collected pagination units; legacy content results counted all output lines. Not a global total if searchIncomplete. */
+  totalResults?: number;
+  /** Selected pagination units, excluding context and nearby matches shown as context. */
+  returnedResults?: number;
+  paginationUnit?: "matching_lines" | "match_events" | "files";
+  /** More collected pagination units are available, independently of search completeness. */
+  hasMore?: boolean;
+  nextOffset?: number;
   appliedLimit?: number;
   appliedOffset?: number;
+  /** True for interrupted searches (e.g. timeout or output buffer limit), not pagination. */
+  searchIncomplete?: boolean;
+  /** The search stopped early, so requested context cannot be guaranteed complete. */
+  contextMayBeIncomplete?: boolean;
+  /** Legacy default exclusions, not observed skips. New Grep results omit this field. */
   ignored?: string[];
+  /** Compatibility flag combining pagination and interrupted search; prefer explicit fields above. */
   truncated?: boolean;
   error?: string;
 };

package/src/tui/app.tsx

@@ -1,3 +1,4 @@
+import { EMPTY_PROVIDER_RETRY } from "../agent/runtime-provider-retry";
 import { Box, Static, Text, useApp, useInput, useStdout, useWindowSize } from "ink";
 import {
   useCallback,
@@ -143,6 +144,12 @@ export function App(props: AppProps) {
     () => binding.bashGuard(),
     () => binding.bashGuard(),
   );
+  const providerRetry = useSyncExternalStore(
+    (listener) => binding.subscribeProviderRetry?.(listener) ?? (() => undefined),
+    () => binding.providerRetry?.() ?? EMPTY_PROVIDER_RETRY,
+    () => EMPTY_PROVIDER_RETRY,
+  );
+  const pendingProviderRetry = providerRetry.pending;
   const askUser = useSyncExternalStore(
     (listener) => binding.subscribeAskUser(listener),
     () => binding.askUser(),
@@ -282,7 +289,12 @@ export function App(props: AppProps) {
       setIsCancelling(true);
       setNotice("Cancelling current turn...");
     },
-    { isActive: executionRunning && askUser.pending === undefined },
+    {
+      isActive:
+        executionRunning &&
+        askUser.pending === undefined &&
+        pendingProviderRetry === undefined,
+    },
   );
 
   const closeResumePicker = () => {
@@ -912,7 +924,8 @@ export function App(props: AppProps) {
                 status={
                   isCancelling
                     ? "cancelling"
-                    : askUser.pending !== undefined
+                    : askUser.pending !== undefined ||
+                        pendingProviderRetry !== undefined
                       ? "waiting_for_answer"
                       : executionRunning
                         ? "running"
@@ -924,7 +937,35 @@ export function App(props: AppProps) {
               />
             </Box>
             <Box marginTop={1} flexDirection="column" flexShrink={0}>
-              {askUser.pending !== undefined ? (
+              {pendingProviderRetry !== undefined ? (
+                <AskUser
+                  key={pendingProviderRetry.requestId}
+                  title="Provider request failed"
+                  question={`Automatic retries exhausted. ${pendingProviderRetry.failure.error.slice(0, 500)}`}
+                  options={[
+                    { description: "Retry again" },
+                    { description: "End this turn" },
+                  ]}
+                  dismissLabel="end this turn"
+                  onSelect={(index) => {
+                    void binding
+                      .resolveProviderRetry?.(
+                        pendingProviderRetry.requestId,
+                        index === 0 ? "retry" : "stop",
+                      )
+                      .catch((error: unknown) =>
+                        setNotice(`Retry selection failed: ${errorMessage(error)}`),
+                      );
+                  }}
+                  onDismiss={() => {
+                    void binding
+                      .resolveProviderRetry?.(pendingProviderRetry.requestId, "stop")
+                      .catch((error: unknown) =>
+                        setNotice(`Retry selection failed: ${errorMessage(error)}`),
+                      );
+                  }}
+                />
+              ) : askUser.pending !== undefined ? (
                 <AskUser
                   question={askUser.pending.question}
                   options={askUser.pending.options}
@@ -977,6 +1018,7 @@ export function App(props: AppProps) {
                     isCopying ||
                     isCancelling ||
                     askUser.pending !== undefined ||
+                    pendingProviderRetry !== undefined ||
                     bashGuard.pending !== undefined
                   }
                   history={props.history}

package/src/tui/components/ask-user.tsx

@@ -1,8 +1,10 @@
 import { Box, Text, useInput } from "ink";
-import { useState } from "react";
+import { useRef, useState } from "react";
 
 export type AskUserProps = {
   question: string;
+  title?: string;
+  dismissLabel?: string;
   options: readonly { readonly description: string }[];
   onSelect(selectedIndex: number): void;
   onDismiss(): void;
@@ -10,6 +12,12 @@ export type AskUserProps = {
 
 export function AskUser(props: AskUserProps) {
   const [selectedIndex, setSelectedIndex] = useState(0);
+  const selection = useRef(0);
+  const moveSelection = (offset: number) => {
+    selection.current =
+      (selection.current + offset + props.options.length) % props.options.length;
+    setSelectedIndex(selection.current);
+  };
 
   useInput((input, key) => {
     if (key.escape) {
@@ -17,17 +25,15 @@ export function AskUser(props: AskUserProps) {
       return;
     }
     if (key.upArrow) {
-      setSelectedIndex((current) =>
-        current === 0 ? props.options.length - 1 : current - 1,
-      );
+      moveSelection(-1);
       return;
     }
     if (key.downArrow) {
-      setSelectedIndex((current) => (current + 1) % props.options.length);
+      moveSelection(1);
       return;
     }
     if (key.return) {
-      props.onSelect(selectedIndex);
+      props.onSelect(selection.current);
       return;
     }
     if (/^[1-6]$/.test(input)) {
@@ -41,7 +47,7 @@ export function AskUser(props: AskUserProps) {
   return (
     <Box flexDirection="column" borderStyle="round" borderColor="cyan" paddingX={1}>
       <Text color="cyan" bold>
-        Tinker asks
+        {props.title ?? "Tinker asks"}
       </Text>
       <Text>{props.question}</Text>
       <Box flexDirection="column" marginTop={1}>
@@ -54,7 +60,8 @@ export function AskUser(props: AskUserProps) {
         ))}
       </Box>
       <Text dimColor>
-        ↑/↓ select · 1-{props.options.length} choose · Enter confirm · Esc skip
+        ↑/↓ select · 1-{props.options.length} choose · Enter confirm · Esc{" "}
+        {props.dismissLabel ?? "skip"}
       </Text>
     </Box>
   );

package/src/tui/components/prompt-input.tsx

@@ -41,7 +41,11 @@ import {
   type PromptDraft,
 } from "../prompt-draft";
 import { matchSlashCommands, type SlashCommand } from "../slash-commands";
-import { listWorkspaceFiles, type WorkspaceFileLister } from "../workspace-file-search";
+import {
+  listWorkspaceFiles,
+  listWorkspaceFilesAndDirectories,
+  type WorkspaceFileLister,
+} from "../workspace-file-search";
 
 export type PromptSubmission = {
   readonly draft: PromptDraft;
@@ -183,7 +187,10 @@ export function PromptInput(props: PromptInputProps) {
     () =>
       fileQuery === undefined || fileCatalog.status !== "ready"
         ? []
-        : rankWorkspaceFiles(fileCatalog.files, fileQuery),
+        : rankWorkspaceFiles(
+            listWorkspaceFilesAndDirectories(fileCatalog.files),
+            fileQuery,
+          ),
     [fileCatalog, fileQuery],
   );
   const suggestions =
@@ -223,13 +230,14 @@ export function PromptInput(props: PromptInputProps) {
     });
   };
 
-  const selectFile = (filePath: string) => {
+  const selectFile = (match: FileMentionMatch) => {
+    const filePath = match.path;
     const mention = findFileMention(state.draft.editor);
     if (mention === undefined || locked) {
       return;
     }
     const importImage = props.importImage;
-    if (importImage === undefined) {
+    if (importImage === undefined || match.kind === "directory") {
       insertFilePath(filePath);
       return;
     }
@@ -616,7 +624,7 @@ export function PromptInput(props: PromptInputProps) {
       const selectedCommand = suggestions[selectedIndex];
       if (key.return) {
         if (filePopupActive && selectedFile !== undefined) {
-          selectFile(selectedFile.path);
+          selectFile(selectedFile);
         } else if (selectedCommand !== undefined) {
           submitDraft(createPromptDraft(`/${selectedCommand.name}`));
         } else {
@@ -629,7 +637,7 @@ export function PromptInput(props: PromptInputProps) {
           if (selectedFile === undefined) {
             setState((current) => ({ ...current, suggestionsDismissed: true }));
           } else {
-            selectFile(selectedFile.path);
+            selectFile(selectedFile);
           }
         } else if (selectedCommand !== undefined) {
           setState(createPromptInputState(`/${selectedCommand.name} `));

package/src/tui/components/timeline.tsx

@@ -26,16 +26,16 @@ export function TimelineRow(props: { item: TimelineItem }) {
   if (item.label !== undefined) {
     if (item.label === "assistant") {
       return (
-        <Fragment>
-          <Text color="gray">- {item.label}</Text>
+        <Box flexDirection="column" marginTop={1}>
+          <TimelineLabel label={item.label} />
           <AssistantMarkdown text={item.text} />
-        </Fragment>
+        </Box>
       );
     }
 
     return (
-      <Fragment>
-        <Text color="gray">- {item.label}</Text>
+      <Box flexDirection="column" marginY={1}>
+        <TimelineLabel label={item.label} />
         {item.userPrompt === undefined ? (
           <Text color={colorForStatus(item.status)}>{formatTimelineItem(item)}</Text>
         ) : (
@@ -44,7 +44,7 @@ export function TimelineRow(props: { item: TimelineItem }) {
         {renderItemBash(item)}
         {renderItemDiff(item)}
         {renderItemPlan(item)}
-      </Fragment>
+      </Box>
     );
   }
 
@@ -60,10 +60,18 @@ export function TimelineRow(props: { item: TimelineItem }) {
 
 export function AssistantStreamSectionRow(props: { item: AssistantStreamSectionItem }) {
   return (
-    <Fragment>
-      {props.item.showAssistantLabel ? <Text color="gray">- assistant</Text> : null}
+    <Box flexDirection="column" marginTop={props.item.showAssistantLabel ? 1 : 0}>
+      {props.item.showAssistantLabel ? <TimelineLabel label="assistant" /> : null}
       <AssistantMarkdown text={props.item.markdown} />
-    </Fragment>
+    </Box>
+  );
+}
+
+function TimelineLabel(props: { label: string }) {
+  return (
+    <Text color="cyan" bold>
+      - {props.label}
+    </Text>
   );
 }
 

package/src/tui/event-store.ts

@@ -205,6 +205,16 @@ export function reduceTuiProjection(
           status: "running",
         })),
       );
+    case "model.retry.requested":
+      return updateActiveTurn(state, event, policy, (turn) =>
+        updateTurnItem(turn, modelRequestRef(event.iterationId), (item) => ({
+          ...item,
+          text: `model iteration ${event.iterationNumber} · waiting for retry selection`,
+          status: "running",
+        })),
+      );
+    case "model.retry.resolved":
+      return state;
     case "model.request.finished":
       return updateActiveTurn(state, event, policy, (turn) =>
         updateTurnItem(turn, modelRequestRef(event.iterationId), (item) => ({
@@ -873,6 +883,9 @@ function toolRawResultSummary(name: string, args: unknown, raw: ToolRawResult):
         ? base
         : `${base} -> ${raw.asset.mimeType}, ${raw.asset.width}x${raw.asset.height}, ${raw.asset.byteLength} bytes`;
     case "glob":
+      if (raw.ok && raw.totalMatches !== undefined) {
+        return `${base} -> ${raw.returnedCount ?? raw.matches?.length ?? 0} of ${raw.totalMatches} matches`;
+      }
       return raw.ok && raw.matchCount !== undefined
         ? `${base} -> ${raw.matchCount} match${raw.matchCount === 1 ? "" : "es"}`
         : base;
@@ -881,11 +894,21 @@ function toolRawResultSummary(name: string, args: unknown, raw: ToolRawResult):
         return `${base} -> ${raw.numLines} line${raw.numLines === 1 ? "" : "s"}`;
       }
       if (
-        raw.mode === "count" &&
+        (raw.mode === "count" || raw.mode === "count-matches") &&
         raw.numMatches !== undefined &&
         raw.numFiles !== undefined
       ) {
-        return `${base} -> ${raw.numMatches} match${raw.numMatches === 1 ? "" : "es"} across ${raw.numFiles} file${raw.numFiles === 1 ? "" : "s"}`;
+        const unit =
+          raw.mode === "count"
+            ? `matching line${raw.numMatches === 1 ? "" : "s"}`
+            : `match${raw.numMatches === 1 ? "" : "es"}`;
+        const scope =
+          raw.appliedLimit !== undefined || (raw.appliedOffset ?? 0) > 0
+            ? " (this page)"
+            : raw.truncated
+              ? " (partial results)"
+              : "";
+        return `${base} -> ${raw.numMatches} ${unit} across ${raw.numFiles} file${raw.numFiles === 1 ? "" : "s"}${scope}`;
       }
       return `${base} -> ${raw.numFiles} file${raw.numFiles === 1 ? "" : "s"}`;
     case "read":

package/src/tui/file-mention.ts

@@ -12,6 +12,7 @@ export type FileMentionMatch = {
   path: string;
   indices: readonly number[];
   score: number;
+  kind: "file" | "directory";
 };
 
 export function findFileMention(editor: LineEditorState): FileMention | undefined {
@@ -76,8 +77,13 @@ export function rankWorkspaceFiles(
 ): FileMentionMatch[] {
   if (query === "") {
     return files
-      .map((filePath) => ({ path: filePath, indices: [], score: 0 }))
-      .sort((left, right) => compareShallowPaths(left.path, right.path))
+      .map((filePath) => ({
+        path: filePath,
+        indices: [],
+        score: 0,
+        kind: fileMentionKind(filePath),
+      }))
+      .sort((left, right) => compareShallowPaths(left, right))
       .slice(0, limit);
   }
 
@@ -104,6 +110,7 @@ function fuzzyMatchPath(filePath: string, query: string): FileMentionMatch | und
       path: filePath,
       indices: basenameMatch.indices,
       score: basenameMatch.score + 200,
+      kind: fileMentionKind(filePath),
     };
   }
 
@@ -115,6 +122,7 @@ function fuzzyMatchPath(filePath: string, query: string): FileMentionMatch | und
     path: filePath,
     indices: fullPathMatch.indices,
     score: fullPathMatch.score,
+    kind: fileMentionKind(filePath),
   };
 }
 
@@ -167,6 +175,11 @@ function compareFileMatches(left: FileMentionMatch, right: FileMentionMatch): nu
     return right.score - left.score;
   }
 
+  const kindDifference = left.kind === right.kind ? 0 : left.kind === "file" ? -1 : 1;
+  if (kindDifference !== 0) {
+    return kindDifference;
+  }
+
   const depthDifference = pathDepth(left.path) - pathDepth(right.path);
   if (depthDifference !== 0) {
     return depthDifference;
@@ -178,9 +191,16 @@ function compareFileMatches(left: FileMentionMatch, right: FileMentionMatch): nu
     : lengthDifference;
 }
 
-function compareShallowPaths(left: string, right: string): number {
-  const depthDifference = pathDepth(left) - pathDepth(right);
-  return depthDifference === 0 ? comparePathText(left, right) : depthDifference;
+function compareShallowPaths(left: FileMentionMatch, right: FileMentionMatch): number {
+  const kindDifference = left.kind === right.kind ? 0 : left.kind === "file" ? -1 : 1;
+  if (kindDifference !== 0) {
+    return kindDifference;
+  }
+
+  const depthDifference = pathDepth(left.path) - pathDepth(right.path);
+  return depthDifference === 0
+    ? comparePathText(left.path, right.path)
+    : depthDifference;
 }
 
 function comparePathText(left: string, right: string): number {
@@ -196,6 +216,10 @@ function comparePathText(left: string, right: string): number {
   return left < right ? -1 : left > right ? 1 : 0;
 }
 
+function fileMentionKind(filePath: string): FileMentionMatch["kind"] {
+  return filePath.endsWith("/") || filePath.endsWith("\\") ? "directory" : "file";
+}
+
 function pathDepth(filePath: string): number {
   return [...filePath].filter((char) => char === "/" || char === "\\").length;
 }