@robota-sdk/agent-cli 3.0.0-beta.60 → 3.0.0-beta.61

package/dist/node/{chunk-GHQHUBHC.js → chunk-J654S773.js}

@@ -3,55 +3,30 @@ import {
   createProviderFromSettings,
   findProviderDefinition,
   formatSupportedProviderTypes,
+  getProviderCredentialRequirement,
   getProviderSettingsPaths,
   hasUsableSecretReference,
   isSubagentWorkerChildMessage,
   readMergedProviderSettings,
   readMergedProviderSettingsFromPaths,
   readProviderSettings
-} from "./chunk-6XQKLNRF.js";
+} from "./chunk-BENOH47A.js";
 
 // src/background/managed-shell-process-runner.ts
 import { spawn } from "child_process";
 import {
-  BackgroundTaskError
+  BackgroundTaskError,
+  appendPrefixedLogLines,
+  createBackgroundTaskLogPage,
+  createLimitedOutputCapture
 } from "@robota-sdk/agent-sdk";
 var DEFAULT_OUTPUT_LIMIT_BYTES = 3e4;
 var DEFAULT_KILL_GRACE_MS = 2e3;
-var LOG_PAGE_SIZE = 200;
-function createCapture(limitBytes) {
-  const chunks = [];
-  let capturedBytes = 0;
-  let truncated = false;
-  return {
-    appendOutput(text) {
-      if (truncated) return;
-      const remaining = limitBytes - capturedBytes;
-      const buffer = Buffer.from(text, "utf8");
-      if (buffer.byteLength <= remaining) {
-        chunks.push(text);
-        capturedBytes += buffer.byteLength;
-        return;
-      }
-      chunks.push(buffer.subarray(0, Math.max(remaining, 0)).toString("utf8"));
-      chunks.push("\n[output truncated]\n");
-      truncated = true;
-    },
-    getOutput() {
-      return chunks.join("");
-    }
-  };
-}
-function appendLog(lines, source, text) {
-  for (const line of text.split(/\r?\n/)) {
-    if (line.length > 0) lines.push(`[${source}] ${line}`);
-  }
-}
 function resolveShell(request) {
   return { command: request.shell ?? "sh", args: ["-c", request.command] };
 }
 function sendInput(child, input) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const onError = (error) => {
       child.stdin.off("error", onError);
       reject(error);
@@ -59,7 +34,7 @@ function sendInput(child, input) {
     child.stdin.once("error", onError);
     child.stdin.end(input, () => {
       child.stdin.off("error", onError);
-      resolve2();
+      resolve3();
     });
   });
 }
@@ -86,7 +61,9 @@ function startProcessTask(taskId, request, killGraceMs) {
       stdio: ["pipe", "pipe", "pipe"]
     }),
     logs: [],
-    capture: createCapture(request.outputLimitBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES),
+    capture: createLimitedOutputCapture({
+      limitBytes: request.outputLimitBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES
+    }),
     killGraceMs
   };
   const result = createProcessResult(runtime);
