@visual-z/xeno 0.3.0 → 0.5.0

package/src/apps/startup.ts

@@ -13,7 +13,7 @@ import { mkdir } from "node:fs/promises";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { Session, systemClock } from "../runtime/loop.ts";
 import { DEFAULT_PROVIDER, type ProviderConfig } from "../runtime/provider.ts";
-import { createProvider, selectModel, loadCatalog, groupedModels, parseUserCatalog, type CatalogFetch } from "../runtime/catalog.ts";
+import { createProvider, providerSessionId, selectModel, loadCatalog, groupedModels, parseUserCatalog, type CatalogFetch } from "../runtime/catalog.ts";
 import { ExtensionRegistry } from "../runtime/extensions.ts";
 import { DISCOVERY_TOOL_NAME } from "../runtime/tool-discovery.ts";
 import { declaredToolNames } from "../core/tool-discovery.ts";
@@ -177,6 +177,8 @@ export interface Args {
   /** `--no-builtin-tools`. False when the flag was not passed. */
   noBuiltinTools: boolean;
   allowTools: string[];
+  /** `--yolo` / `-y`: skip tool approval for this process only. */
+  yolo: boolean;
   /** `--approve` true, `--no-approve` false. Omitted when neither. */
   approve?: boolean;
   configCommand?: boolean;
@@ -224,6 +226,8 @@ export interface Args {
   sessionName?: string;
   /** `--mode json`. Empty / omitted when the flag was not passed. */
   mode?: string;
+  /** Explicit local adapter endpoint. An owned mode-0700 directory is required. */
+  controlSocket?: string;
   /** `--verbose`. Expands the startup header's counts into lists. */
   verbose?: boolean;
 }
@@ -269,6 +273,7 @@ const KNOWN_FLAGS: readonly string[] = [
   "--no-tools", "-nt",
   "--no-builtin-tools",
   "--allow-tools",
+  "--yolo", "-y",
   "--approve", "-a",
   "--no-approve", "-na",
   "--theme",
@@ -280,6 +285,7 @@ const KNOWN_FLAGS: readonly string[] = [
   "--no-prompt-templates",
   "--extension", "-e", "--no-extensions", "-ne", "--extension-flag",
   "--mode",
+  "--control-socket",
   "--verbose",
   "--print", "-p",
   "--help", "-h",
@@ -340,7 +346,7 @@ export function parseArgs(argv: string[], options: { deferExtensions?: boolean;
     model: "", provider: "", apiKey: "", listModels: false, modelsCommand: false, modelsRefresh: false, fresh: false,
     noContextFiles: false, appendSystemPrompt: [],
     systemPrompt: null,
-    excludeTools: [], noTools: false, noBuiltinTools: false, allowTools: [],
+    excludeTools: [], noTools: false, noBuiltinTools: false, allowTools: [], yolo: false,
     print: false,
     theme: "",
     thinking: "",
@@ -425,6 +431,7 @@ export function parseArgs(argv: string[], options: { deferExtensions?: boolean;
     else if (a === "--no-tools" || a === "-nt") args.noTools = true;
     else if (a === "--no-builtin-tools" || a === "-nbt") args.noBuiltinTools = true;
     else if (a === "--allow-tools") args.allowTools = parseToolList(argv[++i] ?? "");
+    else if (a === "--yolo" || a === "-y") args.yolo = true;
     else if (a === "--approve" || a === "-a") args.approve = true;
     else if (a === "--no-approve" || a === "-na") args.approve = false;
     else if (a === "--theme") {
@@ -451,6 +458,11 @@ export function parseArgs(argv: string[], options: { deferExtensions?: boolean;
       (args.extensionFlags ??= Object.create(null) as Record<string, string | boolean>)[value.slice(0, at)] = value.slice(at + 1) === "true" ? true : value.slice(at + 1) === "false" ? false : value.slice(at + 1);
     }
     else if (a === "--mode") args.mode = argv[++i] ?? "";
+    else if (a === "--control-socket") {
+      const value = argv[++i];
+      if (!value || value.startsWith("-")) throw Error("--control-socket requires a path");
+      args.controlSocket = resolve(value);
+    }
     else if (a === "--verbose") args.verbose = true;
     else if (a === "-p" || a === "--print") {
       args.print = true;
@@ -713,7 +725,7 @@ export interface App {
   blobDir: string;
   system: string;
   providerConfig: ProviderConfig;
-  /** May be `{ ok: false }` in an interactive session waiting on /login. */
+  /** May be `{ ok: false }` in an interactive session waiting on /provider. */
   credential: Resolved;
   auth: AuthFile;
   effects: ResolveEffects;
@@ -773,8 +785,8 @@ export function whyNot(spec: ModelSpec, got: Resolved, auth: AuthFile, C: Palett
 }
 
 /**
- * /login only exists inside a live session. A one-shot prompt and a pipe
- * cannot answer it, so those runs must still refuse -- naming /login there
+ * /provider only exists inside a live session. A one-shot prompt and a pipe
+ * cannot answer it, so those runs must still refuse -- naming /provider there
  * is how this file used to deadlock a first run.
  */
 /**
@@ -792,7 +804,7 @@ export function isInteractiveSession(args: Args): boolean {
 
 /**
  * Script-facing missing-key text. Environment variables and --api-key are
- * the routes that actually work without a tty; /login is not one of them.
+ * the routes that actually work without a tty; /provider is not one of them.
  */
 export function describeUnauthenticatedScript(catalog: readonly ModelSpec[] = CATALOG): string {
   const providers = [...new Set(catalog.map((m) => m.provider))];
@@ -809,7 +821,7 @@ export function describeUnauthenticatedScript(catalog: readonly ModelSpec[] = CA
  * action that works from here; the interactive routes are named instead.
  */
 export function describeUnauthenticatedSession(_catalog: readonly ModelSpec[] = CATALOG): string {
-  return "no provider connected yet. Type /login to connect one — a Claude, ChatGPT or Copilot subscription, an API key, a gateway or a local server — " +
+  return "no provider connected yet. Type /provider to connect one — a Claude, ChatGPT, Copilot or Grok account, an API key, a gateway or a local server — " +
     `or export a key such as ${["anthropic", "openai", "google", "deepseek"].map(provider => envLabel(provider).split(" or ")[0]).join(", ")}.`;
 }
 
@@ -845,10 +857,14 @@ export function toolSelectionOf(args: Args) {
  * the provider bills, and an extra field there would look like a tool
  * argument.
  */
-export function sessionToolCatalog(args: Args, extensions?: ExtensionRegistry, previous: readonly unknown[] = []) {
+export function sessionToolCatalog(args: Args, extensions?: ExtensionRegistry, previous: readonly unknown[] = [], builtinDefaults?: readonly string[]) {
   const custom = [...extensions?.definitions().values() ?? []].map(({ name, description, input_schema }) => ({ name, description, input_schema, source: "extension" as const }));
-  const available = [...TOOL_DEFINITIONS.filter(tool => !extensions?.tools.has(tool.name) && (!tool.optional || args.tools?.includes(tool.name))).map((t) => ({ ...t, source: "builtin" as const })), ...custom];
-  const selected = selectTools(available, toolSelectionOf(args));
+  // O.7/D6: a cold app open uses saved capabilities as defaults, never today's profile.
+  // Explicit selection still wins; extension loading and current exclusions remain live.
+  const retained = builtinDefaults !== undefined && args.tools === undefined && args.toolProfile === undefined ? new Set(builtinDefaults) : undefined;
+  const available = [...TOOL_DEFINITIONS.filter(tool => !extensions?.tools.has(tool.name) &&
+    (retained === undefined ? !tool.optional || args.tools?.includes(tool.name) : retained.has(tool.name))).map((t) => ({ ...t, source: "builtin" as const })), ...custom];
+  const selected = selectTools(available, { ...toolSelectionOf(args), ...(retained ? { profile: "full" as const } : {}) });
   const deferred = selected.filter(tool => tool.source === "extension" && extensions?.tools.get(tool.name)?.exposure === "deferred")
     .map(({ name, description, input_schema }) => ({ name, description, input_schema }));
   const deferredNames = new Set(deferred.map(tool => tool.name));
@@ -901,7 +917,7 @@ export function createSessionFor(opts: {
     ...(args.pathRoot === undefined ? {} : { pathRoot: args.pathRoot }),
     allow: names,
     deferredTools: deferred,
-    rules: rulesWithAllowTools(args.allowTools),
+    rules: rulesWithAllowTools(args.allowTools, { yolo: args.yolo }),
     sessionRules,
     askSlot,
     ...(opts.extensions ? { extensions: opts.extensions.definitions(), extensionHooks: opts.extensions.toolHooks() } : {}),
@@ -933,13 +949,13 @@ export function createSessionFor(opts: {
         : {}),
     },
     // Empty key is a placeholder the shell must not send through. Interactive
-    // startup reaches this path so /login exists; run() refuses until a real
+    // startup reaches this path so /provider exists; run() refuses until a real
     // credential is installed on the session.
     createProvider(
       providerConfig,
       credential.ok ? credential.key : "",
       retryHandler(io),
-      { ...(opts.oauth === true ? { oauth: true } : {}), ...(opts.effects ? { effects: opts.effects } : {}) },
+      { sessionId: providerSessionId(logDir), ...(opts.oauth === true ? { oauth: true } : {}), ...(opts.effects ? { effects: opts.effects } : {}) },
     ),
     systemClock(),
   );
@@ -1089,13 +1105,22 @@ export async function openSessionFor(opts: OpenSessionOptions): Promise<{
   opts.startupPhase?.("Opening session history");
   await session.start();
   resources.slash = { ...resources.slash, skills: new Map((session.config.skills ?? []).map(skill => [skill.name, skill])) };
-  if (resources.extensions.loaded.length || session.config.frozen.tools.some(tool =>
-    typeof tool === "object" && tool !== null && "name" in tool && typeof tool.name === "string" && unknownToolNames([tool.name]).length)) {
-    await session.reloadResources({ system: resources.system, tools: visibleSchemas(opts.args, resources.extensions, session.config.frozen.tools) });
+  const restoredTools = sessionToolCatalog(opts.args, resources.extensions, session.config.frozen.tools,
+    priorCursor === null ? undefined : declaredToolNames(session.config.frozen.tools));
+  const refreshResources = resources.extensions.loaded.length > 0 || session.config.frozen.tools.some(tool =>
+    typeof tool === "object" && tool !== null && "name" in tool && typeof tool.name === "string" && unknownToolNames([tool.name]).length);
+  const explicitTools = opts.args.tools !== undefined || opts.args.toolProfile !== undefined || opts.args.noTools ||
+    opts.args.noBuiltinTools || opts.args.excludeTools.length > 0;
+  if (refreshResources || (priorCursor !== null && explicitTools)) {
+    await session.reloadResources({ system: refreshResources ? resources.system : session.config.frozen.system, tools: restoredTools.schemas });
   }
+  // Admission follows this app's selected declaration; current process approval rules stay intact.
+  // Keep this out of Session.start(): an SDK caller can intentionally supply a narrower allowlist.
+  session.config.tools.allow = declaredToolNames(session.config.frozen.tools);
+  session.config.tools.deferredTools = restoredTools.deferred;
   if (restoring.id !== spec.id || restoring.provider !== spec.provider) {
     await session.switchModel(createProvider(providerConfig, credential.ok ? credential.key : "", retryHandler(opts.io),
-      { ...(oauth(spec, credential) ? { oauth: true } : {}), ...(opts.effects ? { effects: opts.effects } : {}) }));
+      { sessionId: providerSessionId(session.config.logDir), ...(oauth(spec, credential) ? { oauth: true } : {}), ...(opts.effects ? { effects: opts.effects } : {}) }));
     opts.io.say(opts.io.palette.yellow(`  switched ${restoring.id} → ${spec.id} at a model checkpoint`));
   }
   resources.ui.settings = { ...resources.ui.settings, thinking: providerConfig.effort,
@@ -1445,14 +1470,19 @@ export function printCliHelp(flags?: ReadonlyMap<string, ExtensionFlag>): void {
           "            [--tools names] [--exclude-tools names] [--no-tools]\n" +
           "            [--tool-profile coding|readonly|research|data|full]\n" +
           "            [--acceptance-file contract.json]\n" +
+          "            [--control-socket /private/directory/control.sock]\n" +
           "            [--no-builtin-tools]\n" +
-          "            [--allow-tools names] [--approve|--no-approve]\n" +
+          "            [--allow-tools names] [--yolo|-y] [--approve|--no-approve]\n" +
           "            [--theme <name|path>] [--use-theme name] [--no-themes] [--thinking level] [--models patterns]\n" +
           "            [--skill <path>] [--no-skills]\n" +
           "            [--prompt-template <path>] [--no-prompt-templates]\n" +
           "            [--extension <path>] [--no-extensions] [--extension-flag name=value]\n" +
           "            [--mode text|json] [--tui-mode regular|fullscreen] [--verbose]\n" +
           "            [-p <prompt>] [prompt...]\n\n" +
+          "  xeno app-server [session/model flags] runs the experimental JSONL control interface.\n" +
+          "  xeno app-server schema prints its versioned request schema without startup.\n" +
+          "  --control-socket attaches local adapters to the same live session as the TUI.\n" +
+          "  /control opens goal, progress and context panels; XENO_PROGRAM_STATUS=auto|1|0 controls terminal status.\n\n" +
           "  Starts a new session by default; --fresh is an explicit alias. Nothing is deleted.\n" +
           "  -c continues the newest (or starts one); -r opens the session picker.\n" +
           "  --session / -r <id> pick one (unique prefix only). Resume restores its model;\n" +
@@ -1468,7 +1498,10 @@ export function printCliHelp(flags?: ReadonlyMap<string, ExtensionFlag>): void {
           "  --tools is a strict allowlist; excluded tools leave the schema.\n" +
           "  New sessions use coding (10 tools); full exposes default built-ins.\n" +
           "  --no-builtin-tools drops built-ins and keeps any other source; --tools still wins.\n" +
-          "  bash asks before it runs. --allow-tools bash skips the ask for this process.\n" +
+          "  Shell entry points (exec_command, environment, bash, target) ask before they run.\n" +
+          "  --allow-tools exec_command skips asks for that tool for this process.\n" +
+          "  --yolo (-y) skips all tool approvals for this process, including resumed sessions.\n" +
+          "  Tool exclusions and path limits still apply; YOLO does not change project trust.\n" +
           "  --time-budget <seconds> tells the model, once, when 75% of the run's wall-clock budget is used.\n" +
           "  --state-dir <dir> keeps snapshots, observations and sessions out of the workspace.\n" +
           "  --checkpoint-shell enables best-effort Git recovery for command changes; ignored files and external effects are excluded.\n" +