tinker-agent 2.10.0 → 2.12.0

package/src/session/session-store.ts

@@ -1,4 +1,6 @@
+import { prepareSessionMemory } from "../memory/memory-files";
 import { Database } from "bun:sqlite";
+import { ScopedQueryDatabase } from "./scoped-query-database";
 import { randomUUID } from "node:crypto";
 import { chmod, mkdir, open, readdir, rename, rmdir } from "node:fs/promises";
 import path from "node:path";
@@ -87,8 +89,6 @@ import {
   type CommitSurfaceRefreshOptions,
   type CommitSwapRevisionInput,
   type CommitSwapRevisionOptions,
-  type CompletedTurnMessageSnapshot,
-  type CompletedTurnSnapshot,
   type CreateNewSessionStoreInput,
   type OpenSessionStoreInput,
   type SessionCloseReason,
@@ -131,9 +131,7 @@ import { requireItem, requireSingleChange, runTransaction } from "./session-stor
 import { SessionStoreValidation } from "./session-store-validation";
 import {
   assertMeasuredContextAnchor,
-  enumFromSql,
   nullableStringFromSql,
-  nullableTextFromSql,
   numberFromSql,
   recordFromSql,
   stringFromSql,
@@ -885,105 +883,6 @@ export class SessionStore implements SessionLedgerCommitter {
     });
   }
 
