tinker-agent 2.5.0 → 2.7.0

package/src/tools/registry.ts

@@ -1,3 +1,4 @@
+import { createAskUserToolExecutor } from "./ask-user";
 import { createBashToolExecutor } from "./bash";
 import { ShellTaskManager } from "./bash-task";
 import { createCwdState } from "./cwd-state";
@@ -86,6 +87,11 @@ export class ToolRuntime {
       ): Promise<"allow" | "deny">;
     },
     private readonly contextMaintenance?: ContextMaintenanceHandle,
+    private readonly askUser?: (
+      call: ToolCall,
+      request: Parameters<NonNullable<ToolExecutionContext["askUser"]>>[0],
+      signal: AbortSignal,
+    ) => ReturnType<NonNullable<ToolExecutionContext["askUser"]>>,
   ) {}
 
   async execute(call: ToolCall, context: ToolExecutionContext): Promise<ToolRawResult> {
@@ -117,6 +123,9 @@ export class ToolRuntime {
         ...(this.contextMaintenance === undefined
           ? {}
           : { contextMaintenance: this.contextMaintenance }),
+        ...(this.askUser === undefined
+          ? {}
+          : { askUser: (request) => this.askUser!(call, request, context.signal) }),
         ...(this.bashGuard === undefined
           ? {}
           : {
@@ -173,9 +182,17 @@ export function createDefaultTooling(options: {
   toolingConfig?: PublicToolingConfig;
   memorySearch?: ToolExecutor;
   memoryGet?: ToolExecutor;
+  memoryCreate?: ToolExecutor;
+  memoryUpdate?: ToolExecutor;
+  memoryDelete?: ToolExecutor;
   enableTurnUndo?: boolean;
   imageAssetStore?: ImageAssetStore;
   supportsViewImage?: boolean;
+  askUser?: (
+    call: ToolCall,
+    request: Parameters<NonNullable<ToolExecutionContext["askUser"]>>[0],
+    signal: AbortSignal,
+  ) => ReturnType<NonNullable<ToolExecutionContext["askUser"]>>;
   bashGuard?: {
     readonly surface: "tui" | "one-shot";
     confirm(
@@ -201,6 +218,9 @@ export function createDefaultTooling(options: {
     ...(options.homeRoot === undefined ? {} : { homeRoot: options.homeRoot }),
   });
 
+  if (options.askUser !== undefined) {
+    registry.register(createAskUserToolExecutor());
+  }
   registry.register(
     createGlobToolExecutor({
       workspaceRoot: options.workspaceRoot,
@@ -247,6 +267,15 @@ export function createDefaultTooling(options: {
   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);
+  }
   if (options.skillCatalog !== undefined) {
     if (options.skillCatalog.skills.size === 0) {
       throw new Error("An empty Agent Skill catalog must not register tooling.");
@@ -321,6 +350,7 @@ export function createDefaultTooling(options: {
       registry,
       options.bashGuard,
       options.runtimeSession.contextMaintenance,
+      options.askUser,
     ),
     snapshots,
     taskManager,

package/src/tools/types.ts

@@ -428,6 +428,58 @@ export type MemoryGetRawResult =
       error: string;
     };
 
+export type MemoryCreateRawResult =
+  | {
+      ok: true;
+      status: "created" | "already_exists";
+      memoryId: string;
+      createdAt: string;
+    }
+  | {
+      ok: false;
+      error: string;
+    };
+
+export type MemoryUpdateRawResult =
+  | {
+      ok: true;
+      status: "updated";
+      memoryId: string;
+    }
+  | {
+      ok: false;
+      code: "memory_not_found";
+      error: string;
+    }
+  | {
+      ok: false;
+      code: "memory_duplicate";
+      conflictMemoryId: string;
+      error: string;
+    }
+  | {
+      ok: false;
+      code?: undefined;
+      error: string;
+    };
+
+export type MemoryDeleteRawResult =
+  | {
+      ok: true;
+      status: "deleted";
+      memoryId: string;
+    }
+  | {
+      ok: false;
+      code: "memory_not_found";
+      error: string;
+    }
+  | {
+      ok: false;
+      code?: undefined;
+      error: string;
+    };
+
 export type SkillRawResult =
   | {
       ok: true;
@@ -488,6 +540,20 @@ export type WaitRawResult =
       error: string;
     };
 
+export type AskUserRequest = {
+  readonly question: string;
+  readonly options: readonly { readonly description: string }[];
+};
+
+export type AskUserResponse =
+  | { readonly outcome: "selected"; readonly answer: string }
+  | { readonly outcome: "dismissed" };
+
+export type AskUserRawResult =
+  | { ok: true; outcome: "selected"; answer: string }
+  | { ok: true; outcome: "dismissed" }
+  | { ok: false; error: string };
+
 export type ToolRawResultByKind = {
   read: ReadFileRawResult;
   view_image: ViewImageRawResult;
@@ -508,7 +574,11 @@ export type ToolRawResultByKind = {
   context_maintenance: ContextMaintenanceRawResult;
   memory_search: MemorySearchRawResult;
   memory_get: MemoryGetRawResult;
+  memory_create: MemoryCreateRawResult;
+  memory_update: MemoryUpdateRawResult;
+  memory_delete: MemoryDeleteRawResult;
   wait: WaitRawResult;
+  ask_user: AskUserRawResult;
   skill: SkillRawResult;
   mcp: McpToolRawResult;
   generic: GenericToolRawResult;
@@ -553,6 +623,7 @@ export function defineToolExecutor<TKind extends ToolRawResultKind>(
 
 export type ToolExecutionContext = {
   signal: AbortSignal;
+  askUser?: (request: AskUserRequest) => Promise<AskUserResponse>;
   contextMaintenance?: ContextMaintenanceHandle;
   confirmBashCommand?: (request: {
     command: string;

package/src/tui/app.tsx

@@ -25,6 +25,7 @@ import { Footer } from "./components/footer";
 import { AssistantMarkdownProvider } from "./components/assistant-markdown";
 import { ContextStatus } from "./components/context-status";
 import { BackgroundTasks } from "./components/background-tasks";
+import { AskUser } from "./components/ask-user";
 import { BashConfirmation } from "./components/bash-confirmation";
 import { Header } from "./components/header";
 import { ModelPicker } from "./components/model-picker";
@@ -67,6 +68,7 @@ import {
 
 export type AppProps = {
   sessionController: TuiSessionController;
+  version?: string;
   readGitBranch?: (workspaceRoot: string) => Promise<string | undefined>;
   history?: PromptHistory;
   projectSlashCommands?: readonly ProjectSlashCommand[];
@@ -141,6 +143,11 @@ export function App(props: AppProps) {
     () => binding.bashGuard(),
     () => binding.bashGuard(),
   );
+  const askUser = useSyncExternalStore(
+    (listener) => binding.subscribeAskUser(listener),
+    () => binding.askUser(),
+    () => binding.askUser(),
+  );
   const promptScheduler = useSyncExternalStore(
     (listener) => binding.subscribePromptScheduler?.(listener) ?? (() => undefined),
     () => binding.promptScheduler?.() ?? IDLE_PROMPT_SCHEDULER,
@@ -275,7 +282,7 @@ export function App(props: AppProps) {
       setIsCancelling(true);
       setNotice("Cancelling current turn...");
     },
-    { isActive: executionRunning },
+    { isActive: executionRunning && askUser.pending === undefined },
   );
 
   const closeResumePicker = () => {
@@ -905,9 +912,11 @@ export function App(props: AppProps) {
                 status={
                   isCancelling
                     ? "cancelling"
-                    : executionRunning
-                      ? "running"
-                      : state.status
+                    : askUser.pending !== undefined
+                      ? "waiting_for_answer"
+                      : executionRunning
+                        ? "running"
+                        : state.status
                 }
                 workedForMs={state.workedForMs}
                 yolo={bashGuard.mode === "yolo"}
@@ -915,7 +924,26 @@ export function App(props: AppProps) {
               />
             </Box>
             <Box marginTop={1} flexDirection="column" flexShrink={0}>
-              {bashGuard.pending !== undefined ? (
+              {askUser.pending !== undefined ? (
+                <AskUser
+                  question={askUser.pending.question}
+                  options={askUser.pending.options}
+                  onSelect={(selectedIndex) => {
+                    void binding
+                      .resolveAskUser({ outcome: "selected", selectedIndex })
+                      .catch((error: unknown) =>
+                        setNotice(`Answer failed: ${errorMessage(error)}`),
+                      );
+                  }}
+                  onDismiss={() => {
+                    void binding
+                      .resolveAskUser({ outcome: "dismissed" })
+                      .catch((error: unknown) =>
+                        setNotice(`Dismiss failed: ${errorMessage(error)}`),
+                      );
+                  }}
+                />
+              ) : bashGuard.pending !== undefined ? (
                 <BashConfirmation
                   command={bashGuard.pending.command}
                   reason={bashGuard.pending.reason}
@@ -940,6 +968,7 @@ export function App(props: AppProps) {
                 <PromptInput
                   modelName={binding.modelName}
                   reasoningEffort={reasoningEffort?.effort}
+                  version={props.version}
                   workspaceRoot={binding.workspaceRoot}
                   gitBranch={gitBranch}
                   contextUsage={state.contextUsage}
@@ -947,6 +976,7 @@ export function App(props: AppProps) {
                     isSessionOperation ||
                     isCopying ||
                     isCancelling ||
+                    askUser.pending !== undefined ||
                     bashGuard.pending !== undefined
                   }
                   history={props.history}

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

@@ -0,0 +1,61 @@
+import { Box, Text, useInput } from "ink";
+import { useState } from "react";
+
+export type AskUserProps = {
+  question: string;
+  options: readonly { readonly description: string }[];
+  onSelect(selectedIndex: number): void;
+  onDismiss(): void;
+};
+
+export function AskUser(props: AskUserProps) {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+
+  useInput((input, key) => {
+    if (key.escape) {
+      props.onDismiss();
+      return;
+    }
+    if (key.upArrow) {
+      setSelectedIndex((current) =>
+        current === 0 ? props.options.length - 1 : current - 1,
+      );
+      return;
+    }
+    if (key.downArrow) {
+      setSelectedIndex((current) => (current + 1) % props.options.length);
+      return;
+    }
+    if (key.return) {
+      props.onSelect(selectedIndex);
+      return;
+    }
+    if (/^[1-6]$/.test(input)) {
+      const index = Number(input) - 1;
+      if (index < props.options.length) {
+        props.onSelect(index);
+      }
+    }
+  });
+
+  return (
+    <Box flexDirection="column" borderStyle="round" borderColor="cyan" paddingX={1}>
+      <Text color="cyan" bold>
+        Tinker asks
+      </Text>
+      <Text>{props.question}</Text>
+      <Box flexDirection="column" marginTop={1}>
+        {props.options.map((option, index) => (
+          <Text key={`${index}:${option.description}`}>
+            <Text color={index === selectedIndex ? "cyan" : undefined}>
+              {index === selectedIndex ? "❯" : " "} {index + 1}. {option.description}
+            </Text>
+          </Text>
+        ))}
+      </Box>
+      <Text dimColor>
+        ↑/↓ select · 1-{props.options.length} choose · Enter confirm · Esc skip
+      </Text>
+    </Box>
+  );
+}

package/src/tui/components/footer.tsx

@@ -1,7 +1,14 @@
 import { Spinner, StatusMessage } from "@inkjs/ui";
 
 export type FooterProps = {
-  status: "idle" | "running" | "cancelling" | "cancelled" | "done" | "failed";
+  status:
+    | "idle"
+    | "running"
+    | "waiting_for_answer"
+    | "cancelling"
+    | "cancelled"
+    | "done"
+    | "failed";
   workedForMs?: number;
   yolo?: boolean;
   pendingFollowUps?: number;
@@ -26,6 +33,12 @@ export function Footer(props: FooterProps) {
     return <StatusMessage variant="error">failed{suffix}</StatusMessage>;
   }
 
+  if (props.status === "waiting_for_answer") {
+    return (
+      <StatusMessage variant="info">Waiting for your selection{suffix}</StatusMessage>
+    );
+  }
+
   if (props.status === "running") {
     const queued =
       props.pendingFollowUps === undefined || props.pendingFollowUps === 0

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

@@ -61,6 +61,7 @@ export type PromptSubmissionOutcome =
 export type PromptInputProps = {
   modelName: string;
   reasoningEffort?: string;
+  version?: string;
   workspaceRoot: string;
   gitBranch?: string;
   contextUsage?: ContextUsageSnapshot;
@@ -776,6 +777,9 @@ export function PromptInput(props: PromptInputProps) {
                 <Text color={FOOTER_COLORS.cacheRate}>{cacheRate}</Text>
               </>
             )}
+            {props.version === undefined ? null : (
+              <Text dimColor> · tinker {props.version}</Text>
+            )}
           </Text>
         </Box>
       )}

package/src/tui/components/resume-session-picker.tsx

@@ -15,10 +15,16 @@ import {
   type LineEditorState,
 } from "../line-editor";
 
-const SESSION_ROWS = 3;
+const SESSION_ROWS = 1;
 const BROWSE_CHROME_ROWS = 3;
 const SEARCH_CHROME_ROWS = 4;
 const MAX_DISPLAYED_SESSIONS = 20;
+const MARKER_COLUMN_WIDTH = 2;
+const TIME_COLUMN_WIDTH = 10;
+const TURN_COLUMN_WIDTH = 11;
+const STATUS_COLUMN_WIDTH = 13;
+const PROFILE_COLUMN_WIDTH = 16;
+const SESSION_ROW_BACKGROUNDS = ["#1c1c1c", "#101010"] as const;
 
 export type ResumeSessionPickerProps = {
   sessions: readonly SessionSummary[];
@@ -26,6 +32,7 @@ export type ResumeSessionPickerProps = {
   error?: string;
   now?: Date;
   viewportRows?: number;
+  viewportColumns?: number;
   visibleItemCount?: number;
   onCancel: () => void;
   onSelect: (session: SessionSummary) => void;
@@ -56,6 +63,7 @@ export function ResumeSessionPicker(props: ResumeSessionPickerProps) {
 function ResumeSessionPickerContent(props: ResumeSessionPickerProps) {
   const windowSize = useWindowSize();
   const rows = props.viewportRows ?? windowSize.rows - 1;
+  const columns = Math.max(1, props.viewportColumns ?? windowSize.columns);
 
   const displayedFor = (value: string): readonly SessionSummary[] => {
     const nextCandidates =
@@ -287,7 +295,7 @@ function ResumeSessionPickerContent(props: ResumeSessionPickerProps) {
 
   const now = props.now ?? new Date();
   return (
-    <Box flexDirection="column">
+    <Box width={columns} flexDirection="column" overflow="hidden">
       <Text bold>Resume session</Text>
       {state.mode === "search" ? <SearchLine editor={state.editor} /> : null}
       <Text dimColor>
@@ -303,6 +311,8 @@ function ResumeSessionPickerContent(props: ResumeSessionPickerProps) {
           session={session}
           isSelected={windowStart + offset === selectedIndex}
           now={now}
+          rowIndex={windowStart + offset}
+          columns={columns}
         />
       ))}
       <Text
@@ -318,6 +328,7 @@ function ResumeSessionPickerContent(props: ResumeSessionPickerProps) {
               windowStart,
               windowEnd,
               totalCount: props.sessions.length,
+              selectedSession,
             })
           : `Resume failed: ${singleLine(props.error)}`}
       </Text>
@@ -368,38 +379,92 @@ function SessionOption(props: {
   session: SessionSummary;
   isSelected: boolean;
   now: Date;
+  rowIndex: number;
+  columns: number;
 }) {
   const selectable = isSessionSelectable(props.session);
   const marker = props.isSelected ? "❯ " : "  ";
   const preview =
     singleLine(props.session.firstUserPromptPreview ?? "") || "(no prompt)";
+  const profile = singleLine(props.session.profileName ?? "") || "—";
 
   return (
-    <Box flexDirection="column">
+    <Box
+      width={props.columns}
+      height={SESSION_ROWS}
+      overflow="hidden"
+      backgroundColor={
+        SESSION_ROW_BACKGROUNDS[props.rowIndex % SESSION_ROW_BACKGROUNDS.length]
+      }
+    >
+      <SessionCell
+        value={marker}
+        width={MARKER_COLUMN_WIDTH}
+        isSelected={props.isSelected}
+        isDisabled={!selectable}
+      />
+      <SessionCell
+        value={formatRelativeTime(props.session.updatedAt, props.now)}
+        width={TIME_COLUMN_WIDTH}
+        isSelected={props.isSelected}
+        isDisabled={!selectable}
+        padRight
+      />
+      <SessionCell
+        value={`${props.session.turnCount} ${props.session.turnCount === 1 ? "turn" : "turns"}`}
+        width={TURN_COLUMN_WIDTH}
+        isSelected={props.isSelected}
+        isDisabled={!selectable}
+        padRight
+      />
+      <SessionCell
+        value={sessionStatusLabel(props.session)}
+        width={STATUS_COLUMN_WIDTH}
+        isSelected={props.isSelected}
+        isDisabled={!selectable}
+        padRight
+      />
+      <SessionCell
+        value={profile}
+        width={PROFILE_COLUMN_WIDTH}
+        isSelected={props.isSelected}
+        isDisabled={!selectable}
+        padRight
+      />
+      <SessionCell
+        value={preview}
+        isSelected={props.isSelected}
+        isDisabled={!selectable}
+      />
+    </Box>
+  );
+}
+
+function SessionCell(props: {
+  value: string;
+  width?: number;
+  isSelected: boolean;
+  isDisabled: boolean;
+  padRight?: boolean;
+}) {
+  const selected = props.isSelected && !props.isDisabled;
+  return (
+    <Box
+      width={props.width}
+      minWidth={props.width === undefined ? 0 : undefined}
+      flexGrow={props.width === undefined ? 1 : 0}
+      flexShrink={props.width === undefined ? 1 : 0}
+      paddingRight={props.padRight === true ? 1 : 0}
+      overflow="hidden"
+    >
       <Text
-        color={props.isSelected && selectable ? "cyan" : undefined}
-        bold={props.isSelected && selectable}
-        dimColor={!selectable}
+        color={selected ? "cyan" : undefined}
+        bold={selected}
+        dimColor={props.isDisabled}
         wrap="truncate-end"
       >
-        {marker}
-        {formatRelativeTime(props.session.updatedAt, props.now)} ·{" "}
-        {props.session.turnCount} {props.session.turnCount === 1 ? "turn" : "turns"} ·{" "}
-        {sessionStatusText(props.session)}
+        {props.value}
       </Text>
-      <Box marginLeft={2} overflow="hidden">
-        <Text dimColor={!selectable} wrap="truncate-end">
-          {preview}
-        </Text>
-      </Box>
-      <Box marginLeft={2} overflow="hidden">
-        <Box flexGrow={1} overflow="hidden">
-          <Text dimColor wrap="truncate-end">
-            {singleLine(props.session.modelName)}
-          </Text>
-        </Box>
-        <Text dimColor> {shortSessionId(props.session.sessionId)}</Text>
-      </Box>
     </Box>
   );
 }
@@ -416,20 +481,20 @@ export function formatRelativeTime(updatedAt: string, now: Date): string {
 
   const elapsedSeconds = Math.max(0, Math.floor((now.getTime() - timestamp) / 1000));
   if (elapsedSeconds < 60) {
-    return "just now";
+    return "now";
   }
 
   const elapsedMinutes = Math.floor(elapsedSeconds / 60);
   if (elapsedMinutes < 60) {
-    return formatAgo(elapsedMinutes, "minute");
+    return `${elapsedMinutes}m ago`;
   }
 
   const elapsedHours = Math.floor(elapsedMinutes / 60);
   if (elapsedHours < 24) {
-    return formatAgo(elapsedHours, "hour");
+    return `${elapsedHours}h ago`;
   }
 
-  return formatAgo(Math.floor(elapsedHours / 24), "day");
+  return `${Math.floor(elapsedHours / 24)}d ago`;
 }
 
 function initialSelectedIndex(sessions: readonly SessionSummary[]): number {
@@ -453,10 +518,14 @@ function keepSelectionVisible(
   return clamp(nextWindowStart, 0, maxWindowStart);
 }
 
-function sessionStatusText(session: SessionSummary): string {
+function sessionStatusLabel(session: SessionSummary): string {
+  return session.status;
+}
+
+function sessionStatusDetail(session: SessionSummary): string | undefined {
   switch (session.status) {
     case "resumable":
-      return "resumable";
+      return undefined;
     case "interrupted":
       return "interrupted · completes record; no tool retry";
     case "current":
@@ -481,20 +550,36 @@ function formatFooter(input: {
   windowStart: number;
   windowEnd: number;
   totalCount: number;
+  selectedSession?: SessionSummary;
 }): string {
+  const detail =
+    input.selectedSession === undefined
+      ? undefined
+      : sessionStatusDetail(input.selectedSession);
+  const withDetail = (status: string) =>
+    detail === undefined ? status : `${status} · ${detail}`;
+
   if (input.searching) {
     if (input.matchCount === 0) {
       return `No sessions match "${singleLine(input.query)}" · Esc to clear search`;
     }
     if (input.matchCount > MAX_DISPLAYED_SESSIONS) {
-      return `Showing ${input.windowStart + 1}–${input.windowEnd} / ${MAX_DISPLAYED_SESSIONS} results · ${input.matchCount} matches total`;
+      return withDetail(
+        `Showing ${input.windowStart + 1}–${input.windowEnd} / ${MAX_DISPLAYED_SESSIONS} results · ${input.matchCount} matches total`,
+      );
     }
-    return `${input.matchCount} ${input.matchCount === 1 ? "match" : "matches"}`;
+    return withDetail(
+      `${input.matchCount} ${input.matchCount === 1 ? "match" : "matches"}`,
+    );
   }
   if (input.totalCount > MAX_DISPLAYED_SESSIONS) {
-    return `Showing ${input.windowStart + 1}–${input.windowEnd} / ${MAX_DISPLAYED_SESSIONS} recent · ${input.totalCount} sessions total`;
+    return withDetail(
+      `Showing ${input.windowStart + 1}–${input.windowEnd} / ${MAX_DISPLAYED_SESSIONS} recent · ${input.totalCount} sessions total`,
+    );
   }
-  return formatWindowStatus(input.windowStart, input.windowEnd, input.totalCount);
+  return withDetail(
+    formatWindowStatus(input.windowStart, input.windowEnd, input.totalCount),
+  );
 }
 
 function formatWindowStatus(start: number, end: number, total: number): string {
@@ -515,7 +600,3 @@ function clamp(value: number, minimum: number, maximum: number): number {
 function singleLine(value: string): string {
   return value.replace(/\s+/g, " ").trim();
 }
-
-function formatAgo(value: number, unit: "minute" | "hour" | "day"): string {
-  return `${value} ${unit}${value === 1 ? "" : "s"} ago`;
-}