@@ -94,9 +71,13 @@ function startProcessTask(taskId, request, killGraceMs) {
 }
 function createProcessResult(runtime) {
   let settled = false;
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const timeoutTimer = runtime.request.timeoutMs ? setTimeout(() => {
-      appendLog(runtime.logs, "system", `timed out after ${runtime.request.timeoutMs}ms`);
+      appendPrefixedLogLines(
+        runtime.logs,
+        "system",
+        `timed out after ${runtime.request.timeoutMs}ms`
+      );
       runtime.child.kill("SIGTERM");
       rejectOnceLocal(new BackgroundTaskError("timeout", "Background process timed out"));
     }, runtime.request.timeoutMs) : void 0;
@@ -108,7 +89,7 @@ function createProcessResult(runtime) {
       if (settled) return;
       settled = true;
       clearTimers();
-      resolve2({
+      resolve3({
         taskId: runtime.taskId,
         kind: "process",
         output: runtime.capture.getOutput(),
@@ -124,7 +105,7 @@ function createProcessResult(runtime) {
     }
     attachOutputListeners(runtime);
     runtime.child.on("error", (error) => {
-      appendLog(runtime.logs, "system", error.message);
+      appendPrefixedLogLines(runtime.logs, "system", error.message);
       rejectOnceLocal(new BackgroundTaskError("process", error.message));
     });
     runtime.child.on("close", (code, signal) => {
@@ -155,30 +136,27 @@ function attachOutputListeners(runtime) {
   runtime.child.stdout.on("data", (chunk) => {
     const text = chunk.toString("utf8");
     runtime.capture.appendOutput(text);
-    appendLog(runtime.logs, "stdout", text);
+    appendPrefixedLogLines(runtime.logs, "stdout", text);
   });
   runtime.child.stderr.on("data", (chunk) => {
     const text = chunk.toString("utf8");
     runtime.capture.appendOutput(text);
-    appendLog(runtime.logs, "stderr", text);
+    appendPrefixedLogLines(runtime.logs, "stderr", text);
   });
 }
 function cancelProcess(runtime, reason) {
-  appendLog(runtime.logs, "system", reason ? `cancel requested: ${reason}` : "cancel requested");
+  appendPrefixedLogLines(
+    runtime.logs,
+    "system",
+    reason ? `cancel requested: ${reason}` : "cancel requested"
+  );
   if (!runtime.child.killed) runtime.child.kill("SIGTERM");
   runtime.killTimer = setTimeout(() => {
     if (!runtime.child.killed) runtime.child.kill("SIGKILL");
   }, runtime.killGraceMs);
 }
 function readProcessLog(runtime, cursor) {
-  const offset = cursor?.offset ?? 0;
-  const nextOffset = Math.min(offset + LOG_PAGE_SIZE, runtime.logs.length);
-  return {
-    taskId: runtime.taskId,
-    cursor,
-    nextCursor: nextOffset < runtime.logs.length ? { offset: nextOffset } : void 0,
-    lines: runtime.logs.slice(offset, nextOffset)
-  };
+  return createBackgroundTaskLogPage(runtime.taskId, runtime.logs, cursor);
 }
 
 // src/subagents/git-worktree-isolation-adapter.ts
@@ -305,6 +283,7 @@ import { existsSync, readFileSync } from "fs";
 import { dirname, join as join2 } from "path";
 import {
   BackgroundTaskError as BackgroundTaskError5,
+  createBackgroundTaskLogPage as createBackgroundTaskLogPage2,
   getBuiltInAgent,
   createWorktreeSubagentRunner
 } from "@robota-sdk/agent-sdk";
@@ -360,7 +339,7 @@ function extractFirstArg(toolArgs) {
   return typeof firstValue === "object" ? JSON.stringify(firstValue) : String(firstValue);
 }
 function sendWorkerMessage(child, message) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     if (!child.connected) {
       reject(new BackgroundTaskError3("crash", "Subagent worker IPC channel is closed"));
       return;
@@ -370,7 +349,7 @@ function sendWorkerMessage(child, message) {
         reject(error);
         return;
       }
-      resolve2();
+      resolve3();
     });
   });
 }
@@ -387,14 +366,14 @@ async function cancelChildProcess(runtime, reason) {
 
 // src/subagents/child-process-subagent-runner-result.ts
 function createChildProcessSubagentResult(options) {
-  return new Promise((resolve2, reject) => {
-    new ChildProcessSubagentResultController(options, resolve2, reject).start();
+  return new Promise((resolve3, reject) => {
+    new ChildProcessSubagentResultController(options, resolve3, reject).start();
   });
 }
 var ChildProcessSubagentResultController = class {
-  constructor(options, resolve2, reject) {
+  constructor(options, resolve3, reject) {
     this.options = options;
-    this.resolve = resolve2;
+    this.resolve = resolve3;
     this.reject = reject;
     this.timeoutTimer = createTimeoutTimer(this.options.runtime, (error) => this.rejectOnce(error));
   }
@@ -501,7 +480,6 @@ function formatEarlyExitMessage(code, signal) {
 
 // src/subagents/child-process-subagent-runner.ts
 var DEFAULT_KILL_GRACE_MS2 = 2e3;
-var LOG_PAGE_SIZE2 = 200;
 function createChildProcessSubagentRunnerFactory(options = {}) {
   return (deps) => {
     const runner = new ChildProcessSubagentRunner(deps, options);
@@ -639,7 +617,6 @@ function resolveDefaultExecArgv(workerPath) {
   return [...process.execArgv, "--import", "tsx"];
 }
 function readTranscriptLog(jobId, transcriptPath, cursor) {
-  const offset = cursor?.offset ?? 0;
   if (!existsSync(transcriptPath)) {
     return {
       taskId: jobId,
@@ -648,18 +625,12 @@ function readTranscriptLog(jobId, transcriptPath, cursor) {
     };
   }
   const lines = readFileSync(transcriptPath, "utf8").split(/\r?\n/).filter(Boolean);
-  const nextOffset = Math.min(offset + LOG_PAGE_SIZE2, lines.length);
-  return {
-    taskId: jobId,
-    cursor,
-    nextCursor: nextOffset < lines.length ? { offset: nextOffset } : void 0,
-    lines: lines.slice(offset, nextOffset)
-  };
+  return createBackgroundTaskLogPage2(jobId, lines, cursor);
 }
 
 // src/cli.ts
 import { readFileSync as readFileSync6 } from "fs";
-import { join as join9, dirname as dirname5 } from "path";
+import { join as join9, dirname as dirname5, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 import { createAgentCommandModule } from "@robota-sdk/agent-command-agent";
 import { createBackgroundCommandModule } from "@robota-sdk/agent-command-background";
@@ -670,7 +641,6 @@ import { createExitCommandModule } from "@robota-sdk/agent-command-exit";
 import { createHelpCommandModule } from "@robota-sdk/agent-command-help";
 import { createLanguageCommandModule } from "@robota-sdk/agent-command-language";
 import { createMemoryCommandModule } from "@robota-sdk/agent-command-memory";
-import { createModeCommandModule } from "@robota-sdk/agent-command-mode";
 import { createModelCommandModule } from "@robota-sdk/agent-command-model";
 import { createPermissionsCommandModule } from "@robota-sdk/agent-command-permissions";
 import { createPluginCommandModule } from "@robota-sdk/agent-command-plugin";
@@ -678,8 +648,14 @@ import { createResetCommandModule } from "@robota-sdk/agent-command-reset";
 import { createRewindCommandModule } from "@robota-sdk/agent-command-rewind";
 import { createStatusLineCommandModule } from "@robota-sdk/agent-command-statusline";
 import { createSessionCommandModule } from "@robota-sdk/agent-command-session";
-import { InteractiveSession as InteractiveSession2, projectPaths } from "@robota-sdk/agent-sdk";
-import { SessionStore } from "@robota-sdk/agent-sessions";
+import { createSkillsCommandModule } from "@robota-sdk/agent-command-skills";
+import {
+  InteractiveSession as InteractiveSession2,
+  createProjectSessionStore,
+  projectPaths,
+  resolveLatestSessionId,
+  resolveSessionIdByIdOrName
+} from "@robota-sdk/agent-sdk";
 
 // src/utils/cli-args.ts
 import { parseArgs } from "util";
@@ -719,6 +695,7 @@ function parseCliArgs() {
       "output-format": { type: "string" },
       "system-prompt": { type: "string" },
       "append-system-prompt": { type: "string" },
+      "task-file": { type: "string" },
       version: { type: "boolean", default: false },
       reset: { type: "boolean", default: false },
       bare: { type: "boolean", default: false },
@@ -752,6 +729,7 @@ function parseCliArgs() {
     outputFormat: values["output-format"],
     systemPrompt: values["system-prompt"],
     appendSystemPrompt: values["append-system-prompt"],
+    taskFile: values["task-file"],
     version: values["version"] ?? false,
     reset: values["reset"] ?? false,
     bare: values["bare"] ?? false,
@@ -824,23 +802,33 @@ function isUsableProviderProfile(type, profile, providerDefinitions) {
   if (!profile) {
     return false;
   }
-  if (hasUsableSecretReference(profile.apiKey)) {
-    return true;
-  }
   if (!type) {
-    return false;
+    return hasUsableSecretReference(profile.apiKey);
   }
   const definition = findProviderDefinition(providerDefinitions, type);
   if (definition === void 0) {
     return false;
   }
-  return definition.requiresApiKey !== true || hasUsableSecretReference(definition.defaults?.apiKey);
+  const credentialRequirement = getProviderCredentialRequirement(definition);
+  if (credentialRequirement === void 0) {
+    return true;
+  }
+  return hasUsableRequiredProviderCredential(profile, definition, credentialRequirement);
+}
+function hasUsableRequiredProviderCredential(profile, definition, requirement) {
+  return requirement.anyOf.some(
+    (field) => hasUsableSecretReference(resolveProviderCredentialValue(field, profile, definition))
+  );
+}
+function resolveProviderCredentialValue(field, profile, definition) {
+  return profile[field] ?? definition.defaults?.[field];
 }
 
 // src/utils/provider-settings.ts
 import {
   buildProviderProfile,
   buildProviderSetupPatch,
+  deleteProviderProfile,
   mergeProviderPatch,
   setCurrentProvider,
   upsertProviderProfile,
@@ -848,6 +836,14 @@ import {
 } from "@robota-sdk/agent-sdk";
 
 // src/utils/provider-configuration.ts
+function resolveProviderSettingsWriteTargetPath(cwd, options = {}) {
+  const settingsPaths = options.settingsPaths ?? getProviderSettingsPaths(cwd);
+  const targetPath = findLastPathWithCurrentProvider(settingsPaths) ?? settingsPaths[0];
+  if (targetPath === void 0) {
+    throw new Error("No settings path available for provider update");
+  }
+  return targetPath;
+}
 function readProviderDocument(settingsPath) {
   return readSettings(settingsPath);
 }
@@ -930,11 +926,21 @@ function findLastPathWithLegacyProvider(settingsPaths) {
   }
   return void 0;
 }
+function findLastPathWithCurrentProvider(settingsPaths) {
+  for (let index = settingsPaths.length - 1; index >= 0; index -= 1) {
+    const settingsPath = settingsPaths[index];
+    if (settingsPath === void 0) continue;
+    const settings = readProviderDocument(settingsPath);
+    if (settings.currentProvider !== void 0) return settingsPath;
+  }
+  return void 0;
+}
 
 // src/utils/provider-setup-flow.ts
 import {
   createProviderSetupFlow,
   formatProviderSetupChoiceLabel,
+  formatProviderSetupHelpLinks,
   formatProviderSetupPromptLabel,
   formatProviderSetupSelectionPrompt,
   getProviderSetupStep,
@@ -965,7 +971,8 @@ function handleProviderConfigurationArgs(cwd, args, providerDefinitions = DEFAUL
     return !args.printMode && args.positional.length === 0;
   }
   if (args.provider && args.setCurrent) {
-    applyProviderSwitch(settingsPath, args.provider, {
+    const switchSettingsPath = args.settingsScope === void 0 ? resolveProviderSettingsWriteTargetPath(cwd) : settingsPath;
+    applyProviderSwitch(switchSettingsPath, args.provider, {
       knownProviders: readMergedProviderSettings(cwd).providers
     });
     process.stdout.write(`Current provider set to ${args.provider}
@@ -999,7 +1006,9 @@ async function runInteractiveProviderSetup(cwd, args, promptInput2, providerDefi
   const providerChoice = await promptInput2(formatProviderSetupSelectionPrompt(providerDefinitions));
   const type = resolveProviderSetupSelection(providerChoice, providerDefinitions);
   const settingsPath = getSettingsPathForScope(cwd, args.settingsScope);
-  const input = await runProviderSetupPromptFlow(type, promptInput2, providerDefinitions);
+  const input = await runProviderSetupPromptFlow(type, promptInput2, providerDefinitions, {
+    existingProfileNames: Object.keys(readMergedProviderSettings(cwd).providers ?? {})
+  });
   applyProviderConfiguration(settingsPath, input, {
     providerDefinitions
   });
@@ -1087,16 +1096,12 @@ import { render } from "ink";
 // src/ui/App.tsx
 import { useState as useState14, useEffect as useEffect4 } from "react";
 import { Box as Box18, Text as Text20, useApp as useApp2, useInput as useInput8 } from "ink";
+import { listResumableSessionSummaries } from "@robota-sdk/agent-sdk";
 import { createSystemMessage as createSystemMessage6, messageToHistoryEntry as messageToHistoryEntry6 } from "@robota-sdk/agent-core";
 
 // src/ui/hooks/useInteractiveSession.ts
 import { useState, useRef, useCallback as useCallback2, useEffect } from "react";
-import {
-  InteractiveSession,
-  CommandRegistry as CommandRegistry2,
-  createBuiltinCommandModule,
-  SkillCommandSource
-} from "@robota-sdk/agent-sdk";
+import { InteractiveSession, CommandRegistry as CommandRegistry2 } from "@robota-sdk/agent-sdk";
 import { createSystemMessage as createSystemMessage2, messageToHistoryEntry as messageToHistoryEntry2 } from "@robota-sdk/agent-core";
 
 // src/ui/background-task-view-model.ts
@@ -1362,7 +1367,6 @@ var TuiStateManager = class {
 
 // src/ui/hooks/useSlashRouting.ts
 import { useCallback } from "react";
-import { randomUUID as randomUUID2 } from "crypto";
 import { createSystemMessage, messageToHistoryEntry } from "@robota-sdk/agent-core";
 
 // src/plugins/plugin-command-source-loader.ts
@@ -1391,7 +1395,7 @@ function reloadPluginCommandSource(registry) {
 }
 
 // src/ui/hooks/useSlashRouting.ts
-function useSlashRouting(interactiveSession, registry, manager) {
+function useSlashRouting(interactiveSession, registry, manager, commandEffectQueue) {
   return useCallback(
     async (input) => {
       manager.onUserTurnAccepted();
@@ -1405,10 +1409,11 @@ function useSlashRouting(interactiveSession, registry, manager) {
       const args = parts.slice(1).join(" ");
       const result = await interactiveSession.executeCommand(cmd, args);
       if (result) {
-        applySystemCommandResult(result, interactiveSession, registry, manager);
-        return;
-      }
-      if (await routeSkillCommand(input, cmd, registry, interactiveSession, manager)) {
+        if (result.effects?.some((effect) => effect.type === "session-execution-started")) {
+          manager.setPendingPrompt(interactiveSession.getPendingPrompt());
+          return;
+        }
+        applySystemCommandResult(result, interactiveSession, registry, manager, commandEffectQueue);
         return;
       }
       manager.addEntry(
@@ -1417,18 +1422,17 @@ function useSlashRouting(interactiveSession, registry, manager) {
         )
       );
     },
-    [interactiveSession, registry, manager]
+    [interactiveSession, registry, manager, commandEffectQueue]
   );
 }
-function applySystemCommandResult(result, interactiveSession, registry, manager) {
+function applySystemCommandResult(result, interactiveSession, registry, manager, commandEffectQueue) {
   const pendingEffects = applyImmediateCommandEffects(result.effects, registry, manager);
   manager.addEntry(messageToHistoryEntry(createSystemMessage(result.message)));
-  const effects = getEffects(interactiveSession);
   if (result.interaction !== void 0) {
-    effects._pendingCommandInteraction = result.interaction;
+    commandEffectQueue.enqueueInteraction(result.interaction);
   }
   if (pendingEffects.length > 0) {
-    effects._pendingCommandEffects = pendingEffects;
+    commandEffectQueue.enqueueEffects(pendingEffects);
   }
   const ctx = interactiveSession.getContextState();
   manager.setContextState({
@@ -1453,37 +1457,32 @@ function applyImmediateCommandEffects(effects, registry, manager) {
   }
   return pendingEffects;
 }
-async function routeSkillCommand(input, cmd, registry, interactiveSession, manager) {
-  const skillCmd = registry.getCommands().find((c) => c.name === cmd && (c.source === "skill" || c.source === "plugin"));
-  if (!skillCmd) {
-    return false;
+
+// src/ui/hooks/command-effect-queue.ts
+var CommandEffectQueue = class {
+  queue = [];
+  enqueueInteraction(interaction) {
+    this.queue.push({ type: "interaction", interaction });
   }
-  manager.addEntry({
-    id: randomUUID2(),
-    timestamp: /* @__PURE__ */ new Date(),
-    category: "event",
-    type: "skill-invocation",
-    data: {
-      skillName: cmd,
-      source: skillCmd.source,
-      message: `Invoking ${skillCmd.source}: ${cmd}`
-    }
-  });
-  const args = input.slice(1 + cmd.length).trimStart();
-  const qualifiedName = registry.resolveQualifiedName(cmd);
-  const hookInput = qualifiedName ? `/${qualifiedName}${input.slice(1 + cmd.length)}` : input;
-  await interactiveSession.executeSkillCommand(skillCmd, args, input, hookInput);
-  manager.setPendingPrompt(interactiveSession.getPendingPrompt());
-  return true;
-}
-function getEffects(interactiveSession) {
-  return interactiveSession;
-}
+  enqueueEffects(effects) {
+    if (effects.length === 0) return;
+    this.queue.push({ type: "effects", effects: [...effects] });
+  }
+  drain() {
+    return this.queue.shift();
+  }
+  clear() {
+    this.queue.length = 0;
+  }
+};
 
 // src/ui/hooks/useInteractiveSession.ts
 function applyCompactEventToManager(interactiveSession, manager) {
   manager.syncHistory(interactiveSession.getFullHistory());
 }
+function applySkillActivationEventToManager(interactiveSession, manager) {
+  manager.syncHistory(interactiveSession.getFullHistory());
+}
 function initializeSession(props, permissionHandler) {
   const interactiveSession = new InteractiveSession({
     cwd: props.cwd,
@@ -1501,14 +1500,13 @@ function initializeSession(props, permissionHandler) {
     commandHostAdapters: props.commandHostAdapters
   });
   const registry = new CommandRegistry2();
-  registry.addModule(createBuiltinCommandModule());
   for (const module of props.commandModules ?? []) {
     registry.addModule(module);
   }
-  registry.addSource(new SkillCommandSource(props.cwd));
   reloadPluginCommandSource(registry);
   const manager = new TuiStateManager();
-  return { interactiveSession, registry, manager };
+  const commandEffectQueue = new CommandEffectQueue();
+  return { interactiveSession, registry, manager, commandEffectQueue };
 }
 function useInteractiveSession(props) {
   const [, forceRender] = useState(0);
@@ -1537,8 +1535,8 @@ function useInteractiveSession(props) {
     });
   }, []);
   const permissionHandler = useCallback2(
-    (toolName, toolArgs) => new Promise((resolve2) => {
-      permissionQueueRef.current.push({ toolName, toolArgs, resolve: resolve2 });
+    (toolName, toolArgs) => new Promise((resolve3) => {
+      permissionQueueRef.current.push({ toolName, toolArgs, resolve: resolve3 });
       processNextPermission();
     }),
     [processNextPermission]
@@ -1547,7 +1545,7 @@ function useInteractiveSession(props) {
   if (stateRef.current === null) {
     stateRef.current = initializeSession(props, permissionHandler);
   }
-  const { interactiveSession, registry, manager } = stateRef.current;
+  const { interactiveSession, registry, manager, commandEffectQueue } = stateRef.current;
   manager.onChange = () => forceRender((n) => n + 1);
   if (manager.history.length === 0) {
     const restored = interactiveSession.getFullHistory();
@@ -1557,6 +1555,7 @@ function useInteractiveSession(props) {
   }
   useEffect(() => {
     const onCompact = () => applyCompactEventToManager(interactiveSession, manager);
+    const onSkillActivation = () => applySkillActivationEventToManager(interactiveSession, manager);
     interactiveSession.on("text_delta", manager.onTextDelta);
     interactiveSession.on("tool_start", manager.onToolStart);
     interactiveSession.on("tool_end", manager.onToolEnd);
@@ -1566,6 +1565,7 @@ function useInteractiveSession(props) {
     interactiveSession.on("error", manager.onError);
     interactiveSession.on("context_update", manager.onContextUpdate);
     interactiveSession.on("compact", onCompact);
+    interactiveSession.on("skill_activation", onSkillActivation);
     interactiveSession.on("background_task_event", manager.onBackgroundTaskEvent);
     const initCheck = setInterval(() => {
       try {
@@ -1594,6 +1594,7 @@ function useInteractiveSession(props) {
       interactiveSession.off("error", manager.onError);
       interactiveSession.off("context_update", manager.onContextUpdate);
       interactiveSession.off("compact", onCompact);
+      interactiveSession.off("skill_activation", onSkillActivation);
       interactiveSession.off("background_task_event", manager.onBackgroundTaskEvent);
     };
   }, [interactiveSession, manager]);
@@ -1603,7 +1604,7 @@ function useInteractiveSession(props) {
       manager.setPendingPrompt(interactiveSession.getPendingPrompt());
     }
   }, [manager.isThinking, interactiveSession, manager]);
-  const handleSubmit = useSlashRouting(interactiveSession, registry, manager);
+  const handleSubmit = useSlashRouting(interactiveSession, registry, manager, commandEffectQueue);
   const handleAbort = useCallback2(() => {
     manager.setAborting(true);
     interactiveSession.abort();
@@ -1624,6 +1625,7 @@ function useInteractiveSession(props) {
   return {
     interactiveSession,
     registry,
+    commandEffectQueue,
     history: manager.history,
     addEntry: (entry) => manager.addEntry(entry),
     streamingText: manager.streamingText,
@@ -1916,10 +1918,12 @@ function useSideEffects({
   cwd,
   providerOverride,
   interactiveSession,
+  commandEffectQueue,
   addEntry,
   baseHandleSubmit,
   setSessionName,
-  setStatusLineSettings
+  setStatusLineSettings,
+  showSessionPickerOnStart
 }) {
   const { exit } = useApp();
   const [pendingModelId, setPendingModelId] = useState2(null);
@@ -1927,7 +1931,7 @@ function useSideEffects({
   const [pendingInteractionPrompt, setPendingInteractionPrompt] = useState2(null);
   const commandInteractionRef = useRef2(null);
   const [showPluginTUI, setShowPluginTUI] = useState2(false);
-  const [showSessionPicker, setShowSessionPicker] = useState2(false);
+  const [showSessionPicker, setShowSessionPicker] = useState2(showSessionPickerOnStart ?? false);
   const requestShutdown = useCallback3(
     (reason, message) => {
       addEntry(messageToHistoryEntry5(createSystemMessage5("Shutting down...")));
@@ -1968,33 +1972,31 @@ function useSideEffects({
       commandInteractionRef.current = null;
       setPendingInteractionPrompt(null);
       if (result.effects !== void 0 && result.effects.length > 0) {
-        applyEffects(result.effects, interactiveSession);
+        applyEffects(result.effects, getHostSideEffects(interactiveSession));
       }
     },
     [addEntry, applyEffects, interactiveSession]
   );
   const applyQueuedCommandState = useCallback3(
     (sideEffects) => {
-      if (sideEffects._pendingCommandInteraction !== void 0) {
-        const interaction = sideEffects._pendingCommandInteraction;
-        delete sideEffects._pendingCommandInteraction;
+      const queued = commandEffectQueue.drain();
+      if (queued === void 0) {
+        return false;
+      }
+      if (queued.type === "interaction") {
+        const { interaction } = queued;
         commandInteractionRef.current = interaction;
         setPendingInteractionPrompt(interaction.prompt);
         return true;
       }
-      if (sideEffects._pendingCommandEffects !== void 0) {
-        const effects = sideEffects._pendingCommandEffects;
-        delete sideEffects._pendingCommandEffects;
-        return applyEffects(effects, sideEffects);
-      }
-      return false;
+      return applyEffects(queued.effects, sideEffects);
     },
-    [applyEffects]
+    [applyEffects, commandEffectQueue]
   );
   const handleSubmit = useCallback3(
     async (input) => {
       await baseHandleSubmit(input);
-      const sideEffects = interactiveSession;
+      const sideEffects = getHostSideEffects(interactiveSession);
       if (applyQueuedCommandState(sideEffects)) return;
       if (sideEffects._pendingModelId) {
         const modelId = sideEffects._pendingModelId;
@@ -2105,6 +2107,9 @@ function useSideEffects({
     handleInteractionCancel
   };
 }
+function getHostSideEffects(interactiveSession) {
+  return interactiveSession;
+}
 
 // src/ui/hooks/useStatusLineSettings.ts
 import { useState as useState3 } from "react";
@@ -2122,10 +2127,12 @@ import { isToolMessage, isAssistantMessage } from "@robota-sdk/agent-core";
 // src/ui/render-markdown.ts
 import { marked } from "marked";
 import TerminalRenderer from "marked-terminal";
-var ANSI_RED = "\x1B[31m";
-var ANSI_GREEN = "\x1B[32m";
+var ANSI_LIGHT_RED = "\x1B[38;5;210m";
+var ANSI_LIGHT_GREEN = "\x1B[38;5;120m";
 var ANSI_CYAN = "\x1B[36m";
 var ANSI_DIM = "\x1B[2m";
+var ANSI_DARK_RED_BACKGROUND = "\x1B[48;5;52m";
+var ANSI_DARK_GREEN_BACKGROUND = "\x1B[48;5;22m";
 var ANSI_RESET = "\x1B[0m";
 var CODE_BLOCK_INDENT = "    ";
 var ZERO_COLOR = "0";
@@ -2145,36 +2152,59 @@ function shouldUseColor(option) {
 function isDiffLanguage(language) {
   return language?.trim().toLowerCase() === "diff";
 }
-function colorizeDiffLine(line, color) {
+function styleAddedOrRemovedDiffRow(line, rowWidth, color) {
+  const row = `${CODE_BLOCK_INDENT}${line}`.padEnd(rowWidth);
   if (!color) {
-    return line;
+    return row.trimEnd();
   }
   if (line.startsWith("+")) {
-    return `${ANSI_GREEN}${line}${ANSI_RESET}`;
+    return `${ANSI_DARK_GREEN_BACKGROUND}${ANSI_LIGHT_GREEN}${row}${ANSI_RESET}`;
   }
   if (line.startsWith("-")) {
-    return `${ANSI_RED}${line}${ANSI_RESET}`;
+    return `${ANSI_DARK_RED_BACKGROUND}${ANSI_LIGHT_RED}${row}${ANSI_RESET}`;
+  }
+  return row.trimEnd();
+}
+function colorizeDiffLine(line, color, rowWidth) {
+  if (line.startsWith("+") || line.startsWith("-")) {
+    return styleAddedOrRemovedDiffRow(line, rowWidth, color);
+  }
+  const row = `${CODE_BLOCK_INDENT}${line}`;
+  if (!color) {
+    return row;
   }
   if (line.startsWith("@@")) {
-    return `${ANSI_CYAN}${line}${ANSI_RESET}`;
+    return `${ANSI_CYAN}${row}${ANSI_RESET}`;
   }
   if (line.startsWith("diff ") || line.startsWith("index ")) {
-    return `${ANSI_DIM}${line}${ANSI_RESET}`;
+    return `${ANSI_DIM}${row}${ANSI_RESET}`;
   }
-  return line;
+  return row;
 }
-function renderDiffCodeBlock(code, color) {
-  const body = code.split("\n").map((line) => `${CODE_BLOCK_INDENT}${colorizeDiffLine(line, color)}`).join("\n");
+function resolveDiffRowWidth(lines, requestedWidth) {
+  const minimumWidth = lines.reduce(
+    (maxWidth, line) => Math.max(maxWidth, CODE_BLOCK_INDENT.length + line.length),
+    0
+  );
+  if (requestedWidth === void 0) {
+    return minimumWidth;
+  }
+  return Math.max(minimumWidth, requestedWidth);
+}
+function renderDiffCodeBlock(code, color, codeBlockWidth) {
+  const lines = code.split("\n");
+  const rowWidth = resolveDiffRowWidth(lines, codeBlockWidth);
+  const body = lines.map((line) => colorizeDiffLine(line, color, rowWidth)).join("\n");
   return `${body}
 
 `;
 }
-function createTerminalRenderer(color) {
+function createTerminalRenderer(color, codeBlockWidth) {
   const renderer = new TerminalRendererConstructor(void 0, { ignoreIllegals: true });
   const renderCode = renderer.code.bind(renderer);
   renderer.code = (code, language, escaped) => {
     if (isDiffLanguage(language)) {
-      return renderDiffCodeBlock(code, color);
+      return renderDiffCodeBlock(code, color, codeBlockWidth);
     }
     return renderCode(code, language, escaped);
   };
@@ -2182,7 +2212,7 @@ function createTerminalRenderer(color) {
 }
 function renderMarkdown(md, options = {}) {
   const result = marked.parse(md, {
-    renderer: createTerminalRenderer(shouldUseColor(options.color))
+    renderer: createTerminalRenderer(shouldUseColor(options.color), options.codeBlockWidth)
   });
   return typeof result === "string" ? result.trimEnd() : md;
 }
@@ -2694,11 +2724,7 @@ function StatusActivityText({
     activeBackgroundTaskCount,
     hasPendingPrompt
   });
-  return /* @__PURE__ */ jsxs5(Fragment3, { children: [
-    /* @__PURE__ */ jsx5(Text5, { color: "cyan", bold: true, children: "Activity:" }),
-    " ",
-    /* @__PURE__ */ jsx5(Text5, { color: activity.color, bold: activity.kind !== "idle", children: activity.text })
-  ] });
+  return /* @__PURE__ */ jsx5(Text5, { color: activity.color, bold: activity.kind !== "idle", children: activity.text });
 }
 function ContextText({
   percentage,
@@ -2722,77 +2748,79 @@ function ModeText({ permissionMode }) {
     /* @__PURE__ */ jsx5(Text5, { children: permissionMode })
   ] });
 }
-function StatusLeft({
-  permissionMode,
+function shouldShowPermissionMode(permissionMode) {
+  return permissionMode !== "default";
+}
+function ProviderText({
   modelName,
-  isThinking,
-  activeToolCount,
-  activeBackgroundTaskCount,
-  hasPendingPrompt,
-  contextPercentage,
-  contextUsedTokens,
-  contextMaxTokens,
-  sessionName,
-  gitBranch,
-  showGitBranch
+  providerProfileName,
+  providerType
 }) {
-  const shouldShowGitBranch = showGitBranch && gitBranch !== void 0 && gitBranch.length > 0;
+  if (providerProfileName !== void 0 && providerType !== void 0) {
+    return /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
+      providerProfileName,
+      " (",
+      providerType,
+      ") ",
+      modelName
+    ] });
+  }
+  return /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: modelName });
+}
+function StatusLeft(props) {
+  const shouldShowGitBranch = props.showGitBranch && props.gitBranch !== void 0 && props.gitBranch.length > 0;
+  const showPermissionMode = shouldShowPermissionMode(props.permissionMode);
   return /* @__PURE__ */ jsxs5(Text5, { children: [
     /* @__PURE__ */ jsx5(
       StatusActivityText,
       {
-        isThinking,
-        activeToolCount,
-        activeBackgroundTaskCount,
-        hasPendingPrompt
+        isThinking: props.isThinking,
+        activeToolCount: props.activeToolCount,
+        activeBackgroundTaskCount: props.activeBackgroundTaskCount,
+        hasPendingPrompt: props.hasPendingPrompt
       }
     ),
-    "  |  ",
-    /* @__PURE__ */ jsx5(ModeText, { permissionMode }),
-    sessionName && /* @__PURE__ */ jsxs5(Fragment3, { children: [
+    showPermissionMode && /* @__PURE__ */ jsxs5(Fragment3, { children: [
+      "  |  ",
+      /* @__PURE__ */ jsx5(ModeText, { permissionMode: props.permissionMode })
+    ] }),
+    props.sessionName && /* @__PURE__ */ jsxs5(Fragment3, { children: [
       "  |  ",
-      /* @__PURE__ */ jsx5(Text5, { color: "magenta", children: sessionName })
+      /* @__PURE__ */ jsx5(Text5, { color: "magenta", children: props.sessionName })
     ] }),
     shouldShowGitBranch && /* @__PURE__ */ jsxs5(Fragment3, { children: [
       "  |  ",
       /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
         "git: ",
-        gitBranch
+        props.gitBranch
       ] })
     ] }),
     "  |  ",
-    /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: modelName }),
+    /* @__PURE__ */ jsx5(
+      ProviderText,
+      {
+        modelName: props.modelName,
+        providerProfileName: props.providerProfileName,
+        providerType: props.providerType
+      }
+    ),
     "  |  ",
     /* @__PURE__ */ jsx5(
       ContextText,
       {
-        percentage: contextPercentage,
-        usedTokens: contextUsedTokens,
-        maxTokens: contextMaxTokens
+        percentage: props.contextPercentage,
+        usedTokens: props.contextUsedTokens,
+        maxTokens: props.contextMaxTokens
       }
     )
   ] });
 }
-function StatusRight({
-  isThinking,
-  messageCount
-}) {
-  return /* @__PURE__ */ jsxs5(Text5, { children: [
-    isThinking && /* @__PURE__ */ jsxs5(Fragment3, { children: [
-      /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "thinking..." }),
-      " "
-    ] }),
-    /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
-      "msgs: ",
-      messageCount
-    ] })
-  ] });
-}
 function StatusBar({
   permissionMode,
   modelName,
+  providerProfileName,
+  providerType,
   sessionId: _sessionId,
-  messageCount,
   isThinking,
   activeToolCount = 0,
   activeBackgroundTaskCount = 0,
@@ -2804,7 +2832,7 @@ function StatusBar({
   gitBranch,
   showGitBranch = true
 }) {
-  return /* @__PURE__ */ jsxs5(
+  return /* @__PURE__ */ jsx5(
     Box5,
     {
       borderStyle: "single",
@@ -2812,26 +2840,25 @@ function StatusBar({
       paddingLeft: 1,
       paddingRight: 1,
       justifyContent: "space-between",
-      children: [
-        /* @__PURE__ */ jsx5(
-          StatusLeft,
-          {
-            permissionMode,
-            modelName,
-            isThinking,
-            activeToolCount,
-            activeBackgroundTaskCount,
-            hasPendingPrompt,
-            contextPercentage,
-            contextUsedTokens,
-            contextMaxTokens,
-            sessionName,
-            gitBranch,
-            showGitBranch
-          }
-        ),
-        /* @__PURE__ */ jsx5(StatusRight, { isThinking, messageCount })
-      ]
+      children: /* @__PURE__ */ jsx5(
+        StatusLeft,
+        {
+          permissionMode,
+          modelName,
+          providerProfileName,
+          providerType,
+          isThinking,
+          activeToolCount,
+          activeBackgroundTaskCount,
+          hasPendingPrompt,
+          contextPercentage,
+          contextUsedTokens,
+          contextMaxTokens,
+          sessionName,
+          gitBranch,
+          showGitBranch
+        }
+      )
     }
   );
 }
@@ -2842,8 +2869,9 @@ function SessionStatusBar({
   cwd,
   permissionMode,
   modelId,
+  providerProfileName,
+  providerType,
   sessionId,
-  messageCount,
   isThinking,
   activeToolCount,
   activeBackgroundTaskCount,
@@ -2859,8 +2887,9 @@ function SessionStatusBar({
     {
       permissionMode,
       modelName: modelId ? getModelName2(modelId) : "",
+      providerProfileName,
+      providerType,
       sessionId,
-      messageCount,
       isThinking,
       activeToolCount,
       activeBackgroundTaskCount,
@@ -3888,6 +3917,7 @@ function submitTextPromptValue(state, options) {
 import { jsx as jsx13, jsxs as jsxs10 } from "react/jsx-runtime";
 function TextPrompt({
   title,
+  description,
   placeholder,
   onSubmit,
   onCancel,
@@ -3912,12 +3942,11 @@ function TextPrompt({
   );
   useInput5((input, key) => {
     const action = getTextPromptInputAction(input, key);
-    if (action !== void 0) {
-      applyAction(action);
-    }
+    if (action !== void 0) applyAction(action);
   });
   return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [
     /* @__PURE__ */ jsx13(Text12, { color: "yellow", bold: true, children: title }),
+    /* @__PURE__ */ jsx13(PromptDescription, { description }),
     /* @__PURE__ */ jsxs10(Box10, { marginTop: 1, children: [
       /* @__PURE__ */ jsx13(Text12, { color: "cyan", children: "> " }),
       state.value ? /* @__PURE__ */ jsx13(Text12, { children: masked ? "*".repeat(state.value.length) : state.value }) : placeholder ? /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: placeholder }) : null,
@@ -3927,6 +3956,12 @@ function TextPrompt({
     /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: " Enter Submit Esc Cancel" })
   ] });
 }
+function PromptDescription({ description }) {
+  if (description === void 0 || description.length === 0) {
+    return null;
+  }
+  return /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: description });
+}
 
 // src/ui/InteractivePrompt.tsx
 import { jsx as jsx14, jsxs as jsxs11 } from "react/jsx-runtime";
@@ -3940,6 +3975,7 @@ function InteractivePrompt({
       TextPrompt,
       {
         title: prompt.title,
+        description: prompt.description,
         placeholder: prompt.placeholder,
         allowEmpty: prompt.allowEmpty,
         masked: prompt.masked,
@@ -3952,6 +3988,7 @@ function InteractivePrompt({
   }
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx14(Text13, { bold: true, children: prompt.title }),
+    prompt.description !== void 0 && prompt.description.length > 0 && /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: prompt.description }),
     /* @__PURE__ */ jsx14(
       ListPicker,
       {
@@ -4542,26 +4579,20 @@ function PluginTUI({ callbacks, onClose, addMessage }) {
 import { Box as Box15, Text as Text17 } from "ink";
 import { Fragment as Fragment5, jsx as jsx19, jsxs as jsxs15 } from "react/jsx-runtime";
 var SESSION_ID_DISPLAY_LENGTH = 8;
+var SESSION_PREVIEW_DISPLAY_LENGTH = 60;
 function SessionPicker({
-  sessionStore,
-  cwd,
+  sessions,
   onSelect,
   onCancel
 }) {
-  const sessions = (sessionStore?.list() ?? []).filter((s) => s.cwd === cwd);
   return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
     /* @__PURE__ */ jsx19(Text17, { bold: true, color: "cyan", children: "Select a session to resume (ESC to cancel):" }),
     /* @__PURE__ */ jsx19(
       ListPicker,
       {
-        items: sessions,
+        items: [...sessions],
         renderItem: (session, isSelected) => {
-          const lastMsg = session.messages.slice().reverse().find((m) => {
-            const msg = m;
-            return msg.role === "assistant" && msg.content;
-          });
-          const rawPreview = lastMsg?.content?.replace(/[\n\r]+/g, " ").trim() ?? "";
-          const preview = rawPreview ? rawPreview.slice(0, 60) + (rawPreview.length > 60 ? "..." : "") : "";
+          const preview = session.preview ? session.preview.slice(0, SESSION_PREVIEW_DISPLAY_LENGTH) + (session.preview.length > SESSION_PREVIEW_DISPLAY_LENGTH ? "..." : "") : "";
           return /* @__PURE__ */ jsxs15(Text17, { children: [
             isSelected ? "> " : "  ",
             /* @__PURE__ */ jsx19(Text17, { bold: true, children: session.name ?? session.id.slice(0, SESSION_ID_DISPLAY_LENGTH) }),
@@ -4575,7 +4606,7 @@ function SessionPicker({
             "  ",
             /* @__PURE__ */ jsxs15(Text17, { dimColor: true, children: [
               "msgs: ",
-              session.messages.length
+              session.messageCount
             ] }),
             preview ? /* @__PURE__ */ jsxs15(Fragment5, { children: [
               "\n    ",
@@ -4971,12 +5002,19 @@ function isJsonObject(value) {
 import { jsx as jsx22, jsxs as jsxs17 } from "react/jsx-runtime";
 function App(props) {
   const [activeSessionId, setActiveSessionId] = useState14(props.resumeSessionId);
+  const [showInitialSessionPicker, setShowInitialSessionPicker] = useState14(
+    props.showSessionPickerOnStart ?? false
+  );
   return /* @__PURE__ */ jsx22(
     AppInner,
     {
       ...props,
+      showSessionPickerOnStart: showInitialSessionPicker,
       resumeSessionId: activeSessionId,
-      onSessionSwitch: (sessionId) => setActiveSessionId(sessionId)
+      onSessionSwitch: (sessionId) => {
+        setShowInitialSessionPicker(false);
+        setActiveSessionId(sessionId);
+      }
     },
     activeSessionId ?? "__new__"
   );
@@ -4986,6 +5024,7 @@ function AppInner(props) {
   const {
     interactiveSession,
     registry,
+    commandEffectQueue,
     history,
     addEntry,
     streamingText,
@@ -5039,10 +5078,12 @@ function AppInner(props) {
     cwd,
     providerOverride: props.providerOverride,
     interactiveSession,
+    commandEffectQueue,
     addEntry,
     baseHandleSubmit,
     setSessionName,
-    setStatusLineSettings
+    setStatusLineSettings,
+    showSessionPickerOnStart: props.showSessionPickerOnStart
   });
   useEffect4(() => {
     const name = interactiveSession?.getName?.();
@@ -5148,8 +5189,7 @@ function AppInner(props) {
     showSessionPicker && /* @__PURE__ */ jsx22(
       SessionPicker,
       {
-        sessionStore: props.sessionStore,
-        cwd: props.cwd,
+        sessions: listResumableSessionSummaries(props.sessionStore, props.cwd),
         onSelect: (id) => {
           setShowSessionPicker(false);
           props.onSessionSwitch(id);
@@ -5166,8 +5206,9 @@ function AppInner(props) {
         cwd,
         permissionMode,
         modelId: props.modelId,
+        providerProfileName: props.providerProfileName,
+        providerType: props.providerType,
         sessionId,
-        messageCount: history.length,
         isThinking,
         activeToolCount: activeTools.length,
         activeBackgroundTaskCount,
@@ -5243,7 +5284,7 @@ function readVersion() {
   }
 }
 function promptInput(label, masked = false) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     process.stdout.write(label);
     let input = "";
     const stdin = process.stdin;
@@ -5258,7 +5299,7 @@ function promptInput(label, masked = false) {
           stdin.setRawMode(wasRaw ?? false);
           stdin.pause();
           process.stdout.write("\n");
-          resolve2(input.trim());
+          resolve3(input.trim());
           return;
         } else if (ch === "\x7F" || ch === "\b") {
           if (input.length > 0) {
@@ -5277,6 +5318,15 @@ function promptInput(label, masked = false) {
     stdin.on("data", onData);
   });
 }
+function readTaskFilePrompt(cwd, taskFile) {
+  const taskPath = resolve2(cwd, taskFile);
+  const content = readFileSync6(taskPath, "utf8").trim();
+  if (content.length === 0) {
+    throw new Error(`Task file is empty: ${taskFile}`);
+  }
+  return `Task file (${taskFile}):
+${content}`;
+}
 function resetConfig() {
   const userPath = getUserSettingsPath();
   if (deleteSettings(userPath)) {
@@ -5286,6 +5336,42 @@ function resetConfig() {
     process.stdout.write("No user settings found.\n");
   }
 }
+function createDefaultCliCommandModules({
+  cwd,
+  providerDefinitions
+}) {
+  return [
+    createSkillsCommandModule({ cwd }),
+    createHelpCommandModule(),
+    createAgentCommandModule(),
+    createModelCommandModule({
+      providerDefinitions,
+      settings: {
+        readMergedSettings: () => readMergedProviderSettings(cwd)
+      }
+    }),
+    createPermissionsCommandModule(),
+    createLanguageCommandModule(),
+    createBackgroundCommandModule(),
+    createMemoryCommandModule(),
+    createCompactCommandModule(),
+    createContextCommandModule(),
+    createExitCommandModule(),
+    createSessionCommandModule(),
+    createResetCommandModule(),
+    createRewindCommandModule(),
+    createStatusLineCommandModule(),
+    createPluginCommandModule(),
+    createProviderCommandModule({
+      providerDefinitions,
+      settings: {
+        readMergedSettings: () => readMergedProviderSettings(cwd),
+        readTargetSettings: () => readSettings(resolveProviderSettingsWriteTargetPath(cwd)),
+        writeTargetSettings: (settings) => writeSettings(resolveProviderSettingsWriteTargetPath(cwd), settings)
+      }
+    })
+  ];
+}
 async function startCli(options = {}) {
   const args = parseCliArgs();
   const version = readVersion();
@@ -5320,30 +5406,7 @@ async function startCli(options = {}) {
   };
   const providerDefinitions = options.providerDefinitions ?? DEFAULT_PROVIDER_DEFINITIONS;
   const commandModules = [
-    createHelpCommandModule(),
-    createAgentCommandModule(),
-    createModelCommandModule(),
-    createModeCommandModule(),
-    createPermissionsCommandModule(),
-    createLanguageCommandModule(),
-    createBackgroundCommandModule(),
-    createMemoryCommandModule(),
-    createCompactCommandModule(),
-    createContextCommandModule(),
-    createExitCommandModule(),
-    createSessionCommandModule(),
-    createResetCommandModule(),
-    createRewindCommandModule(),
-    createStatusLineCommandModule(),
-    createPluginCommandModule(),
-    createProviderCommandModule({
-      providerDefinitions,
-      settings: {
-        readMergedSettings: () => readMergedProviderSettings(cwd),
-        readTargetSettings: () => readSettings(getUserSettingsPath()),
-        writeTargetSettings: (settings) => writeSettings(getUserSettingsPath(), settings)
-      }
-    }),
+    ...createDefaultCliCommandModules({ cwd, providerDefinitions }),
     ...options.commandModules ?? []
   ];
   const startupUpdateNoticePromise = shouldRunStartupCliUpdateCheck(args) ? getStartupCliUpdateNotice({ currentVersion: version }) : void 0;
@@ -5362,6 +5425,8 @@ async function startCli(options = {}) {
     process.exit(1);
   }
   const providerOptions = args.provider ? { providerOverride: args.provider, providerDefinitions } : { providerDefinitions };
+  const activeProviderSettings = readMergedProviderSettings(cwd);
+  const providerProfileName = args.provider ?? activeProviderSettings.currentProvider;
   const providerSettings = readProviderSettings(cwd, providerOptions);
   const modelId = args.model ?? providerSettings.model;
   const provider = createProviderFromSettings(cwd, args.model, providerOptions);
@@ -5371,22 +5436,17 @@ async function startCli(options = {}) {
     providerConfig: { ...providerSettings, model: modelId },
     logsDir: paths.logs
   });
-  const sessionStore = new SessionStore(paths.sessions);
+  const sessionStore = createProjectSessionStore(cwd);
   let resumeSessionId;
+  let showSessionPickerOnStart = false;
   if (args.continueMode) {
-    const sessions = sessionStore.list().filter((s) => s.cwd === cwd);
-    if (sessions.length > 0) {
-      resumeSessionId = sessions[0].id;
-    }
+    resumeSessionId = resolveLatestSessionId(sessionStore, cwd);
   } else if (args.resumeId !== void 0) {
     if (args.resumeId === "") {
-      resumeSessionId = "__picker__";
+      showSessionPickerOnStart = true;
     } else {
-      const sessions = sessionStore.list();
-      const match = sessions.find((s) => s.id === args.resumeId || s.name === args.resumeId);
-      if (match) {
-        resumeSessionId = match.id;
-      } else {
+      resumeSessionId = resolveSessionIdByIdOrName(sessionStore, args.resumeId);
+      if (resumeSessionId === void 0) {
         process.stderr.write(`Session not found: ${args.resumeId}
 `);
         process.exit(1);
@@ -5408,6 +5468,15 @@ async function startCli(options = {}) {
     }
     const appendParts = [];
     if (args.appendSystemPrompt) appendParts.push(args.appendSystemPrompt);
+    if (args.taskFile) {
+      try {
+        appendParts.push(readTaskFilePrompt(cwd, args.taskFile));
+      } catch (error) {
+        process.stderr.write(`${error instanceof Error ? error.message : String(error)}
+`);
+        process.exit(1);
+      }
+    }
     if (args.jsonSchema)
       appendParts.push(
         `Respond with valid JSON only, matching this JSON schema:
@@ -5442,6 +5511,8 @@ ${args.jsonSchema}`
     cwd,
     provider,
     providerOverride: args.provider,
+    providerProfileName,
+    providerType: providerSettings.name,
     modelId,
     language: args.language,
     permissionMode: args.permissionMode,
@@ -5449,6 +5520,7 @@ ${args.jsonSchema}`
     version,
     sessionStore,
     resumeSessionId,
+    showSessionPickerOnStart,
     forkSession: args.forkSession,
     sessionName: args.sessionName,
     backgroundTaskRunners,