-  readCompletedTurnSnapshot(turnId: TurnId): CompletedTurnSnapshot {
-    this.requireOpen();
-    const turnRow = this.database
-      .query("SELECT status FROM turns WHERE turn_id = ?")
-      .get(turnId);
-    const status = enumFromSql(
-      recordFromSql(turnRow, "completed turn").status,
-      ["open", "completed", "failed", "cancelled", "interrupted"] as const,
-      "turn status",
-    );
-    if (status !== "completed") {
-      throw new Error(`Turn ${turnId} is not completed.`);
-    }
-
-    const rows = this.database
-      .query(
-        `SELECT ordinal, role, content, reasoning_content,
-                reasoning_content_present, name
-         FROM messages
-         WHERE turn_id = ?
-         ORDER BY ordinal`,
-      )
-      .all(turnId);
-    if (rows.length === 0) {
-      throw new Error(`Completed turn ${turnId} has no messages.`);
-    }
-
-    let previousOrdinal = 0;
-    const messages = rows.map((value): CompletedTurnMessageSnapshot => {
-      const row = recordFromSql(value, "completed turn message");
-      const ordinal = numberFromSql(row.ordinal, "completed turn ordinal");
-      if (ordinal < 1 || ordinal <= previousOrdinal) {
-        throw new Error("Completed turn message ordinals are invalid.");
-      }
-      previousOrdinal = ordinal;
-      const role = enumFromSql(
-        row.role,
-        ["user", "assistant", "tool"] as const,
-        "completed turn message role",
-      );
-      if (role === "user") {
-        if (
-          row.reasoning_content !== null ||
-          numberFromSql(row.reasoning_content_present, "reasoning_content_present") !==
-            0 ||
-          row.name !== null
-        ) {
-          throw new Error("Completed user message fields are invalid.");
-        }
-        return Object.freeze({
-          ordinal,
-          role,
-          content: stringFromSql(row.content, "completed user content"),
-        });
-      }
-      if (role === "assistant") {
-        if (row.name !== null) {
-          throw new Error("Completed assistant message name must be null.");
-        }
-        const reasoningPresent = numberFromSql(
-          row.reasoning_content_present,
-          "reasoning_content_present",
-        );
-        if (reasoningPresent !== 0 && reasoningPresent !== 1) {
-          throw new Error("reasoning_content_present must be 0 or 1.");
-        }
-        if (reasoningPresent === 0 && row.reasoning_content !== null) {
-          throw new Error("Absent assistant reasoning content must be null.");
-        }
-        return Object.freeze({
-          ordinal,
-          role,
-          content: nullableTextFromSql(row.content, "completed assistant content"),
-          ...(reasoningPresent === 0
-            ? {}
-            : {
-                reasoningContent: nullableTextFromSql(
-                  row.reasoning_content,
-                  "completed assistant reasoning content",
-                ),
-              }),
-        });
-      }
-      if (
-        row.reasoning_content !== null ||
-        numberFromSql(row.reasoning_content_present, "reasoning_content_present") !== 0
-      ) {
-        throw new Error("Completed tool message reasoning fields are invalid.");
-      }
-      return Object.freeze({
-        ordinal,
-        role,
-        name: stringFromSql(row.name, "completed tool name"),
-        content: stringFromSql(row.content, "completed tool content"),
-      });
-    });
-    return Object.freeze({ messages: Object.freeze(messages) });
-  }
-
   loadProtocolView(): ProtocolContextView {
     this.requireOpen();
     const imageAttachments = loadMessageImageAttachments(this.database);
@@ -1327,7 +1226,7 @@ export class SessionStore implements SessionLedgerCommitter {
       await chmod(stagingDatabasePath, 0o600);
       input.faultInjector?.("after_snapshot");
 
-      stagingDatabase = openWritableDatabase(stagingDatabasePath);
+      stagingDatabase = openWritableDatabase(stagingDatabasePath, ScopedQueryDatabase);
       verifySessionSchema(stagingDatabase, this.sessionId);
       dropSessionCloneTriggers(stagingDatabase);
       input.faultInjector?.("after_trigger_drop");
@@ -1403,6 +1302,7 @@ export class SessionStore implements SessionLedgerCommitter {
       input.faultInjector?.("before_publish_rename");
       await rename(stagingDirectory, targetDirectory);
       published = true;
+      await prepareSessionMemory(targetDirectory, input.targetSessionId, this.homeRoot);
     } finally {
       if (stagingDatabase !== undefined) {
         try {
@@ -1542,8 +1442,11 @@ export async function resolveSessionDatabasePath(
   );
 }
 
-function openWritableDatabase(databasePath: string): Database {
-  const database = new Database(databasePath, {
+function openWritableDatabase(
+  databasePath: string,
+  DatabaseType: typeof Database = Database,
+): Database {
+  const database = new DatabaseType(databasePath, {
     create: false,
     readwrite: true,
     strict: true,

package/src/tools/grep.ts

@@ -72,7 +72,7 @@ export function createGrepToolExecutor(options: GrepToolOptions): ToolExecutor {
           path: {
             type: "string",
             description:
-              "Optional workspace-relative or absolute file or directory to search in. Defaults to the current workspace-local cwd. For directories, ripgrep runs in that directory with . as its search path; explicitly selecting an excluded directory allows searching inside it. Files are passed as absolute paths: explicit files bypass ignore/glob/type filtering, and explicit symlink files are followed. Explicit binary files may yield matches but are not guaranteed to be searched completely.",
+              "Optional workspace-relative or absolute file or directory to search in. Defaults to the current workspace-local cwd. For directories, ripgrep runs in that directory with . as its search path; explicitly selecting an excluded directory allows searching inside it. Files are passed as absolute paths: explicit files bypass ignore/glob/type filtering, and explicit symlink files are followed. Explicit binary files may yield matches but are not guaranteed to be searched completely, and reported line numbers may be inaccurate.",
           },
           glob: {
             type: "string",
@@ -202,7 +202,7 @@ export function createGrepToolExecutor(options: GrepToolOptions): ToolExecutor {
           absoluteSearchPath,
           mode,
           truncated: rg.truncated ? true : undefined,
-          error: rg.error ?? "ripgrep failed.",
+          error: omitUnsupportedRegexHint(rg.error ?? "ripgrep failed."),
         });
       }
 
@@ -368,11 +368,19 @@ export function buildRipgrepArgs(
 function resolveGrepContext(input: GrepArgs) {
   const both = input.context ?? input.contextAlias;
   return {
-    before: both ?? input.before ?? 0,
-    after: both ?? input.after ?? 0,
+    before: input.before ?? both ?? 0,
+    after: input.after ?? both ?? 0,
   };
 }
 
+function omitUnsupportedRegexHint(error: string): string {
+  // Grep does not expose rg's PCRE2 flag; preserve the diagnostic itself.
+  return error.replace(
+    /\n+Consider enabling PCRE2 with the --pcre2 flag, which can handle backreferences\s+and look-around\.\s*$/,
+    "",
+  );
+}
+
 type ParsedGrepArgs =
   | { ok: true; value: GrepArgs }
   | { ok: false; error: string; pattern?: string; mode?: GrepOutputMode };

package/src/tools/registry.ts

@@ -1,3 +1,5 @@
+import { createMemorySearchToolExecutor } from "../memory/memory-search-tool";
+import { createFileMemoryCreateToolExecutor } from "../memory/memory-files";
 import { createAskUserToolExecutor } from "./ask-user";
 import { createBashToolExecutor } from "./bash";
 import { ShellTaskManager } from "./bash-task";
@@ -182,10 +184,7 @@ export function createDefaultTooling(options: {
   skillCoordinator?: SkillActivationCoordinator;
   toolingConfig?: PublicToolingConfig;
   memorySearch?: ToolExecutor;
-  memoryGet?: ToolExecutor;
   memoryCreate?: ToolExecutor;
-  memoryUpdate?: ToolExecutor;
-  memoryDelete?: ToolExecutor;
   enableTurnUndo?: boolean;
   imageAssetStore?: ImageAssetStore;
   supportsViewImage?: boolean;
@@ -259,21 +258,19 @@ export function createDefaultTooling(options: {
   registry.register(createContextStatusToolExecutor());
   registry.register(createContextSwapCandidatesToolExecutor());
   registry.register(createContextSwapToolExecutor());
-  if (options.memorySearch !== undefined) {
-    registry.register(options.memorySearch);
-  }
-  if (options.memoryGet !== undefined) {
-    registry.register(options.memoryGet);
-  }
-  if (options.memoryCreate !== undefined) {
-    registry.register(options.memoryCreate);
-  }
-  if (options.memoryUpdate !== undefined) {
-    registry.register(options.memoryUpdate);
-  }
-  if (options.memoryDelete !== undefined) {
-    registry.register(options.memoryDelete);
-  }
+  registry.register(
+    options.memorySearch ??
+      createMemorySearchToolExecutor({
+        homeRoot: options.homeRoot,
+      }),
+  );
+  registry.register(
+    options.memoryCreate ??
+      createFileMemoryCreateToolExecutor({
+        workspaceRoot: options.workspaceRoot,
+        homeRoot: options.homeRoot,
+      }),
+  );
   if (options.skillCatalog !== undefined) {
     if (options.skillCatalog.skills.size === 0) {
       throw new Error("An empty Agent Skill catalog must not register tooling.");

package/src/tools/types.ts

@@ -427,7 +427,18 @@ export type ContextMaintenanceHandle = {
   ): Promise<ContextSwapRawResult>;
 };
 
+export type MemorySearchLine = { lineNumber: number; match: boolean; text: string };
+export type MemoryTextSearchResult = {
+  ok: true;
+  format: "text";
+  files: readonly { filePath: string; lines: readonly MemorySearchLine[] }[];
+  returnedResults: number;
+  hasMore: boolean;
+  nextOffset?: number;
+};
+
 export type MemorySearchRawResult =
+  | MemoryTextSearchResult
   | {
       ok: true;
       degraded: "vector" | "fts" | null;
@@ -469,6 +480,7 @@ export type MemoryCreateRawResult =
   | {
       ok: true;
       status: "created" | "already_exists";
+      filePath?: string;
       memoryId: string;
       createdAt: 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,
@@ -83,7 +84,9 @@ export type AppProps = {
   writeClipboard?: (markdown: string) => Promise<void>;
   onQuit?: () => void;
   initialNotice?: string;
-  listStoredMemories?: () => readonly StoredMemorySummary[];
+  listStoredMemories?: () =>
+    | readonly StoredMemorySummary[]
+    | Promise<readonly StoredMemorySummary[]>;
   memoryDisabledNotice?: string;
 };
 
@@ -143,6 +146,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 +291,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 = () => {
@@ -406,13 +420,13 @@ export function App(props: AppProps) {
     restoreStaticViewport();
   };
 
-  const openMemoryView = () => {
+  const openMemoryView = async () => {
     if (props.listStoredMemories === undefined) {
       setNotice(props.memoryDisabledNotice ?? "memory disabled: not configured");
       return;
     }
     try {
-      const snapshot = props.listStoredMemories();
+      const snapshot = await props.listStoredMemories();
       setNotice(undefined);
       setMemoryView(snapshot);
     } catch (error) {
@@ -634,7 +648,7 @@ export function App(props: AppProps) {
           return true;
         }
         if (command.type === "memory") {
-          openMemoryView();
+          void openMemoryView();
           return true;
         }
         if (command.type === "copy") {
@@ -912,7 +926,8 @@ export function App(props: AppProps) {
                 status={
                   isCancelling
                     ? "cancelling"
-                    : askUser.pending !== undefined
+                    : askUser.pending !== undefined ||
+                        pendingProviderRetry !== undefined
                       ? "waiting_for_answer"
                       : executionRunning
                         ? "running"
@@ -924,7 +939,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 +1020,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) => ({
@@ -825,7 +835,7 @@ function toolCallSummary(input: { name: string; args: unknown }): string {
     return `WebSearch ${toolQuery(input.args) ?? ""}`.trim();
   }
   if (input.name === "MemorySearch") {
-    return `MemorySearch ${memorySearchDetail(input.args)}`.trim();
+    return `MemorySearch ${toolPattern(input.args) ?? memorySearchDetail(input.args)}`.trim();
   }
   if (input.name === "MemoryCreate") {
     return "MemoryCreate";
@@ -964,6 +974,8 @@ function toolRawResultSummary(name: string, args: unknown, raw: ToolRawResult):
       if (!raw.ok) {
         return base;
       }
+      if ("format" in raw)
+        return `${base} -> ${raw.returnedResults} matching lines in ${raw.files.length} files`;
       return `${base} -> ${raw.matches.length} derived memor${raw.matches.length === 1 ? "y" : "ies"}`;
     case "memory_get":
       if (!raw.ok) {