@visual-z/xeno 0.3.0 → 0.4.0

package/src/apps/provider-connect.ts

@@ -1,5 +1,5 @@
 /**
- * Custom endpoints and connected-provider management, reached from `/login`.
+ * Custom endpoints and connected-provider management, reached from `/provider`.
  *
  * Flow (magpie's add form + OpenCode's /connect, see
  * docs/tasks/feat-provider-connect.md): choose a preset or a custom endpoint
@@ -68,7 +68,7 @@ function connectedName(id: string): string {
 }
 
 /**
- * Entry points from `/login`. API-key and subscription sign-in stay on the
+ * Entry points from `/provider`. API-key and subscription sign-in stay on the
  * login picker itself (their masked editor and OAuth flows are fixed by
  * tests); the wizard owns what login never did: custom endpoints and
  * per-provider model choice.
@@ -86,7 +86,7 @@ export function startConnect(host: ConnectHost, entry: "custom" | "manage"): voi
   }
   const connected = [...new Set(app.catalog.map(model => model.provider))].filter(id => providerReady(app, id).ready > 0).sort();
   if (connected.length === 0) {
-    wizard.push({ kind: "message", title: "No provider is connected yet", lines: ["Choose a subscription, an API-key provider or a custom endpoint from /login first."], onDone: () => host.close() });
+    wizard.push({ kind: "message", title: "No provider is connected yet", lines: ["Choose a subscription, an API-key provider or a custom endpoint from /provider first."], onDone: () => host.close() });
     return;
   }
   wizard.push({
@@ -100,7 +100,7 @@ export function startConnect(host: ConnectHost, entry: "custom" | "manage"): voi
   });
 }
 
-/** A provider configured by hand (or by an earlier /login) that is not a preset. */
+/** A provider configured by hand (or by an earlier /provider) that is not a preset. */
 function customFromCatalog(app: App, id: string): ProviderPreset | undefined {
   const model = app.catalog.find(candidate => candidate.provider === id);
   if (!model) return undefined;

package/src/apps/shell.ts

@@ -30,14 +30,14 @@ import {
 } from "../core/context-policy.ts";
 import { anchoredCount, estimateTokens, type Anchor, type TokenCounter } from "../core/tokens.ts";
 import type { RestorePoint, RewindMode } from "../runtime/loop.ts";
-import { createProvider, findModelByPattern, groupedModels, loadCatalog } from "../runtime/catalog.ts";
+import { createProvider, providerSessionId, findModelByPattern, groupedModels, loadCatalog } from "../runtime/catalog.ts";
 import { outputTokenBudget, type Effort, type ModelSpec } from "../runtime/model.ts";
 import { scopedModels } from "../runtime/model-scope.ts";
 import { equivalentCost, reportedCost } from "../runtime/usage.ts";
 import type { ProviderConfig } from "../runtime/provider.ts";
 import { describeMissingCredential, envLabel, ensureFreshCredential, storedIsOAuth } from "../runtime/auth.ts";
 import {
-  SUBSCRIPTION_NOTICE, SUBSCRIPTION_OPTIONS, isSubscriptionLogin, subscriptionById,
+  SUBSCRIPTION_NOTICE, SUBSCRIPTION_OPTIONS, subscriptionById, loginGrok,
   loginGitHubCopilot, generatePKCE, generateState, anthropicAuthorizeUrl, openaiCodexAuthorizeUrl,
   startCallbackServer, exchangeAnthropicCode, exchangeOpenAICode, parseAuthorizationInput,
   ANTHROPIC_CALLBACK_PORT, ANTHROPIC_CALLBACK_PATH, ANTHROPIC_REDIRECT_URI,
@@ -70,6 +70,7 @@ import { colorEnabled } from "./render.ts";
 import { createStyle, IDENTITY } from "../tui/style.ts";
 import { lastAssistantText, toHtml } from "../core/export.ts";
 import { toJsonEvent } from "../core/json-event.ts";
+import { sessionControl } from "../runtime/session-control.ts";
 import { COMMANDS, parseCommand, type Command } from "./commands.ts";
 import { expandInput } from "./input.ts";
 import {
@@ -84,7 +85,7 @@ import type { TurnSurface, Ui } from "./ui/surface.ts";
  * One line. Listing all ~40 commands here wrapped into a two-line wall that
  * nobody reads; typing `/` already opens the searchable command menu.
  */
-const HINT = `type a prompt · / for ${COMMANDS.length} commands · /login connects a provider · /model switches · /help`;
+const HINT = `type a prompt · / for ${COMMANDS.length} commands · /provider connects a provider · /model switches · /help`;
 const OAUTH_PASTE = "\0oauth";
 
 const initializedExtensions = new WeakSet<ExtensionRegistry>();
@@ -344,7 +345,7 @@ async function runLines(app: App): Promise<void> {
   await bindExtensions(app);
   const C = app.io.palette;
   if (app.ui?.settings.quietStartup !== true || app.args.verbose) app.io.say(C.dim(HINT));
-  /** Set by `/login <provider>`; the next line typed is the key, not a prompt. */
+  /** Set by `/provider <provider>`; the next line typed is the key, not a prompt. */
   let awaitingKeyFor: string | null = null;
   for await (const line of console) {
     const text = line.trim();
@@ -438,7 +439,11 @@ async function execute(app: App, command: Command, tui: Ui | null): Promise<Outc
       printUsage(app);
       return "continue";
     case "state":
-      printState(app);
+      await printState(app);
+      return "continue";
+    case "control":
+      if (tui) await tui.openControl();
+      else app.io.say(JSON.stringify(await sessionControl(app.session).snapshot(), null, 2));
       return "continue";
     case "context":
       printContext(app);
@@ -514,8 +519,8 @@ async function execute(app: App, command: Command, tui: Ui | null): Promise<Outc
       if (command.provider === undefined) {
         if (tui) { tui.openLogin(); return "continue"; }
         const C = app.io.palette;
-        const providers = [...new Set(app.catalog.map((m) => m.provider))];
-        app.io.say(C.bold("\nlogin"));
+        const providers = [...new Set(app.catalog.map((m) => m.provider))].filter(provider => !subscriptionById(provider));
+        app.io.say(C.bold("\nproviders"));
         app.io.say(C.bold("  API keys"));
         for (const p of providers) {
           app.io.say(`  ${p.padEnd(12)}${C.dim(envLabel(p))}`);
@@ -524,13 +529,15 @@ async function execute(app: App, command: Command, tui: Ui | null): Promise<Outc
         for (const s of SUBSCRIPTION_OPTIONS) {
           app.io.say(`  ${s.id.padEnd(16)}${C.dim(s.label)}`);
         }
-        app.io.say(C.dim("\n  /login <provider> then paste the key. Empty line cancels."));
-        app.io.say(C.dim("  /login claude-pro|codex|github-copilot starts a subscription login.\n"));
+        app.io.say(C.dim("\n  /provider <provider> then paste the key. Empty line cancels."));
+        app.io.say(C.dim(`  /provider ${SUBSCRIPTION_OPTIONS.map(option => option.id).join("|")} starts an account login.\n`));
         return "continue";
       }
-      if (isSubscriptionLogin(command.provider)) {
-        return startSubscriptionLogin(app, command.provider, tui);
+      const subscription = subscriptionById(command.provider);
+      if (subscription) {
+        return startSubscriptionLogin(app, subscription.id, tui);
       }
+      if (!app.catalog.some(model => model.provider === command.provider)) { app.io.say(app.io.palette.red(`  unknown provider: ${command.provider}. Use /provider to choose one.`)); return "continue"; }
       if (tui) {
         const provider = command.provider;
         const key = await tui.askSecret(`API key · ${provider}`, "Key", "paste the key · $VAR reads the environment · !cmd runs a command · enter save · esc cancel");
@@ -703,12 +710,21 @@ function printUsage(app: App): void {
   app.io.say("");
 }
 
-function printState(app: App): void {
+async function printState(app: App): Promise<void> {
   const C = app.io.palette;
   const s = app.session.state;
   app.io.say(C.bold("\nstate"));
   app.io.say(`  node              ${s.node}  (depth ${s.depth})`);
   app.io.say(`  events in node    ${s.events.length}`);
+  const request = await app.session.requestState();
+  if (request) {
+    app.io.say(`  request           ${request.request.event} · ${request.status}`);
+    app.io.say(`  execution         ${request.execution?.reason ?? "in progress or unknown"}`);
+    app.io.say(`  command evidence  ${request.commands.filter(command => command.status === "pass").length} current passes / ${request.commands.length} receipts`);
+    app.io.say(`  observations      ${request.progress.observations.length} new; artifact changes ${request.progress.artifact_changes.length}; acceptance advances ${request.progress.acceptance_advances.length}`);
+    app.io.say(`  diagnostics       ${request.progress.new_diagnostics.length} new; unchanged retries ${request.progress.unchanged_retries.length}; unknown ${request.progress.unknown_diagnostics.length}`);
+    if (!request.acceptance) app.io.say("  task verification no declared acceptance contract; command success alone does not verify the task");
+  }
   if (s.handoff) {
     const h = s.handoff;
     app.io.say(`  completed         ${h.state.completed.length}`);
@@ -1244,7 +1260,7 @@ function providerOAuthOpts(app: App, spec: ModelSpec): { oauth: true } | undefin
 }
 
 function makeProvider(app: App, config: ProviderConfig, key: string) {
-  return createProvider(config, key, retryHandler(app.io), { ...providerOAuthOpts(app, config.spec), effects: app.effects });
+  return createProvider(config, key, retryHandler(app.io), { sessionId: providerSessionId(app.session.config.logDir), ...providerOAuthOpts(app, config.spec), effects: app.effects });
 }
 
 interface PendingOAuth {
@@ -1361,19 +1377,20 @@ async function startSubscriptionLogin(app: App, id: string, tui: Ui | null): Pro
   await cancelPendingOAuth(app);
   const effects = tui?.oauthEffects ?? loginEffects;
   app.io.say(C.yellow(`  ${SUBSCRIPTION_NOTICE}`));
-  if (sub.id === "github-copilot") {
+  if (sub.id === "github-copilot" || sub.id === "grok") {
     const pending: { abort: AbortController; tui: Ui | null; close?: () => void } = { abort: new AbortController(), tui };
     pendingDevices.set(app, pending);
     const work = async () => { try {
-      const credential = await effects.device({
+      const credential = await (sub.id === "grok" ? loginGrok : effects.device)({
         notify: (message) => {
           if (pendingDevices.get(app) !== pending) return;
-          if (tui) { pending.close?.(); pending.close = tui.waiting("GitHub Copilot", message.split("\n"), () => { void cancelPendingOAuth(app); }); }
+          if (tui) { pending.close?.(); pending.close = tui.waiting(sub.label, message.split("\n"), () => { void cancelPendingOAuth(app); }); }
           else app.io.say(`  ${message}`);
         },
         prompt: async () => "",
         fetch: effects.fetch,
         signal: pending.abort.signal,
+        openBrowser: effects.openBrowser,
       });
       if (pending.abort.signal.aborted || pendingDevices.get(app) !== pending) return;
       await storeOAuth(app, sub.provider, credential);
@@ -1387,7 +1404,7 @@ async function startSubscriptionLogin(app: App, id: string, tui: Ui | null): Pro
         pending.close?.();
       }
     } };
-    if (tui) { pending.close = tui.waiting("GitHub Copilot", ["Requesting a device code…"], () => { void cancelPendingOAuth(app); }); tui.runExtensionAction(work); return "continue"; }
+    if (tui) { pending.close = tui.waiting(sub.label, ["Requesting a device code…"], () => { void cancelPendingOAuth(app); }); tui.runExtensionAction(work); return "continue"; }
     await work();
     return "continue";
   }
@@ -1515,7 +1532,7 @@ export async function switchToModel(app: App, spec: ModelSpec, thinking?: Effort
   const got = app.credentialOf(spec);
   if (!got.ok) {
     app.io.say(C.red(`\n  ${got.reason}\n`));
-    if (!got.reason.includes("/login")) {
+    if (!got.reason.includes("/provider")) {
       app.io.say(C.dim(`  ${describeMissingCredential(spec.provider)}\n`));
     }
     return;
@@ -1750,6 +1767,7 @@ async function run(app: App, prompt: string, signal?: AbortSignal, tui?: Ui, ima
     if (tui) tui.beginBash(prompt.slice(excluded ? 2 : 1));
     const result = await app.session.runUserBash(prompt.slice(excluded ? 2 : 1), excluded, signal,
       tui ? chunk => tui.pushBash(chunk) : undefined);
+    tui?.observeEvent?.({ kind: "done", outcome: result.outcome });
     if (tui) { await tui.syncTranscript(); tui.commitStream(); }
     else app.io.say(`$ ${result.command}\n${result.content}`);
     return true;
@@ -1760,7 +1778,7 @@ async function run(app: App, prompt: string, signal?: AbortSignal, tui?: Ui, ima
     const C = app.io.palette;
     app.io.say(C.yellow("  no credential yet -- this prompt was not sent."));
     app.io.say(C.dim(`  ${app.credential.reason}`));
-    app.io.say(C.dim("  export an API key, or /login <provider>.\n"));
+    app.io.say(C.dim("  export an API key, or /provider <provider>.\n"));
     tui?.restoreDraft(prompt, images);
     return false;
   }
@@ -1855,7 +1873,8 @@ export async function runTurn(
   }
   await registry?.emit("agent_start");
   await registry?.emit("turn_start", { turnIndex: 0 });
-  try { for await (const e of skill ? app.session.sendSkill(skill, prompt, signal) : app.session.send(prompt, signal, pull)) {
+  try { for await (const e of skill ? app.session.sendSkill(skill, prompt, signal) : sessionControl(app.session).send(prompt, signal, pull)) {
+    tui?.observeEvent?.(e);
     if (e.kind === "text_delta" || e.kind === "thinking_delta") await registry?.emit("message_update", { assistantMessageEvent: { type: e.kind, delta: e.text } });
     if (e.kind === "assistant_text") await registry?.emit("message_end", { message: { role: "assistant", content: [{ type: "text", text: e.text }] } });
     if (e.kind === "done") await registry?.emit("turn_end", { reason: e.reason });

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";
@@ -224,6 +224,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;
 }
@@ -280,6 +282,7 @@ const KNOWN_FLAGS: readonly string[] = [
   "--no-prompt-templates",
   "--extension", "-e", "--no-extensions", "-ne", "--extension-flag",
   "--mode",
+  "--control-socket",
   "--verbose",
   "--print", "-p",
   "--help", "-h",
@@ -451,6 +454,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 +721,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 +781,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 +800,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 +817,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(", ")}.`;
 }
 
@@ -933,13 +941,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(),
   );
@@ -1095,7 +1103,7 @@ export async function openSessionFor(opts: OpenSessionOptions): Promise<{
   }
   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,6 +1453,7 @@ 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" +
           "            [--theme <name|path>] [--use-theme name] [--no-themes] [--thinking level] [--models patterns]\n" +
@@ -1453,6 +1462,10 @@ export function printCliHelp(flags?: ReadonlyMap<string, ExtensionFlag>): void {
           "            [--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" +