privateer-agent 0.1.0 → 0.2.1

package/src/components/ModelPicker.tsx

@@ -4,6 +4,7 @@ import Spinner from "ink-spinner";
 import TextInput from "ink-text-input";
 import type { Config, ProviderName } from "../config/schema.ts";
 import { configuredProviders, privateerChannel } from "../providers/resolve.ts";
+import { hasCredentials } from "../auth/privateer.ts";
 import { PROVIDER_META } from "../providers/catalog.ts";
 import { listModels, zdrPosture, type ModelInfo } from "../providers/models.ts";
 import { theme, POSTURE_COLOR } from "./theme.ts";
@@ -27,14 +28,18 @@ export function ModelPicker({
   onSelect: (spec: string) => void;
   onCancel?: () => void;
 }) {
-  const ready = useMemo(() => {
-    const offered = providers ?? configuredProviders(config).filter((p) => p.ready).map((p) => p.name);
-    return offered as ProviderName[];
+  const entries = useMemo<{ name: ProviderName; ready: boolean }[]>(() => {
+    if (providers) return providers.map((name) => ({ name, ready: true }));
+    // Ready providers, plus the Privateer account provider even when signed
+    // out: an expired machine login wipes the stored credentials, and the
+    // account silently vanishing from this list reads as a bug. It stays
+    // listed, annotated, and selecting it points at /login.
+    return configuredProviders(config).filter((p) => p.ready || p.name === "privateer");
   }, [config, providers]);
 
-  const [provider, setProvider] = useState<ProviderName | null>(ready.length === 1 ? ready[0] : null);
+  const [provider, setProvider] = useState<ProviderName | null>(entries.length === 1 ? entries[0].name : null);
 
-  if (ready.length === 0) {
+  if (entries.length === 0) {
     return (
       <Box flexDirection="column" paddingX={1}>
         <Text color={theme.error}>No providers configured. Run /login to add an API key.</Text>
@@ -43,7 +48,16 @@ export function ModelPicker({
   }
 
   if (provider === null) {
-    return <ProviderStage providers={ready} onPick={setProvider} onCancel={onCancel} />;
+    return <ProviderStage providers={entries} onPick={setProvider} onCancel={onCancel} />;
+  }
+
+  if (provider === "privateer" && !hasCredentials()) {
+    return (
+      <SignedOutStage
+        onBack={entries.length > 1 ? () => setProvider(null) : undefined}
+        onCancel={onCancel}
+      />
+    );
   }
 
   return (
@@ -51,7 +65,7 @@ export function ModelPicker({
       provider={provider}
       config={config}
       onSelect={(id) => onSelect(`${provider}:${id}`)}
-      onBack={ready.length > 1 ? () => setProvider(null) : undefined}
+      onBack={entries.length > 1 ? () => setProvider(null) : undefined}
       onCancel={onCancel}
     />
   );
@@ -62,7 +76,7 @@ function ProviderStage({
   onPick,
   onCancel,
 }: {
-  providers: ProviderName[];
+  providers: { name: ProviderName; ready: boolean }[];
   onPick: (name: ProviderName) => void;
   onCancel?: () => void;
 }) {
@@ -70,7 +84,7 @@ function ProviderStage({
   useInput((input, key) => {
     if (key.upArrow || input === "k") setCursor((c) => (c - 1 + providers.length) % providers.length);
     else if (key.downArrow || input === "j") setCursor((c) => (c + 1) % providers.length);
-    else if (key.return) onPick(providers[cursor]);
+    else if (key.return) onPick(providers[cursor].name);
     else if (key.escape) onCancel?.();
   });
 
@@ -81,10 +95,11 @@ function ProviderStage({
         <Text color={theme.accent}>enter</Text> select{onCancel ? ", esc cancel" : ""}.
       </Text>
       <Box flexDirection="column" marginTop={1}>
-        {providers.map((name, i) => (
-          <Text key={name} color={i === cursor ? theme.accent : undefined}>
+        {providers.map((p, i) => (
+          <Text key={p.name} color={i === cursor ? theme.accent : undefined}>
             {i === cursor ? "❯ " : "  "}
-            {PROVIDER_META[name].label}
+            {PROVIDER_META[p.name].label}
+            {!p.ready ? <Text color={theme.warning}> — signed out, run /login</Text> : null}
           </Text>
         ))}
       </Box>
@@ -92,6 +107,24 @@ function ProviderStage({
   );
 }
 
+// The Privateer account provider is listed but signed out (fresh install, or
+// the machine login's TTL lapsed and the credentials were wiped): explain how
+// to get it back instead of failing the model fetch with a raw auth error.
+function SignedOutStage({ onBack, onCancel }: { onBack?: () => void; onCancel?: () => void }) {
+  useInput((_input, key) => {
+    if (key.escape) (onBack ?? onCancel)?.();
+  });
+  return (
+    <Box flexDirection="column" paddingX={1}>
+      <Text color={theme.warning}>Not signed in to your Privateer account.</Text>
+      <Text color={theme.dim}>
+        Run /login to link this terminal, then pick an account model here.
+        {onBack ? " Esc to go back." : onCancel ? " Esc to cancel." : ""}
+      </Text>
+    </Box>
+  );
+}
+
 function ModelStage({
   provider,
   config,

package/src/components/OptionPicker.tsx

@@ -0,0 +1,134 @@
+import React, { useState } from "react";
+import { Box, Text, useInput } from "ink";
+import type { UserQuestion, UserAnswer } from "../tools/askUser.ts";
+import { theme } from "./theme.ts";
+
+// Interactive picker shown when the agent calls `ask_user` to choose between
+// competing approaches. The turn is blocked on the human (like the approval prompt).
+// Keys: ↑/↓ move, 1–N jump, Enter confirm, e (or the last row) write a custom answer,
+// Esc dismiss. In multiSelect mode, Space/number toggles and Enter confirms the set.
+export function OptionPicker({
+  question,
+  onRespond,
+}: {
+  question: UserQuestion;
+  onRespond: (answer: UserAnswer) => void;
+}) {
+  const { options, multiSelect } = question;
+  const otherIndex = options.length; // the trailing "write your own" row
+  const total = options.length + 1;
+  const [cursor, setCursor] = useState(0);
+  const [checked, setChecked] = useState<Set<number>>(new Set());
+  const [mode, setMode] = useState<"list" | "custom">("list");
+  const [draft, setDraft] = useState("");
+
+  function toggle(i: number) {
+    setChecked((prev) => {
+      const next = new Set(prev);
+      if (next.has(i)) next.delete(i);
+      else next.add(i);
+      return next;
+    });
+  }
+
+  function confirm() {
+    if (cursor === otherIndex) {
+      setMode("custom");
+      return;
+    }
+    if (multiSelect) {
+      const picks = checked.size > 0 ? [...checked] : [cursor];
+      onRespond({ kind: "selected", indices: picks.sort((a, b) => a - b) });
+    } else {
+      onRespond({ kind: "selected", indices: [cursor] });
+    }
+  }
+
+  useInput((input, key) => {
+    if (mode === "custom") {
+      if (key.escape) {
+        setMode("list");
+        setDraft("");
+      } else if (key.return) {
+        const text = draft.trim();
+        if (text) onRespond({ kind: "custom", text });
+      } else if (key.backspace || key.delete) {
+        setDraft((d) => d.slice(0, -1));
+      } else if (input && !key.ctrl && !key.meta) {
+        setDraft((d) => d + input);
+      }
+      return;
+    }
+
+    if (key.upArrow) setCursor((c) => (c - 1 + total) % total);
+    else if (key.downArrow) setCursor((c) => (c + 1) % total);
+    else if (key.escape) onRespond({ kind: "dismissed" });
+    else if (input === "e") setMode("custom");
+    else if (input >= "1" && input <= "9") {
+      const i = Number(input) - 1;
+      if (i < options.length) {
+        if (multiSelect) {
+          setCursor(i);
+          toggle(i);
+        } else {
+          onRespond({ kind: "selected", indices: [i] });
+        }
+      }
+    } else if (input === " " && multiSelect && cursor < options.length) {
+      toggle(cursor);
+    } else if (key.return) {
+      confirm();
+    }
+  });
+
+  if (mode === "custom") {
+    return (
+      <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={theme.accent} paddingX={1}>
+        <Text bold color={theme.accent}>
+          {question.question}
+        </Text>
+        <Text>
+          <Text color={theme.dim}>your answer: </Text>
+          {draft}
+          <Text color={theme.accent}>▏</Text>
+        </Text>
+        <Text dimColor>enter submit · esc back to options</Text>
+      </Box>
+    );
+  }
+
+  return (
+    <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={theme.accent} paddingX={1}>
+      <Text bold color={theme.accent}>
+        {question.question}
+      </Text>
+      {options.map((o, i) => {
+        const active = i === cursor;
+        const box = multiSelect ? (checked.has(i) ? "[x] " : "[ ] ") : "";
+        return (
+          <Box key={i} flexDirection="column" marginTop={1}>
+            <Text color={active ? theme.accent : undefined}>
+              <Text color={active ? theme.accent : theme.dim}>{active ? "❯ " : "  "}</Text>
+              <Text color={theme.dim}>{i + 1}. </Text>
+              {box}
+              <Text bold={active}>{o.label}</Text>
+            </Text>
+            {o.description ? <Text dimColor>{"     " + o.description}</Text> : null}
+          </Box>
+        );
+      })}
+      <Box marginTop={1}>
+        <Text color={cursor === otherIndex ? theme.accent : undefined}>
+          <Text color={cursor === otherIndex ? theme.accent : theme.dim}>{cursor === otherIndex ? "❯ " : "  "}</Text>
+          <Text color={theme.dim}>e. </Text>
+          <Text bold={cursor === otherIndex}>Something else — write your own answer</Text>
+        </Text>
+      </Box>
+      <Text dimColor>
+        {multiSelect
+          ? "↑/↓ move · space toggle · enter confirm · esc skip"
+          : "↑/↓ move · 1–" + options.length + " pick · enter confirm · esc skip"}
+      </Text>
+    </Box>
+  );
+}

package/src/components/Root.tsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useStdout } from "ink";
 import { App } from "./App.tsx";
 import { Onboarding, type OnboardingResult } from "./Onboarding.tsx";
 import { PrivateerLogin } from "./PrivateerLogin.tsx";
@@ -30,6 +31,17 @@ export function Root({
   const [modelSpec, setModelSpec] = useState(initialModel);
   const [onboarding, setOnboarding] = useState(startInOnboarding);
   const [loggingIn, setLoggingIn] = useState(false);
+  const { stdout } = useStdout();
+
+  // The App's banner/transcript lives in Ink's <Static> region, which stays in the
+  // terminal scrollback even after the component unmounts. Swapping screens (login,
+  // onboarding) and back therefore stacks a second banner under the stale one. Wipe
+  // screen + scrollback around every top-level swap so each view starts on a clean
+  // page — same trick App uses when the terminal is resized.
+  function swapScreen(update: () => void) {
+    stdout?.write("\x1b[2J\x1b[3J\x1b[H"); // clear screen + scrollback, home cursor
+    update();
+  }
 
   // Providers that already have credentials — pre-checked when re-running onboarding.
   const configured = configuredProviders(config)
@@ -47,9 +59,11 @@ export function Root({
     } catch {
       /* non-fatal: keys just won't persist to disk this run */
     }
-    setConfig(next);
-    setModelSpec(result.defaultModel);
-    setOnboarding(false);
+    swapScreen(() => {
+      setConfig(next);
+      setModelSpec(result.defaultModel);
+      setOnboarding(false);
+    });
   }
 
   // After a successful account login, switch to the Privateer-billed model so the
@@ -68,13 +82,20 @@ export function Root({
     } catch {
       /* non-fatal: model choice just won't persist this run */
     }
-    setConfig(next);
-    setModelSpec(spec);
-    setLoggingIn(false);
+    swapScreen(() => {
+      setConfig(next);
+      setModelSpec(spec);
+      setLoggingIn(false);
+    });
   }
 
   if (loggingIn) {
-    return <PrivateerLogin onComplete={finishLogin} onCancel={() => setLoggingIn(false)} />;
+    return (
+      <PrivateerLogin
+        onComplete={finishLogin}
+        onCancel={() => swapScreen(() => setLoggingIn(false))}
+      />
+    );
   }
 
   if (onboarding) {
@@ -88,8 +109,8 @@ export function Root({
       config={config}
       cwd={cwd}
       resume={resume}
-      onLogin={() => setOnboarding(true)}
-      onPrivateerLogin={() => setLoggingIn(true)}
+      onLogin={() => swapScreen(() => setOnboarding(true))}
+      onPrivateerLogin={() => swapScreen(() => setLoggingIn(true))}
     />
   );
 }

package/src/components/StatusBar.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Box, Text } from "ink";
 import { basename } from "node:path";
 import { theme, POSTURE_COLOR } from "./theme.ts";
-import { SHIELD } from "./figures.ts";
+import { SHIELD, DOT } from "./figures.ts";
 import { useTerminalWidth } from "./useTerminalWidth.ts";
 import { type UsageTotals } from "../engine/events.ts";
 import type { ZdrState } from "./useZdrShield.ts";
@@ -30,6 +30,14 @@ function TeeBadge({ tee }: { tee?: TeeState }) {
   return <Text color={theme.dim}>{`${SHIELD} TEE? · `}</Text>;
 }
 
+// Remote-access badge: a green "● remote" segment shown while /remote-access is on,
+// signalling the Privateer app can drive this terminal (send prompts / approve its
+// tool calls). Nothing at all when remote access is off.
+function RemoteBadge({ remote }: { remote?: boolean }) {
+  if (!remote) return null;
+  return <Text color={theme.success}>{`${DOT} remote · `}</Text>;
+}
+
 // Compact token count: 100, 1k, 1m, 1b — one decimal place above 1k, trimmed of
 // trailing ".0", so 1500 → "1.5k" and 2000 → "2k".
 export function formatTokens(n: number): string {
@@ -86,6 +94,7 @@ export function StatusBar(props: {
   custom?: string; // settings-driven status line; overrides the default when set
   zdr?: ZdrState; // OpenRouter ZDR posture for the selected model (default line only)
   tee?: TeeState; // NEAR AI TEE attestation posture for the selected model (default line only)
+  remote?: boolean; // /remote-access is on — the app can drive this terminal (default line only)
 }) {
   // Stay clear of the right edge (parent paddingX={1} plus a 2-col safety gap) so
   // the line never reaches the final column and the terminal never reflows it.
@@ -109,6 +118,7 @@ export function StatusBar(props: {
       <Text wrap="truncate-end">
         <ZdrBadge zdr={props.zdr} />
         <TeeBadge tee={props.tee} />
+        <RemoteBadge remote={props.remote} />
         <Text color={theme.accent}>⚓ privateer</Text>
         {diag ? <Text color={theme.dim}>{` [${diag}]`}</Text> : null}
         <Text color={theme.dim}> (shift+tab to cycle)</Text>

package/src/components/ToolCallView.tsx

@@ -21,6 +21,10 @@ function summarizeInput(name: string, input: unknown): string {
       return String(o.pattern ?? "") + (o.glob ? ` (${o.glob})` : "");
     case "task":
       return String(o.description ?? o.subagent_type ?? "");
+    case "ask_user":
+      return String(o.question ?? "");
+    case "worktree":
+      return String(o.action ?? "") + (o.name ? ` ${o.name}` : "");
     default:
       try {
         return JSON.stringify(o);

package/src/components/Transcript.tsx

@@ -102,20 +102,26 @@ export function EntryView({
       // Split off a trailing `recap:` line so it can render dimmed below the
       // response body. The model is asked to end each turn with one such line.
       const { body, recap } = splitRecap(entry.text);
+      const hasBody = body.trim().length > 0;
+      // Nothing to paint: a whitespace-only entry (possible in transcripts
+      // persisted before the turn loop filtered them) would render a bare ⏺.
+      if (!hasBody && !recap) return null;
       // ⏺ bullet in its own column so wrapped lines align under the text.
       return (
         <Box marginTop={1} flexDirection="column">
-          <Box>
-            <Text color={theme.accent}>{BULLET} </Text>
-            <Box width={bodyWidth}>
-              <Markdown text={body} />
+          {hasBody && (
+            <Box>
+              <Text color={theme.accent}>{BULLET} </Text>
+              <Box width={bodyWidth}>
+                <Markdown text={body} />
+              </Box>
             </Box>
-          </Box>
+          )}
           {recap && (
-            <Box marginTop={1}>
+            <Box marginTop={hasBody ? 1 : 0}>
               <Text color={theme.dim}>{"  "}</Text>
               <Box width={bodyWidth}>
-                <Text color="white">
+                <Text color={theme.dim} dimColor italic>
                   {recap}
                 </Text>
               </Box>
@@ -127,6 +133,7 @@ export function EntryView({
     case "thinking": {
       // The model's reasoning, rendered dimmed under a thinking mark. When
       // collapsed (Ctrl+O), show just a one-line summary instead of the full text.
+      if (entry.text.trim() === "") return null;
       if (collapsed) {
         const lineCount = entry.text.trim() === "" ? 0 : entry.text.trim().split("\n").length;
         return (

package/src/components/figures.ts

@@ -10,4 +10,5 @@ export const POINTER = "❯"; // selection pointer in menus and the prompt caret
 export const FAST_FORWARD = "⏵⏵"; // marks an "on" permission mode below the prompt
 export const PAUSE = "⏸"; // marks plan mode (paused execution) below the prompt
 export const SHIELD = "⛉"; // U+26C9 — OpenRouter ZDR posture marker in the status bar
+export const DOT = "●"; // U+25CF — "live" marker; the remote-access badge in the status bar
 export const DOWN = "↓"; // U+2193 — output tokens streaming down from the model (spinner)

package/src/components/theme.ts

@@ -50,6 +50,8 @@ const TOOL_DISPLAY: Record<string, string> = {
   task: "Task",
   web_fetch: "WebFetch",
   web_search: "WebSearch",
+  ask_user: "AskUser",
+  worktree: "Worktree",
 };
 
 export const toolDisplayName = (name: string): string => TOOL_DISPLAY[name] ?? name;

package/src/config/paths.ts

@@ -35,6 +35,7 @@ export interface ScopePaths {
   settingsLocal: string; // settings.local.json — gitignored local overrides
   commands: string; // commands/ — custom slash commands (M2)
   agents: string; // agents/ — custom subagents (M4)
+  skills: string; // skills/ — agent skills, one SKILL.md directory each
   outputStyles: string; // output-styles/ — persona prompts (M2)
   mcp: string; // mcp.json — MCP server declarations (M4)
 }
@@ -47,6 +48,7 @@ function scopePaths(dir: string): ScopePaths {
     settingsLocal: join(dir, "settings.local.json"),
     commands: join(dir, "commands"),
     agents: join(dir, "agents"),
+    skills: join(dir, "skills"),
     outputStyles: join(dir, "output-styles"),
     mcp: join(dir, "mcp.json"),
   };

package/src/context/systemPrompt.ts

@@ -51,6 +51,15 @@ before doing it.
 work is attributed to Privateer as a co-author:
   Co-Authored-By: Privateer <291203302+privateer-first-mate@users.noreply.github.com>
 - Use 'web_fetch' to read a known URL when the user provides one or you need current docs.
+- When the implementation direction is genuinely ambiguous and the choice materially shapes the \
+work — a structural/architectural fork, which library or data model to adopt, the scope of a \
+change — don't silently guess. Lay out the realistic approaches and call 'ask_user' to let the \
+user pick (2–4 options, most-recommended first, each with its trade-offs). Reserve it for \
+consequential forks: for small, reversible choices, just make the call and proceed. After the \
+user chooses, build that direction without re-litigating it.
+- To try a risky or exploratory approach without disturbing the main tree, use 'worktree' to spin \
+up an isolated branch + working copy, do the work there, and let the user compare its diff before \
+keeping or discarding it.
 - Mutating actions (write/edit/bash) may require user approval; that's expected — proceed and let \
 the gate handle it.`;