nexrall-code 0.5.161 → 0.5.163

package/dist/index.js

@@ -3186,7 +3186,7 @@ var require_auth = __commonJS({
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.saveAuth = saveAuth2;
-    exports2.loadAuth = loadAuth2;
+    exports2.loadAuth = loadAuth3;
     exports2.clearAuth = clearAuth2;
     exports2.isAuthenticated = isAuthenticated4;
     exports2.getToken = getToken2;
@@ -3207,7 +3207,7 @@ var require_auth = __commonJS({
       ensureConfigDir();
       fs27.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), { mode: 384 });
     }
-    function loadAuth2() {
+    function loadAuth3() {
       const envToken = process.env.NEXRALL_TOKEN;
       if (envToken && envToken.trim().length > 0) {
         return { token: envToken.trim() };
@@ -3235,19 +3235,19 @@ var require_auth = __commonJS({
       }
     }
     function isAuthenticated4() {
-      const auth = loadAuth2();
-      return auth !== null && auth.token.length > 0;
+      const auth2 = loadAuth3();
+      return auth2 !== null && auth2.token.length > 0;
     }
     function getToken2() {
-      const auth = loadAuth2();
-      return auth?.token ?? null;
+      const auth2 = loadAuth3();
+      return auth2?.token ?? null;
     }
     function getRefreshToken() {
       const envToken = process.env.NEXRALL_TOKEN;
       if (envToken && envToken.trim().length > 0)
         return null;
-      const auth = loadAuth2();
-      const rt = auth?.refreshToken;
+      const auth2 = loadAuth3();
+      const rt = auth2?.refreshToken;
       return typeof rt === "string" && rt.length > 0 ? rt : null;
     }
     function updateTokens(token, refreshToken) {
@@ -12139,11 +12139,11 @@ var require_agentTypes = __commonJS({
     exports2.parseModel = parseModel;
     exports2.parseAgentHooks = parseAgentHooks;
     exports2.loadAgentTypes = loadAgentTypes;
-    exports2.loadAgentTypesWithWarnings = loadAgentTypesWithWarnings2;
-    exports2.knownToolNames = knownToolNames;
+    exports2.loadAgentTypesWithWarnings = loadAgentTypesWithWarnings3;
+    exports2.knownToolNames = knownToolNames3;
     exports2.builtinAgents = builtinAgents;
     exports2.summariseAgents = summariseAgents;
-    exports2.findAgentType = findAgentType;
+    exports2.findAgentType = findAgentType2;
     var miniYaml_1 = require_miniYaml();
     var fs27 = __importStar(__require("fs"));
     var path27 = __importStar(__require("path"));
@@ -12614,11 +12614,19 @@ var require_agentTypes = __commonJS({
           throw new Error(`${where}: expected a list of hooks`);
         return list.map((h2, i2) => {
           const o = h2;
+          const ms = typeof o.timeout_ms === "number" ? o.timeout_ms : typeof o.timeout === "number" ? o.timeout * 1e3 : void 0;
+          const timeout = ms && ms > 0 ? { timeout_ms: ms } : {};
+          if (o && o.type === "http" && typeof o.url === "string" && o.url.trim()) {
+            if (!/^https?:\/\//i.test(o.url.trim()))
+              throw new Error(`${where}[${i2}]: http hooks need an http(s) url`);
+            const headers = o.headers && typeof o.headers === "object" && !Array.isArray(o.headers) ? o.headers : void 0;
+            const allowed = Array.isArray(o.allowedEnvVars) ? o.allowedEnvVars.filter((v2) => typeof v2 === "string") : void 0;
+            return { type: "http", url: o.url.trim(), ...headers ? { headers } : {}, ...allowed ? { allowedEnvVars: allowed } : {}, ...timeout };
+          }
           if (!o || o.type !== "command" || typeof o.command !== "string" || !o.command.trim()) {
-            throw new Error(`${where}[${i2}]: each hook needs type: command and a command`);
+            throw new Error(`${where}[${i2}]: each hook needs type: command and a command, or type: http and a url`);
           }
-          const ms = typeof o.timeout_ms === "number" ? o.timeout_ms : typeof o.timeout === "number" ? o.timeout * 1e3 : void 0;
-          return { type: "command", command: o.command, ...ms && ms > 0 ? { timeout_ms: ms } : {} };
+          return { type: "command", command: o.command, ...timeout };
         });
       };
       const entries = (list, ev) => {
@@ -12677,9 +12685,9 @@ var require_agentTypes = __commonJS({
       return out;
     }
     function loadAgentTypes(workDir) {
-      return loadAgentTypesWithWarnings2(workDir).types;
+      return loadAgentTypesWithWarnings3(workDir).types;
     }
-    function loadAgentTypesWithWarnings2(workDir, extra = []) {
+    function loadAgentTypesWithWarnings3(workDir, extra = []) {
       const out = /* @__PURE__ */ new Map();
       const warnings = [];
       loadDir(path27.join(workDir, ".nexrall", "agents"), "project", out, warnings);
@@ -12706,7 +12714,7 @@ var require_agentTypes = __commonJS({
       });
       return { types: types3, warnings };
     }
-    function knownToolNames() {
+    function knownToolNames3() {
       return [...KNOWN_TOOL_NAMES].sort();
     }
     function builtinAgents() {
@@ -12734,7 +12742,7 @@ var require_agentTypes = __commonJS({
       "write_xlsx",
       "write_pptx"
     ]);
-    function findAgentType(types3, name) {
+    function findAgentType2(types3, name) {
       if (!name)
         return void 0;
       const want = name.trim().toLowerCase();
@@ -104672,6 +104680,8 @@ var require_rules = __commonJS({
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.setSessionRules = setSessionRules2;
+    exports2.setSessionSettings = setSessionSettings2;
+    exports2.getSessionSettings = getSessionSettings;
     exports2.loadSettings = loadSettings5;
     exports2.evaluatePermission = evaluatePermission4;
     var fs27 = __importStar(__require("fs"));
@@ -104700,6 +104710,13 @@ var require_rules = __commonJS({
     function setSessionRules2(r2) {
       sessionRules = { allow: [...r2.allow ?? []], ask: [...r2.ask ?? []], deny: [...r2.deny ?? []] };
     }
+    var sessionSettings = null;
+    function setSessionSettings2(obj2) {
+      sessionSettings = obj2;
+    }
+    function getSessionSettings() {
+      return sessionSettings;
+    }
     function loadSettings5(workDir) {
       const tiers = [
         managedSettingsPath(),
@@ -104719,6 +104736,13 @@ var require_rules = __commonJS({
         merged.ask.push(...r2.ask);
         merged.deny.push(...r2.deny);
       }
+      if (sessionSettings) {
+        Object.assign(raw, sessionSettings);
+        const r2 = extractRules(sessionSettings);
+        merged.allow.push(...r2.allow);
+        merged.ask.push(...r2.ask);
+        merged.deny.push(...r2.deny);
+      }
       merged.allow.push(...sessionRules.allow);
       merged.ask.push(...sessionRules.ask);
       merged.deny.push(...sessionRules.deny);
@@ -106887,7 +106911,9 @@ var require_loop = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.VERIFY_CMD_RE = exports2.WRITE_TOOL_NAMES = exports2.ToolNotAllowedError = exports2.AGENT_MEMORY_TOOL_SCHEMA = exports2.AGENT_MEMORY_TOOL = exports2._stallLimits = exports2._emptyTurnRetry = exports2.bashNeedsRepoLock = void 0;
     exports2.runLifecycleHooks = runLifecycleHooks;
+    exports2.runPermissionRequestHooks = runPermissionRequestHooks2;
     exports2.fireNotificationHooks = fireNotificationHooks2;
+    exports2.fireManualPostCompactHook = fireManualPostCompactHook2;
     exports2.fireManualPreCompactHook = fireManualPreCompactHook2;
     exports2.emptyTurnBackoffMs = emptyTurnBackoffMs;
     exports2.shouldRetryEmptyTurn = shouldRetryEmptyTurn;
@@ -106981,6 +107007,15 @@ var require_loop = __commonJS({
           fromSettings = JSON.parse(fs27.readFileSync(p, "utf-8")).hooks ?? {};
       } catch {
       }
+      const sess = (0, rules_1.getSessionSettings)()?.hooks;
+      if (sess && typeof sess === "object") {
+        const base = { ...fromSettings };
+        for (const [phase, list] of Object.entries(sess)) {
+          if (Array.isArray(list))
+            base[phase] = [...base[phase] ?? [], ...list];
+        }
+        fromSettings = base;
+      }
       const fromPlugins = (0, index_1.pluginHooks)(workDir);
       const merged = { ...fromSettings };
       for (const phase of Object.keys(fromPlugins)) {
@@ -107036,6 +107071,42 @@ var require_loop = __commonJS({
         child.stdin?.end(opts.input ?? "");
       });
     }
+    async function httpHook(hook, payload, timeoutMs) {
+      const url = String(hook.url ?? "");
+      if (!/^https?:\/\//i.test(url))
+        return { status: 1, stdout: "", stderr: `hook url must be http(s): ${url}` };
+      const headers = { "content-type": "application/json" };
+      const allowed = new Set(hook.allowedEnvVars ?? []);
+      for (const [k, v] of Object.entries(hook.headers ?? {})) {
+        headers[k] = String(v).replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}|\$([A-Za-z_][A-Za-z0-9_]*)/g, (_m, a1, a2) => allowed.has(a1 ?? a2) ? process.env[a1 ?? a2] ?? "" : "");
+      }
+      try {
+        const res = await fetch(url, { method: "POST", headers, body: payload, signal: AbortSignal.timeout(timeoutMs) });
+        const text = (await res.text()).trim();
+        if (res.status < 200 || res.status >= 300) {
+          return { status: 1, stdout: "", stderr: `hook returned HTTP ${res.status}` };
+        }
+        if (!text)
+          return { status: 0, stdout: "", stderr: "" };
+        if (text.startsWith("{"))
+          return { status: 0, stdout: text, stderr: "" };
+        return { status: 1, stdout: "", stderr: "hook returned a non-JSON body" };
+      } catch (err) {
+        return { status: 1, stdout: "", stderr: `hook request failed: ${err.message}` };
+      }
+    }
+    async function runHookHandler(hook, payload, opts) {
+      if (hook.type === "http")
+        return httpHook(hook, payload, opts.timeoutMs);
+      return spawnHook(String(hook.command ?? ""), { cwd: opts.cwd, timeout: opts.timeoutMs, input: payload, env: opts.env });
+    }
+    function hookTimeoutMs(hook, fallbackMs = 6e4) {
+      if (typeof hook.timeout_ms === "number" && hook.timeout_ms > 0)
+        return Math.min(hook.timeout_ms, 6e5);
+      if (typeof hook.timeout === "number" && hook.timeout > 0)
+        return Math.min(hook.timeout * 1e3, 6e5);
+      return fallbackMs;
+    }
     function hookMatches(matcher, toolName) {
       if (!matcher || matcher === "*")
         return true;
@@ -107058,13 +107129,16 @@ var require_loop = __commonJS({
         if (!hookMatches(entry.matcher, toolName))
           continue;
         for (const hook of entry.hooks ?? []) {
-          if (hook.type !== "command" || !hook.command)
+          if (hook.type !== "command" && hook.type !== "http")
+            continue;
+          if (hook.type === "command" && !hook.command)
+            continue;
+          if (hook.type === "http" && !hook.url)
             continue;
-          const hookTimeout = typeof hook.timeout_ms === "number" && hook.timeout_ms > 0 ? Math.min(hook.timeout_ms, 6e5) : 6e4;
-          const r2 = await spawnHook(hook.command, {
+          const hookTimeout = hookTimeoutMs(hook, 6e4);
+          const r2 = await runHookHandler(hook, payload, {
             cwd: workDir,
-            timeout: hookTimeout,
-            input: payload,
+            timeoutMs: hookTimeout,
             env: {
               ...process.env,
               NEXRALL_TOOL_NAME: toolName,
@@ -107099,9 +107173,13 @@ var require_loop = __commonJS({
       if (!defs?.length)
         return;
       for (const hook of defs) {
-        if (hook.type === "command" && hook.command) {
-          await spawnHook(hook.command, { cwd: workDir, timeout: 1e4, env: extraEnv ? { ...process.env, ...extraEnv } : void 0 });
-        }
+        if (hook.type !== "command" && hook.type !== "http")
+          continue;
+        if (hook.type === "command" && !hook.command)
+          continue;
+        if (hook.type === "http" && !hook.url)
+          continue;
+        await runHookHandler(hook, "", { cwd: workDir, timeoutMs: hookTimeoutMs(hook, 1e4), env: extraEnv ? { ...process.env, ...extraEnv } : void 0 });
       }
     }
     function flattenHookDefs(items, matchValue) {
@@ -107112,7 +107190,7 @@ var require_loop = __commonJS({
           if (m2 && m2 !== "*" && matchValue !== void 0 && !m2.split("|").map((x2) => x2.trim()).includes(matchValue))
             continue;
           out.push(...it.hooks);
-        } else if (it && it.type === "command")
+        } else if (it && (it.type === "command" || it.type === "http"))
           out.push(it);
       }
       return out;
@@ -107124,14 +107202,27 @@ var require_loop = __commonJS({
         return outcome;
       const input = JSON.stringify({ hook_event_name: event, cwd: workDir, ...payload });
       for (const hook of defs) {
-        if (!hook.command)
+        if (hook.type !== "command" && hook.type !== "http")
+          continue;
+        if (hook.type === "command" && !hook.command)
           continue;
-        const timeout = typeof hook.timeout_ms === "number" && hook.timeout_ms > 0 ? Math.min(hook.timeout_ms, 6e5) : 3e4;
-        const r2 = await spawnHook(hook.command, { cwd: workDir, timeout, input, env: { ...process.env, NEXRALL_HOOK_PHASE: event } });
+        if (hook.type === "http" && !hook.url)
+          continue;
+        const timeout = hookTimeoutMs(hook, 3e4);
+        const r2 = await runHookHandler(hook, input, { cwd: workDir, timeoutMs: timeout, env: { ...process.env, NEXRALL_HOOK_PHASE: event } });
         const out = (r2.stdout ?? "").toString().trim();
         if (out.startsWith("{")) {
           try {
             const j = JSON.parse(out);
+            if (event === "PermissionRequest") {
+              const d = j.hookSpecificOutput?.decision?.behavior ?? (typeof j.decision === "string" ? j.decision : j.decision?.behavior);
+              if (d === "allow" || d === "approve")
+                outcome.allow = true;
+              else if (d === "deny" || d === "block") {
+                outcome.block = true;
+                outcome.reason = j.reason ?? j.hookSpecificOutput?.decision?.message ?? outcome.reason ?? "Denied by PermissionRequest hook";
+              }
+            }
             if (j.decision === "block") {
               outcome.block = true;
               outcome.reason = j.reason ?? outcome.reason ?? `Blocked by ${event} hook`;
@@ -107150,6 +107241,20 @@ var require_loop = __commonJS({
       }
       return outcome;
     }
+    async function runPermissionRequestHooks2(workDir, tool, input, sessionId = "") {
+      try {
+        const items = loadHooks(workDir).PermissionRequest;
+        if (!items?.length)
+          return { answer: null };
+        const o = await runLifecycleHooks(items, "PermissionRequest", workDir, { session_id: sessionId, tool_name: tool, tool_input: input }, tool);
+        if (o.block)
+          return { answer: "deny", reason: o.reason };
+        if (o.allow)
+          return { answer: "allow" };
+      } catch {
+      }
+      return { answer: null };
+    }
     function fireNotificationHooks2(workDir, message, type = "permission_prompt") {
       try {
         const items = loadHooks(workDir).Notification;
@@ -107160,6 +107265,15 @@ var require_loop = __commonJS({
       } catch {
       }
     }
+    async function fireManualPostCompactHook2(workDir, sessionId, messagesSummarized) {
+      try {
+        const items = loadHooks(workDir).PostCompact;
+        if (!items?.length)
+          return;
+        await runLifecycleHooks(items, "PostCompact", workDir, { trigger: "manual", session_id: sessionId, messages_summarized: messagesSummarized }, "manual");
+      } catch {
+      }
+    }
     async function fireManualPreCompactHook2(workDir, sessionId, messagesToSummarize) {
       try {
         const items = loadHooks(workDir).PreCompact;
@@ -107971,6 +108085,23 @@ ${stats}${isoNote}`;
       try {
         if (started)
           started.value = true;
+        {
+          const subAgentName = agent?.name ?? (typeof input.subagent_type === "string" && input.subagent_type ? input.subagent_type : "general-purpose");
+          const startItems = loadHooks(options.workDir).SubagentStart;
+          if (startItems?.length) {
+            const o = await runLifecycleHooks(startItems, "SubagentStart", options.workDir, { session_id: options.sessionId ?? "", agent_type: subAgentName, description: String(input.description ?? "") }, subAgentName).catch(() => ({ block: false }));
+            if (o.context) {
+              const last = subMessages[subMessages.length - 1];
+              if (last && Array.isArray(last.content)) {
+                subMessages[subMessages.length - 1] = { ...last, content: [...last.content, { type: "text", text: `
+
+<hook-context>
+${o.context}
+</hook-context>` }] };
+              }
+            }
+          }
+        }
         const childRun = runAgentLoop2(subMessages, {
           ...options,
           _depth: depth + 1,
@@ -108522,6 +108653,11 @@ Do NOT call any tools and do NOT continue the task. Reply with text only: a conc
       }
       const toSummarize = messages.slice(0, cut);
       const kept = messages.slice(cut);
+      const firePostCompact = async () => {
+        if ((options._depth ?? 0) !== 0)
+          return;
+        await runLifecycleHooks(loadHooks(options.workDir).PostCompact, "PostCompact", options.workDir, { trigger: "auto", session_id: options.sessionId ?? "", messages_summarized: cut }, "auto").catch(() => void 0);
+      };
       const originalTask = originalTaskText(toSummarize);
       const summaryPrompt = `Summarize this coding-session transcript into concise bullet points the assistant needs to continue the work: key decisions, files changed (and how), commands run, unresolved problems, and user preferences. Max 400 words.
 
@@ -108590,6 +108726,7 @@ ${taskBlock}${ledgerBlock}Summary of the earlier conversation so far:
 ${summary}
 
 Continue the work from here.` }] });
+      await firePostCompact();
       return true;
     }
     async function maybeCompactMemory(scope, options) {
@@ -108766,7 +108903,7 @@ Continue the work from here.` }] });
     async function runAgentLoop2(initialMessages, options) {
       const messages = [...initialMessages];
       const model = options.model ?? "turbo";
-      const hooks = withAgentHooks(loadHooks(options.workDir), options._agentHooks);
+      const hooks = options.disableHooks ? withAgentHooks({}, options._agentHooks) : withAgentHooks(loadHooks(options.workDir), options._agentHooks);
       const depth = options._depth ?? 0;
       const agentScope = options._agentScope ?? "root";
       const isMainAgent = depth === 0;
@@ -109303,6 +109440,15 @@ ${ctx}
                   void maybeCompactMemory(scope, options);
                 }
                 const post = await runToolHooks(hooks.PostToolUse, "PostToolUse", name, input, options.workDir, result);
+                if (result.error !== void 0 && (hooks.PostToolUseFailure?.length ?? 0) > 0) {
+                  const f3 = await runLifecycleHooks(hooks.PostToolUseFailure, "PostToolUseFailure", options.workDir, { session_id: options.sessionId ?? "", tool_name: name, tool_input: input, error: String(result.error).slice(0, 4e3) }, name).catch(() => ({ block: false }));
+                  if (f3.context)
+                    post.context = [post.context, f3.context].filter(Boolean).join("\n");
+                  if (f3.block) {
+                    post.block = true;
+                    post.reason = [post.reason, f3.reason].filter(Boolean).join("; ");
+                  }
+                }
                 const injected = [pre.context, post.context].filter(Boolean).join("\n");
                 if (injected) {
                   if (result.error !== void 0)
@@ -109430,6 +109576,9 @@ ${result.output}` : `Error: ${result.error}` : result.output ?? "",
           throw err;
         throw new types_1.AgentTurnError(err?.message || "The turn ended unexpectedly", trimToResumableBoundary(messages), completedRounds, err);
       } finally {
+        if (depth === 0 && (hooks.SessionEnd?.length ?? 0) > 0) {
+          await runLifecycleHooks(hooks.SessionEnd, "SessionEnd", options.workDir, { session_id: options.sessionId ?? "", reason: stopReason }, stopReason).catch(() => void 0);
+        }
         if (depth === 0)
           await runSimpleHooks(hooks.OnStop, options.workDir);
         else
@@ -151573,6 +151722,13 @@ async function requestPermissionInner(req) {
     console.error(paint.yellow(`  \u2298 Plan mode \u2014 refused ${tool} (read-only until you switch mode).`));
     return false;
   }
+  const hook = await (0, import_code_core5.runPermissionRequestHooks)(_workDir, tool, input);
+  if (hook.answer === "allow")
+    return true;
+  if (hook.answer === "deny") {
+    console.error(paint.red(`  \u2716 Denied by PermissionRequest hook: ${hook.reason ?? tool}`));
+    return false;
+  }
   return serialisePrompt(() => askFlow(req));
 }
 async function requestPermission(req) {
@@ -151908,6 +152064,8 @@ function checkHeadlessOnly(f3) {
     return "--max-budget-usd only works with --output-format (a one-shot, non-interactive run).";
   if (f3.noSessionPersistence)
     return "--no-session-persistence only works with --output-format (a one-shot, non-interactive run).";
+  if (f3.maxTurns !== void 0)
+    return "--max-turns only works with --output-format (a one-shot, non-interactive run).";
   return null;
 }
 function headlessVerdict(i2) {
@@ -152076,6 +152234,230 @@ function validateJsonSchema(value, schema, at = "$") {
   }
   return errs;
 }
+function parseMaxTurns(raw) {
+  const s2 = String(raw).trim();
+  const n = Number(s2);
+  if (!/^\d+$/.test(s2) || !Number.isSafeInteger(n) || n < 1) {
+    return { ok: false, error: `Invalid --max-turns "${raw}". Use a whole number of 1 or more, e.g. 10` };
+  }
+  return { ok: true, value: n };
+}
+function readPromptFile(file, cwd2, flag = "--append-system-prompt-file") {
+  const abs = path7.resolve(cwd2, file);
+  let text;
+  try {
+    text = fs6.readFileSync(abs, "utf-8");
+  } catch {
+    return { ok: false, error: `${flag}: cannot read "${file}"` };
+  }
+  if (!text.trim())
+    return { ok: false, error: `${flag}: "${file}" is empty` };
+  return { ok: true, value: text.trim() };
+}
+var CLAUDE_TOOL_ALIASES = {
+  Read: ["read_file", "list_directory", "search_files", "glob", "notebook_read"],
+  Edit: ["edit_file", "multi_edit", "notebook_edit"],
+  Write: ["write_file", "write_docx", "write_xlsx", "write_pptx"],
+  Bash: ["bash", "bash_output", "kill_shell"],
+  Glob: ["glob"],
+  Grep: ["search_files"],
+  WebFetch: ["fetch_url"],
+  WebSearch: ["web_search"],
+  Task: ["task"],
+  TodoWrite: ["todo_write", "todo_read"],
+  NotebookEdit: ["notebook_edit"]
+};
+function parseToolsFlag(raw, known) {
+  const out = /* @__PURE__ */ new Set();
+  const trimmed = String(raw).trim();
+  if (trimmed === "")
+    return { ok: true, value: [] };
+  if (trimmed.toLowerCase() === "default")
+    return { ok: true, value: [...known] };
+  for (const piece of parseToolList(trimmed)) {
+    if (CLAUDE_TOOL_ALIASES[piece]) {
+      CLAUDE_TOOL_ALIASES[piece].forEach((t2) => out.add(t2));
+      continue;
+    }
+    if (known.includes(piece) || piece.startsWith("mcp__")) {
+      out.add(piece);
+      continue;
+    }
+    return { ok: false, error: `--tools: unknown tool "${piece}". Known: ${[...Object.keys(CLAUDE_TOOL_ALIASES), ...known].join(", ")}` };
+  }
+  return { ok: true, value: [...out] };
+}
+function parseSessionId(raw) {
+  const s2 = String(raw).trim();
+  if (!/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(s2)) {
+    return { ok: false, error: `Invalid --session-id "${raw}". Use letters, digits, "-" or "_" (max 64), e.g. a UUID` };
+  }
+  return { ok: true, value: s2 };
+}
+function parseSessionName(raw) {
+  const s2 = String(raw).replace(/\s+/g, " ").trim();
+  if (!s2)
+    return { ok: false, error: "Invalid --name: it is empty" };
+  return { ok: true, value: s2.slice(0, 80) };
+}
+function checkSessionIdentityFlags(f3) {
+  const resuming = f3.resume !== void 0 || !!f3.continue;
+  if (f3.fork && !resuming)
+    return "--fork-session needs --resume <id> or --continue (there is nothing to fork otherwise).";
+  if (f3.sessionId && resuming && !f3.fork)
+    return "--session-id starts a new conversation; with --resume/--continue add --fork-session to branch it under that id.";
+  return null;
+}
+function matchSessionByName(sessions, name) {
+  const want = name.trim().toLowerCase();
+  const hits = sessions.filter((s2) => s2.title.trim().toLowerCase() === want).sort((a, b) => b.updatedAt - a.updatedAt);
+  return hits[0] ?? null;
+}
+function parseSettingsArg(spec, cwd2) {
+  const s2 = String(spec).trim();
+  let text = s2;
+  if (!s2.startsWith("{")) {
+    try {
+      text = fs6.readFileSync(path7.resolve(cwd2, s2), "utf-8");
+    } catch {
+      return { ok: false, error: `--settings: cannot read "${s2}"` };
+    }
+  }
+  let v;
+  try {
+    v = JSON.parse(text);
+  } catch {
+    return { ok: false, error: `--settings: ${s2.startsWith("{") ? "the inline value" : `"${s2}"`} is not valid JSON` };
+  }
+  if (!v || typeof v !== "object" || Array.isArray(v))
+    return { ok: false, error: "--settings: expected a JSON object" };
+  return { ok: true, value: v };
+}
+function authStatusReport(a, env4) {
+  if (!a || !a.token)
+    return { loggedIn: false, source: null };
+  const fromEnv = !!env4.NEXRALL_TOKEN && env4.NEXRALL_TOKEN.trim().length > 0;
+  return { loggedIn: true, source: fromEnv ? "env" : "login", ...a.email ? { email: a.email } : {} };
+}
+function isFallbackWorthy(message) {
+  const m2 = String(message);
+  if (/\b(401|402|403|400|404|413|422)\b/.test(m2) && !/\b(429|5\d\d)\b/.test(m2))
+    return false;
+  return /\b(429|500|502|503|504|529)\b|overload|rate.?limit|ECONNRESET|ETIMEDOUT|ENOTFOUND|EAI_AGAIN|socket hang up|fetch failed|stream (failed|stalled|ended)|timed? ?out/i.test(m2);
+}
+function parseFallbackModel(raw, primary) {
+  const s2 = String(raw).trim();
+  if (!s2)
+    return { ok: false, error: "Invalid --fallback-model: it is empty" };
+  if (s2 === primary)
+    return { ok: false, error: `--fallback-model "${s2}" is the same as the main model; pick a different one` };
+  return { ok: true, value: s2 };
+}
+function resolveSystemPrompt(f3) {
+  if (f3.text !== void 0 && f3.file !== void 0) {
+    return { ok: false, error: "--system-prompt and --system-prompt-file are mutually exclusive \u2014 pick one." };
+  }
+  if (f3.file !== void 0) {
+    const r2 = readPromptFile(f3.file, f3.cwd, "--system-prompt-file");
+    if (!r2.ok)
+      return r2;
+    if (!r2.value.trim())
+      return { ok: false, error: `--system-prompt-file: ${f3.file} is empty.` };
+    return { ok: true, value: r2.value };
+  }
+  if (f3.text !== void 0) {
+    if (!f3.text.trim())
+      return { ok: false, error: "--system-prompt: the value is empty." };
+    return { ok: true, value: f3.text };
+  }
+  return { ok: true, value: void 0 };
+}
+function checkPartialMessages(f3) {
+  if (!f3.includePartial)
+    return null;
+  if (f3.outputFormat !== "stream-json") {
+    return "--include-partial-messages needs --output-format stream-json (it streams model deltas as they arrive).";
+  }
+  return null;
+}
+function checkReplayUserMessages(f3) {
+  if (!f3.replay)
+    return null;
+  if (f3.inputFormat !== "stream-json") {
+    return "--replay-user-messages needs --input-format stream-json (there is nothing to replay otherwise).";
+  }
+  if (f3.outputFormat !== "stream-json") {
+    return "--replay-user-messages needs --output-format stream-json (the echo is written as an output event).";
+  }
+  return null;
+}
+function streamEventPayload(kind, chunk, extra = {}) {
+  const delta = kind === "text" ? { type: "text_delta", text: chunk } : kind === "thinking" ? { type: "thinking_delta", thinking: chunk } : { type: "input_json_delta", partial_json: chunk };
+  return { type: "stream_event", event: { type: "content_block_delta", delta }, ...extra };
+}
+function initEventPayload(i2) {
+  return {
+    type: "system",
+    subtype: "init",
+    session_id: i2.sessionId ?? "",
+    cwd: i2.cwd,
+    model: i2.model,
+    tools: i2.tools,
+    ...i2.mcpServers ? { mcp_servers: i2.mcpServers } : {},
+    ...i2.permissionMode ? { permission_mode: i2.permissionMode } : {}
+  };
+}
+function userReplayPayload(text) {
+  return { type: "user", message: { role: "user", content: [{ type: "text", text }] } };
+}
+function parseAgentsArg(raw, cwd2) {
+  if (raw === void 0)
+    return { ok: true, value: [] };
+  const text = String(raw).trim();
+  if (!text)
+    return { ok: false, error: "--agents: the value is empty." };
+  let json = text;
+  const looksLikePath = text.startsWith("@") || !text.startsWith("{") && fs6.existsSync(path7.resolve(cwd2, text));
+  if (looksLikePath) {
+    const file = text.startsWith("@") ? text.slice(1) : text;
+    try {
+      json = fs6.readFileSync(path7.resolve(cwd2, file), "utf-8");
+    } catch (e2) {
+      return { ok: false, error: `--agents: cannot read ${file}: ${e2.message}` };
+    }
+  }
+  let obj2;
+  try {
+    obj2 = JSON.parse(json);
+  } catch (e2) {
+    return { ok: false, error: `--agents: not valid JSON: ${e2.message}` };
+  }
+  if (!obj2 || typeof obj2 !== "object" || Array.isArray(obj2)) {
+    return { ok: false, error: '--agents: expected an object of { "name": { "description", "prompt" } }.' };
+  }
+  const out = [];
+  for (const [name, v] of Object.entries(obj2)) {
+    const a = v ?? {};
+    if (!/^[A-Za-z0-9._-]+$/.test(name)) {
+      return { ok: false, error: `--agents: "${name}" is not a usable agent name (letters, digits, . _ - only).` };
+    }
+    if (typeof a.description !== "string" || !a.description.trim()) {
+      return { ok: false, error: `--agents: "${name}" needs a description (that is how the model decides to use it).` };
+    }
+    if (typeof a.prompt !== "string" || !a.prompt.trim()) {
+      return { ok: false, error: `--agents: "${name}" needs a prompt (the agent's instructions).` };
+    }
+    const tools = Array.isArray(a.tools) ? a.tools.filter((t2) => typeof t2 === "string" && !!t2.trim()) : void 0;
+    if (a.tools !== void 0 && (!tools || tools.length !== a.tools.length)) {
+      return { ok: false, error: `--agents: "${name}".tools must be a list of tool names.` };
+    }
+    const model = typeof a.model === "string" && a.model.trim() ? a.model.trim() : void 0;
+    out.push({ name, description: a.description.trim(), prompt: a.prompt, ...tools ? { tools } : {}, ...model ? { model } : {} });
+  }
+  if (!out.length)
+    return { ok: false, error: "--agents: no agents defined." };
+  return { ok: true, value: out };
+}
 
 // src/commands/chat.ts
 var import_code_core17 = __toESM(require_dist3(), 1);
@@ -167966,6 +168348,11 @@ function refreshEnvForTurn(env4, workDir) {
     ...collectGitEnv(workDir)
   };
 }
+var noDiscovery = false;
+var _cliAgentTypes = [];
+function setNoDiscovery(v) {
+  noDiscovery = v;
+}
 var NEXRALL_MD_CANDIDATES = [
   "nexrall.md",
   "NEXRALL.md",
@@ -167980,6 +168367,8 @@ var tryRead = (p) => {
   }
 };
 function readNexrallMd(workDir) {
+  if (noDiscovery)
+    return void 0;
   const parts = [];
   const memContent = (0, import_code_core15.readAllMemory)(workDir);
   if (memContent)
@@ -168228,6 +168617,11 @@ var _mcpManager = null;
 var _mcpConfig = null;
 var sessionTouched = [];
 async function initMcp(workDir, override, strict) {
+  if (noDiscovery && !override) {
+    _mcpConfig = { mcpServers: {} };
+    _mcpManager = null;
+    return;
+  }
   _mcpConfig = strict && override ? { mcpServers: {} } : import_code_core15.McpManager.loadConfig(workDir);
   if (override)
     Object.assign(_mcpConfig.mcpServers, override.mcpServers);
@@ -168599,6 +168993,7 @@ function printErrorReport(err, aborted) {
   for (const l2 of errorReportLines(err, aborted))
     console.error(l2);
 }
+var activeSessionIdGetter = () => void 0;
 async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrallMd, mode, effort, checkpointManager, onProgress, takePendingInput, worktreeState, peerCtx) {
   let lastUsage;
   turnStats = freshTurnStats();
@@ -168633,6 +169028,7 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
   spinner.start("thinking\u2026", { hint: false, verbs: true });
   const result = await (0, import_code_core15.runAgentLoop)(messages, {
     workDir,
+    sessionId: activeSessionIdGetter(),
     model: modelAlias,
     env: refreshEnvForTurn(env4, workDir),
     nexrallMd,
@@ -168665,6 +169061,8 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env4, nexrall
     onInjectedInput: () => {
     },
     backgroundAgents: cliBackgroundAgents,
+    disableHooks: noDiscovery,
+    _extraAgentTypes: _cliAgentTypes,
     // The backend streams a cumulative output-token count (routes/code.js's
     // sendProgress, throttled to ≤5/s) covering thinking, visible text AND
     // tool-argument JSON. This used to be stored in a variable and rendered only
@@ -168958,13 +169356,27 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
   let resultText = "";
   let toolCallCount = 0;
   let budgetHit = false;
+  let turnsHit = false;
   const emit = (obj2) => {
     if (format === "stream-json")
       process.stdout.write(JSON.stringify(obj2) + "\n");
   };
+  const verbose = (line) => {
+    if (_headlessPolicy.verbose)
+      process.stderr.write(line + "\n");
+  };
+  emit(initEventPayload({
+    sessionId: activeSessionIdGetter(),
+    cwd: workDir,
+    model: modelAlias,
+    tools: _headlessPolicy.onlyTools ? [..._headlessPolicy.onlyTools].sort() : (0, import_code_core15.knownToolNames)(),
+    permissionMode: _headlessPolicy.permissionMode
+  }));
   emit({ type: "start", model: modelAlias, workDir });
+  verbose(`[verbose] model=${modelAlias} cwd=${workDir} mode=${mode} session=${activeSessionIdGetter() ?? "-"}`);
   const result = await (0, import_code_core15.runAgentLoop)(messages, {
     workDir,
+    sessionId: activeSessionIdGetter(),
     model: modelAlias,
     env: refreshEnvForTurn(env4, workDir),
     nexrallMd,
@@ -168972,11 +169384,27 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
     planMode: mode === "plan",
     worktree: worktreeState,
     backgroundAgents: cliBackgroundAgents,
+    disableHooks: noDiscovery,
+    _extraAgentTypes: _cliAgentTypes,
     effort,
     abortSignal: _abortSignal,
+    // `--max-turns`: a hard round cap. autoContinue off, or the loop would extend it.
+    ..._headlessPolicy.maxTurns !== void 0 ? { maxIterations: _headlessPolicy.maxTurns, autoContinue: false } : {},
+    // `--tools`: the allowlist is the same one sub-agents use, so removed tools are not even offered.
+    ..._headlessPolicy.onlyTools ? { _allowedTools: _headlessPolicy.onlyTools } : {},
+    // Setting this callback makes the loop stop printing its own stop notice, so re-emit it —
+    // otherwise every stop reason (stalled, no balance…) would go silent in headless runs.
+    _onStopReason: (reason, notice) => {
+      if (reason === "budget" && _headlessPolicy.maxTurns !== void 0)
+        turnsHit = true;
+      if (notice)
+        emit({ type: "notice", text: notice });
+    },
     onText: (text) => {
       resultText += text;
       emit({ type: "text", text });
+      if (_headlessPolicy.includePartial)
+        emit(streamEventPayload("text", text));
     },
     // ── Reasoning-phase liveness ──────────────────────────────────────
     // These used to be UNWIRED here while runTurn() (interactive) wired all
@@ -169007,6 +169435,8 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
     // dropped on the floor for every headless run.
     onThinking: (text) => {
       emit({ type: "thinking", text });
+      if (_headlessPolicy.includePartial)
+        emit(streamEventPayload("thinking", text));
     },
     // onThinkingDelta is intentionally NOT wired. Its chunks concatenate to the
     // same string `onThinking` emits in full above, so emitting both would
@@ -169023,6 +169453,7 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
     onToolUse: (name, input, isSubTask, meta) => {
       debugLog("tool_use", { tool: name, sub: !!isSubTask });
       emit({ type: "tool_use", tool: name, input, ...toolIds(isSubTask, meta) });
+      verbose(`[verbose] -> ${name}${isSubTask ? " (sub-agent)" : ""} ${toolTarget(name, input)}`);
     },
     // Live bash progress for scripted/CI consumers — lets a wrapper tail a
     // long-running build/test command instead of blocking silently until
@@ -169030,12 +169461,15 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
     // which is head/tail-capped), so a chatty command can emit many of these.
     onToolStreamChunk: (name, chunk, isSubTask, meta) => {
       emit({ type: "tool_stream", tool: name, chunk, ...toolIds(isSubTask, meta) });
+      if (_headlessPolicy.includePartial)
+        emit(streamEventPayload("tool", chunk, { tool: name, ...toolIds(isSubTask, meta) }));
     },
     onToolResult: (name, res, isSubTask, meta) => {
       if (!isSubTask)
         toolCallCount++;
       debugLog("tool_result", { tool: name, ok: res.error === void 0, error: res.error, sub: !!isSubTask });
       emit({ type: "tool_result", tool: name, ok: res.error === void 0, ...res.error ? { error: res.error } : {}, ...toolIds(isSubTask, meta) });
+      verbose(`[verbose] <- ${name} ${res.error === void 0 ? "ok" : "FAILED: " + String(res.error).slice(0, 200)}`);
     },
     // Headless consumers get the partial report too — tagged, so a script can account
     // for the real cost of a restarted turn — but it never becomes `lastUsage`, which
@@ -169076,6 +169510,10 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
     // no human to confirm, they are denied unless NEXRALL_ALLOW_DESTRUCTIVE=1 is
     // explicitly set for this CI run.
     requestPermission: async ({ tool, input }) => {
+      if (_headlessPolicy.onlyTools && !_headlessPolicy.onlyTools.has(tool) && !tool.startsWith("mcp__")) {
+        emit({ type: "permission_denied", tool, reason: "tools" });
+        return false;
+      }
       const d = (0, import_code_core15.isDestructiveBash)(tool, input);
       const v = headlessVerdict({
         rule: (0, import_code_core17.evaluatePermission)((0, import_code_core17.loadSettings)(workDir).permissions, tool, input, workDir),
@@ -169115,6 +169553,7 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
   }
   const extra = {
     ..._headlessPolicy.budgetUsd !== void 0 ? { cost_usd: _headlessPolicy.spent, ...budgetHit ? { stopped: "budget" } : {} } : {},
+    ...turnsHit ? { stopped: "max_turns", max_turns: _headlessPolicy.maxTurns } : {},
     ...structured ? { structured_output: structured.value } : {},
     ...schemaError ? { schema_error: schemaError } : {}
   };
@@ -169137,6 +169576,8 @@ async function runTurnHeadless(messages, modelAlias, workDir, _abortSignal, env4
   }
   if (budgetHit)
     process.exitCode = 2;
+  else if (turnsHit)
+    process.exitCode = 4;
   return { messages: result, usage: lastUsage };
 }
 function kbKey(action) {
@@ -169317,6 +169758,9 @@ function printSessions() {
   console.log();
 }
 async function startChatSession(options) {
+  if (options.bare)
+    setNoDiscovery(true);
+  _cliAgentTypes = (options.agents ?? []).map((a) => ({ ...a, source: "programmatic" }));
   (0, import_code_core15.enableAgentTranscriptPersistence)();
   const headless = options.outputFormat === "json" || options.outputFormat === "stream-json";
   const requestedWorkDir = options.workDir;
@@ -169412,8 +169856,15 @@ Resume it with: nex --worktree ${worktreeState.name}
     });
   }
   const env4 = collectEnv(workDir);
-  const nexrallMd = [readNexrallMd(workDir), options.appendSystemPrompt?.trim(), addDirNote(options.addDirs ?? []), options.jsonSchema ? schemaInstruction(options.jsonSchema) : ""].filter(Boolean).join("\n\n") || void 0;
-  _headlessPolicy = { strict: !!options.strictPermissions, budgetUsd: options.budgetUsd, spent: 0, schema: options.jsonSchema };
+  const briefBase = options.systemPrompt?.trim() ?? readNexrallMd(workDir);
+  const agentPrefix = options.selectedAgent?.prompt?.trim();
+  const nexrallMd = [agentPrefix, briefBase, options.appendSystemPrompt?.trim(), addDirNote(options.addDirs ?? []), options.jsonSchema ? schemaInstruction(options.jsonSchema) : ""].filter(Boolean).join("\n\n") || void 0;
+  const agentTools = options.selectedAgent?.tools;
+  const toolAllow = agentTools && options.onlyTools ? options.onlyTools.filter((t2) => agentTools.includes(t2)) : options.onlyTools ?? agentTools;
+  _headlessPolicy = { strict: !!options.strictPermissions, budgetUsd: options.budgetUsd, spent: 0, schema: options.jsonSchema, maxTurns: options.maxTurns, onlyTools: toolAllow ? new Set(toolAllow) : void 0 };
+  _headlessPolicy.verbose = !!options.verbose;
+  _headlessPolicy.includePartial = !!options.includePartialMessages;
+  _headlessPolicy.permissionMode = String(options.initialMode ?? "");
   const saveSession2 = options.noSessionPersistence ? () => {
   } : saveSession;
   const interactive = !headless && !options.prompt && !options.stdinText;
@@ -169489,8 +169940,9 @@ Resume it with: nex --worktree ${worktreeState.name}
     ));
   }
   let messages = [];
-  let sessionId = crypto6.randomBytes(8).toString("hex");
-  let sessionTitle = "";
+  let sessionId = options.newSessionId ?? crypto6.randomBytes(8).toString("hex");
+  activeSessionIdGetter = () => sessionId;
+  let sessionTitle = options.sessionName ?? "";
   const modeLocked = options.lockMode === true;
   let agentMode = modeLocked ? "plan" : options.initialMode ?? "auto";
   const refuseIfLocked = (what) => {
@@ -169512,7 +169964,7 @@ Resume it with: nex --worktree ${worktreeState.name}
     for (const n of themeConfig.notes)
       console.log(paint.dim("  theme: " + n));
   }
-  let skills = (0, import_code_core15.loadSkills)(workDir);
+  let skills = noDiscovery ? [] : (0, import_code_core15.loadSkills)(workDir);
   if (skills.length && !headless)
     console.log(paint.dim(`  ${skills.length} skill(s) loaded`));
   let contextSet = loadContextSet(workDir);
@@ -169542,7 +169994,7 @@ Resume it with: nex --worktree ${worktreeState.name}
     process.exit(1);
   }
   if (options.debug) {
-    const dbgPath = enableDebug();
+    const dbgPath = enableDebug(options.debugFile);
     if (dbgPath) {
       debugLog("start", { version: CLI_VERSION, node: process.version, platform: process.platform, model: modelAlias, mode: agentMode, locked: modeLocked, headless, interactive });
       if (!headless)
@@ -169555,7 +170007,7 @@ Resume it with: nex --worktree ${worktreeState.name}
     }
   }
   if (options.resume || options.continueLast) {
-    const stored = options.continueLast ? lastSessionForDir(workDir) : options.resume === "last" ? lastSession() : loadSession(options.resume);
+    const stored = options.continueLast ? lastSessionForDir(workDir) : options.resume === "last" ? lastSession() : loadSession(options.resume) ?? matchSessionByName(listSessions(), options.resume);
     if (!stored) {
       if (options.continueLast) {
         console.error(paint.red("  No conversation to continue in this folder."));
@@ -169569,7 +170021,13 @@ Resume it with: nex --worktree ${worktreeState.name}
     messages = stored.messages;
     sessionId = stored.id;
     sessionTitle = stored.title;
-    startSessionLog(sessionId, true, { workDir });
+    if (options.forkSession) {
+      sessionId = options.newSessionId ?? crypto6.randomBytes(8).toString("hex");
+      sessionTitle = options.sessionName ?? forkTitle(stored.title, "");
+    } else if (options.sessionName) {
+      sessionTitle = options.sessionName;
+    }
+    startSessionLog(sessionId, true, options.forkSession ? { workDir, forkOf: stored.id } : { workDir });
     try {
       const compacted = await (0, import_code_core15.compactMessagesForResume)(messages, {
         workDir,
@@ -169643,6 +170101,9 @@ Resume it with: nex --worktree ${worktreeState.name}
 ${text}` : "");
     }
     checkpoints.beginTurn(text, messages.length);
+    if (options.replayUserMessages && options.inputFormatWasStreamJson && options.outputFormat === "stream-json") {
+      process.stdout.write(JSON.stringify(userReplayPayload(text)) + "\n");
+    }
     messages.push({ role: "user", content: [{ type: "text", text }] });
     const abortSignal2 = { aborted: false };
     const onSigint = () => {
@@ -169651,8 +170112,31 @@ ${text}` : "");
     process.once("SIGINT", onSigint);
     try {
       const fmt = options.outputFormat;
+      const replay = (text2) => {
+        if (options.replayUserMessages && fmt === "stream-json")
+          process.stdout.write(JSON.stringify(userReplayPayload(text2)) + "\n");
+      };
       const runOnce = () => fmt === "json" || fmt === "stream-json" ? runTurnHeadless(messages, modelAlias, workDir, abortSignal2, env4, nexrallMd, agentMode, effortLevel, fmt, checkpoints, saveProgress, worktreeState) : runTurn(messages, modelAlias, workDir, abortSignal2, env4, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress, void 0, worktreeState, peerCtx);
-      let result = await runOnce();
+      const runWithFallback = async () => {
+        try {
+          return await runOnce();
+        } catch (e2) {
+          if (!options.fallbackModel || modelAlias === options.fallbackModel || abortSignal2.aborted || !isFallbackWorthy(String(e2.message)))
+            throw e2;
+          const from = modelAlias;
+          modelAlias = options.fallbackModel;
+          const salvagedMsgs = (0, import_code_core15.salvageHistory)(e2);
+          if (salvagedMsgs)
+            messages = salvagedMsgs;
+          const note = `Model ${from} failed (${String(e2.message).slice(0, 120)}); retrying on ${modelAlias}`;
+          if (fmt === "stream-json")
+            process.stdout.write(JSON.stringify({ type: "notice", text: note }) + "\n");
+          else
+            console.error(note);
+          return await runOnce();
+        }
+      };
+      let result = await runWithFallback();
       messages = result.messages;
       while (!abortSignal2.aborted && (cliBackgroundAgents.runningCount() > 0 || cliBackgroundAgents.hasPending())) {
         if (!cliBackgroundAgents.hasPending()) {
@@ -169669,6 +170153,7 @@ ${text}` : "");
           break;
         commitCheckpoint();
         checkpoints.beginTurn(follow, messages.length);
+        replay(follow);
         messages.push({ role: "user", content: [{ type: "text", text: follow }] });
         result = await runOnce();
         messages = result.messages;
@@ -170576,6 +171061,7 @@ ${summaryText}` }] },
             saveSession2(sessionId, sessionTitle || "Untitled", workDir, messages);
             console.log(paint.green(`  Compacted ${toSummarize.length} messages \u2192 ${messages.length} messages.`));
             emitEvent("context.compacted", { where: "manual", before: toSummarize.length + KEEP, after: messages.length });
+            await (0, import_code_core16.fireManualPostCompactHook)(workDir, sessionId, toSummarize.length);
             if (pin.attachments.length)
               console.log(paint.dim(`  ${pin.attachments.length} pinned file(s) re-attached.`));
             for (const n of pin.notes)
@@ -172916,7 +173402,17 @@ var require3 = createRequire2(import.meta.url);
 var NEX_VERSION = require3("../package.json").version;
 var program2 = new Command();
 program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version(NEX_VERSION).enablePositionalOptions();
-program2.command("auth").description("Login to your Nexrall account").action(authCommand);
+var auth = program2.command("auth").description("Login to your Nexrall account").action(authCommand);
+auth.command("status").description("Show whether you are logged in (exit 0 = yes, 1 = no). --json for scripts; the token is never printed").option("--json", "Machine-readable output").action((opts) => {
+  const r2 = authStatusReport((0, import_code_core21.loadAuth)(), process.env);
+  if (opts.json)
+    console.log(JSON.stringify(r2));
+  else if (!r2.loggedIn)
+    console.log("Not logged in. Run: nex auth");
+  else
+    console.log(`Logged in${r2.email ? ` as ${r2.email}` : ""} (${r2.source === "env" ? "NEXRALL_TOKEN" : "saved login"})`);
+  process.exit(r2.loggedIn ? 0 : 1);
+});
 program2.command("logout").description("Log out of your Nexrall account").action(logoutCommand);
 program2.command("doctor").description("Check Node, sign-in, network, terminal, MCP and storage, with a fix for each problem").option("-d, --dir <path>", "Project folder to check (default: current directory)").action(async (opts) => {
   const workDir = opts.dir ? path26.resolve(opts.dir) : process.cwd();
@@ -173115,7 +173611,7 @@ program2.command("sessions").description("List, export, import, or delete saved
   console.log(paint.dim("  nex sessions --events <id> [--json]       to follow its event stream"));
   console.log();
 });
-program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, --turbo", "Use Claude Sonnet 5.5 (fast)").option("-u, --ultra", "Use Claude Fable 5.1 (most powerful)").option("-y, --yolo", "Auto-approve all tool calls (no permission prompts)").option("-d, --dir <path>", "Set working directory (default: current directory)").option("-m, --model <name>", "Explicit model, e.g. claude-opus-5-5 | gpt-5.4 | gpt-4.1").option("-r, --resume [id]", "Resume last session, or a specific session id").option("-c, --continue", "Continue the latest conversation in this folder").option("--plan", "Start in plan mode (read-only; /mode or Shift+Tab can leave it)").option("--readonly", "Read-only for the whole session: plan mode that cannot be switched off").option("--auto", "Start in auto mode (the default \u2014 edits and commands run without asking)").option("--mode <mode>", "Starting permission mode: ask | edit | auto | plan").option("--fullscreen", "Draw the whole session on the terminal's alternate screen: the transcript re-wraps on resize and PgUp/PgDn page through it (no terminal scrollback while it is on; /fullscreen toggles it)").option("--bg", "Run the prompt in the background (headless); returns a job id. See: nex jobs | logs | attach | kill").option("--debug", "Write request timing, retries and errors to a debug log file").option("--no-color", "Disable colored output (also honours NO_COLOR)").option("-w, --worktree [name]", "Isolate this session in its own worktree \u2014 a separate directory (and, in a git repo, its own branch) so it can never overwrite files another session (or you) are touching in the main checkout. Omit a name for an auto-generated one; pass an existing name to resume that same worktree.").option("-e, --effort <level>", "Thinking effort \u2014 real levels depend on the model (e.g. DeepSeek: low|high|max, Qwen: low|high); run `nex --model <id>` then `/effort` with no argument to see a model's scale").option("--no-banner", "Skip the ASCII banner (useful in scripts/pipes)").option("--output-format <fmt>", "One-shot output format: text | json | stream-json (implies auto-approve)").option("--audit [path]", "Log every tool call (and refusal) to a JSONL trail (default: .nexrall/audit/<session>.jsonl)").option("--permission-mode <mode>", "Permission mode: ask | edit | auto | plan (also Claude Code names: default | acceptEdits | bypassPermissions). With --output-format, anything that would prompt is DENIED instead of auto-approved").option("--allowedTools, --allowed-tools <tools...>", 'Tools/rules to allow without asking, e.g. "Bash(git *)" Edit (comma or space separated; put the prompt BEFORE this flag)').option("--disallowedTools, --disallowed-tools <tools...>", 'Tools/rules to deny, e.g. "Bash(rm *)" (deny always wins)').option("--append-system-prompt <text>", "Extra instructions appended to the project brief for this run").option("--max-budget-usd <amount>", "Stop a one-shot run once it has spent this many dollars (needs --output-format)").option("--mcp-config <configs...>", 'Load MCP servers from JSON files or inline JSON ({"mcpServers":{\u2026}}) for this run').option("--strict-mcp-config", "With --mcp-config: use ONLY those servers, ignoring ~/.nexrall/mcp.json and the project one").option("--add-dir <dirs...>", "Extra directories the agent may read and edit besides the project folder").option("--input-format <format>", "text (default) | stream-json \u2014 read the prompt as Claude-Code-style NDJSON user messages on stdin").option("--json-schema <schema>", 'JSON Schema (inline or file) the final answer must satisfy; needs --output-format. Result gains "structured_output"; exit 3 if it does not validate').option("--no-session-persistence", "Do not save this run to disk (needs --output-format; it cannot be resumed)").argument("[prompt...]", "One-shot prompt \u2014 if omitted, starts interactive mode").action(async (promptParts, options) => {
+program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, --turbo", "Use Claude Sonnet 5.5 (fast)").option("-u, --ultra", "Use Claude Fable 5.1 (most powerful)").option("-y, --yolo", "Auto-approve all tool calls (no permission prompts)").option("-d, --dir <path>", "Set working directory (default: current directory)").option("-m, --model <name>", "Explicit model, e.g. claude-opus-5-5 | gpt-5.4 | gpt-4.1").option("-r, --resume [id]", "Resume last session, or a specific session id").option("-c, --continue", "Continue the latest conversation in this folder").option("--plan", "Start in plan mode (read-only; /mode or Shift+Tab can leave it)").option("--readonly", "Read-only for the whole session: plan mode that cannot be switched off").option("--auto", "Start in auto mode (the default \u2014 edits and commands run without asking)").option("--mode <mode>", "Starting permission mode: ask | edit | auto | plan").option("--fullscreen", "Draw the whole session on the terminal's alternate screen: the transcript re-wraps on resize and PgUp/PgDn page through it (no terminal scrollback while it is on; /fullscreen toggles it)").option("--bg", "Run the prompt in the background (headless); returns a job id. See: nex jobs | logs | attach | kill").option("--debug", "Write request timing, retries and errors to a debug log file").option("--no-color", "Disable colored output (also honours NO_COLOR)").option("-w, --worktree [name]", "Isolate this session in its own worktree \u2014 a separate directory (and, in a git repo, its own branch) so it can never overwrite files another session (or you) are touching in the main checkout. Omit a name for an auto-generated one; pass an existing name to resume that same worktree.").option("-e, --effort <level>", "Thinking effort \u2014 real levels depend on the model (e.g. DeepSeek: low|high|max, Qwen: low|high); run `nex --model <id>` then `/effort` with no argument to see a model's scale").option("--no-banner", "Skip the ASCII banner (useful in scripts/pipes)").option("--output-format <fmt>", "One-shot output format: text | json | stream-json (implies auto-approve)").option("--audit [path]", "Log every tool call (and refusal) to a JSONL trail (default: .nexrall/audit/<session>.jsonl)").option("--permission-mode <mode>", "Permission mode: ask | edit | auto | plan (also Claude Code names: default | acceptEdits | bypassPermissions). With --output-format, anything that would prompt is DENIED instead of auto-approved").option("--allowedTools, --allowed-tools <tools...>", 'Tools/rules to allow without asking, e.g. "Bash(git *)" Edit (comma or space separated; put the prompt BEFORE this flag)').option("--disallowedTools, --disallowed-tools <tools...>", 'Tools/rules to deny, e.g. "Bash(rm *)" (deny always wins)').option("--append-system-prompt <text>", "Extra instructions appended to the project brief for this run").option("--max-budget-usd <amount>", "Stop a one-shot run once it has spent this many dollars (needs --output-format)").option("--mcp-config <configs...>", 'Load MCP servers from JSON files or inline JSON ({"mcpServers":{\u2026}}) for this run').option("--strict-mcp-config", "With --mcp-config: use ONLY those servers, ignoring ~/.nexrall/mcp.json and the project one").option("--add-dir <dirs...>", "Extra directories the agent may read and edit besides the project folder").option("--input-format <format>", "text (default) | stream-json \u2014 read the prompt as Claude-Code-style NDJSON user messages on stdin").option("--json-schema <schema>", 'JSON Schema (inline or file) the final answer must satisfy; needs --output-format. Result gains "structured_output"; exit 3 if it does not validate').option("--no-session-persistence", "Do not save this run to disk (needs --output-format; it cannot be resumed)").option("--max-turns <n>", "Stop a headless run after N agent rounds (needs --output-format; exit 4 when it hits the limit)").option("--append-system-prompt-file <path>", "Like --append-system-prompt, read from a file").option("--system-prompt <text>", "REPLACE the project brief (nexrall.md + memory + global instructions) with this text for this run").option("--system-prompt-file <path>", "Like --system-prompt, read from a file").option("--verbose", "Print progress detail (tool calls, timings, usage) to stderr while a one-shot run works").option("--include-partial-messages", "Stream model deltas as they arrive (needs --output-format stream-json)").option("--replay-user-messages", "Echo each stdin message back on stdout as it is consumed (needs --input-format stream-json --output-format stream-json)").option("--agents <json-or-file>", 'Define extra sub-agents for this run: a JSON object { "name": { "description", "prompt", "tools", "model" } } or @file.json').option("--agent <name>", "Run this session AS that agent (its prompt, tools and model), from .nexrall/agents, a plugin, --agents or a builtin").option("--bare", "Start without discovery: no nexrall.md/memory, skills, plugins, hooks or MCP config files").option("--safe-mode", "Same as --bare (Claude Code's troubleshooting name)").option("--tools <list>", 'Exactly these built-in tools ("Bash,Read,Edit", "default", or "" for none); the rest are removed, not just unapproved').option("--session-id <id>", "Use this id for a NEW conversation (letters, digits, - _), so a script can find it again").option("-n, --name <name>", "Name the conversation; `nex -r <name>` resumes it by that name").option("--fork-session", "With --resume/--continue: branch into a new session instead of continuing the original").option("--fallback-model <name>", "If the main model is overloaded or unreachable, retry the turn once on this model (needs --output-format)").option("--settings <file|json>", "Settings (permissions, hooks\u2026) for this run only: a JSON file or an inline JSON object; merged over the user/project settings").option("--debug-file <path>", "Write the --debug diagnostics log to this file (implies --debug)").argument("[prompt...]", "One-shot prompt \u2014 if omitted, starts interactive mode").action(async (promptParts, options) => {
   if (!(0, import_code_core20.isAuthenticated)()) {
     console.error("Not logged in. Run: nex auth");
     process.exit(1);
@@ -173147,8 +173643,43 @@ program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, -
     console.error(sessErr);
     process.exit(1);
   }
+  let newSessionId;
+  let sessionName;
+  if (options.sessionId !== void 0) {
+    const r2 = parseSessionId(options.sessionId);
+    if (!r2.ok) {
+      console.error(r2.error);
+      process.exit(1);
+    }
+    newSessionId = r2.value;
+  }
+  if (options.name !== void 0) {
+    const r2 = parseSessionName(options.name);
+    if (!r2.ok) {
+      console.error(r2.error);
+      process.exit(1);
+    }
+    sessionName = r2.value;
+  }
+  const identErr = checkSessionIdentityFlags({ sessionId: newSessionId, resume: options.resume, continue: options.continue, fork: options.forkSession });
+  if (identErr) {
+    console.error(identErr);
+    process.exit(1);
+  }
+  if (newSessionId && loadSession(newSessionId) && !options.forkSession) {
+    console.error(`--session-id "${newSessionId}" already exists. Resume it with: nex --resume ${newSessionId}`);
+    process.exit(1);
+  }
   if (options.yolo || permBypass)
     setAutoApprove("all");
+  if (options.settings !== void 0) {
+    const st = parseSettingsArg(options.settings, process.cwd());
+    if (!st.ok) {
+      console.error(st.error);
+      process.exit(1);
+    }
+    (0, import_code_core21.setSessionSettings)(st.value);
+  }
   const allowRules = parseToolList(options.allowedTools);
   const denyRules = parseToolList(options.disallowedTools);
   (0, import_code_core21.setSessionRules)({ allow: allowRules, deny: denyRules });
@@ -173163,11 +173694,83 @@ program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, -
   }
   if (options.sessionPersistence === false)
     process.env.NEXRALL_EVENTS = "off";
-  const headlessErr = checkHeadlessOnly({ outputFormat: options.outputFormat, budget: budgetUsd, noSessionPersistence: options.sessionPersistence === false });
+  let maxTurns;
+  if (options.maxTurns !== void 0) {
+    const t2 = parseMaxTurns(options.maxTurns);
+    if (!t2.ok) {
+      console.error(t2.error);
+      process.exit(1);
+    }
+    maxTurns = t2.value;
+  }
+  const headlessErr = checkHeadlessOnly({ outputFormat: options.outputFormat, budget: budgetUsd, noSessionPersistence: options.sessionPersistence === false, maxTurns });
   if (headlessErr) {
     console.error(headlessErr);
     process.exit(1);
   }
+  const agentsParsed = parseAgentsArg(options.agents, process.cwd());
+  if (!agentsParsed.ok) {
+    console.error(agentsParsed.error);
+    process.exit(1);
+  }
+  const extraTypes = agentsParsed.value.map((a) => ({
+    name: a.name,
+    description: a.description,
+    prompt: a.prompt,
+    source: "programmatic",
+    ...a.tools ? { tools: a.tools } : {},
+    ...a.model ? { model: a.model } : {}
+  }));
+  if (options.agent && options.bare) {
+    console.error("--agent needs agent discovery, which --bare/--safe-mode turns off \u2014 drop one of them.");
+    process.exit(1);
+  }
+  let selectedAgent;
+  if (options.agent) {
+    const catalogue = (0, import_code_core21.loadAgentTypesWithWarnings)(process.cwd(), extraTypes).types;
+    selectedAgent = (0, import_code_core21.findAgentType)(catalogue, String(options.agent));
+    if (!selectedAgent) {
+      console.error(`Unknown agent "${options.agent}". Available: ${catalogue.map((t2) => t2.name).join(", ")}`);
+      process.exit(1);
+    }
+  }
+  const sysPrompt = resolveSystemPrompt({ text: typeof options.systemPrompt === "string" ? options.systemPrompt : void 0, file: options.systemPromptFile, cwd: process.cwd() });
+  if (!sysPrompt.ok) {
+    console.error(sysPrompt.error);
+    process.exit(1);
+  }
+  let appendSystemPrompt = options.appendSystemPrompt;
+  if (options.appendSystemPromptFile !== void 0) {
+    const f3 = readPromptFile(options.appendSystemPromptFile, process.cwd());
+    if (!f3.ok) {
+      console.error(f3.error);
+      process.exit(1);
+    }
+    appendSystemPrompt = [appendSystemPrompt, f3.value].filter(Boolean).join("\n\n");
+  }
+  let onlyTools;
+  if (options.tools !== void 0) {
+    const t2 = parseToolsFlag(options.tools === true ? "" : options.tools, (0, import_code_core21.knownToolNames)());
+    if (!t2.ok) {
+      console.error(t2.error);
+      process.exit(1);
+    }
+    onlyTools = t2.value;
+  }
+  let fallbackModel;
+  if (options.fallbackModel !== void 0) {
+    if (!options.outputFormat) {
+      console.error("--fallback-model only works with --output-format (a one-shot, non-interactive run).");
+      process.exit(1);
+    }
+    const f3 = parseFallbackModel(options.fallbackModel, model);
+    if (!f3.ok) {
+      console.error(f3.error);
+      process.exit(1);
+    }
+    fallbackModel = f3.value;
+  }
+  const debugFile = options.debugFile !== void 0 ? path26.resolve(String(options.debugFile)) : void 0;
   let mcpOverride;
   if (options.mcpConfig) {
     const m2 = parseMcpConfigs(options.mcpConfig, process.cwd());
@@ -173260,6 +173863,16 @@ program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, -
     }
     outputFormat = fmt;
   }
+  const partialErr = checkPartialMessages({ includePartial: !!options.includePartialMessages, outputFormat });
+  if (partialErr) {
+    console.error(partialErr);
+    process.exit(1);
+  }
+  const replayErr = checkReplayUserMessages({ replay: !!options.replayUserMessages, inputFormat: options.inputFormat, outputFormat });
+  if (replayErr) {
+    console.error(replayErr);
+    process.exit(1);
+  }
   const fsErr = checkFullscreenFlag({
     fullscreen: !!options.fullscreen,
     isTTY: !!process.stdout.isTTY,
@@ -173279,7 +173892,7 @@ program2.option("-p, --pro", "Use Claude Opus 5.5 (most capable)").option("-t, -
     }
     effort = lvl;
   }
-  await startChatSession({ model, workDir, prompt: prompt2, resume, continueLast: !!options.continue, initialMode: modeRes.mode, lockMode: modeRes.locked, debug: !!options.debug, stdinText, stdinFollowUps, showBanner, outputFormat, effort, audit: options.audit, worktree, fullscreen: !!options.fullscreen, strictPermissions: options.permissionMode !== void 0, budgetUsd, appendSystemPrompt: options.appendSystemPrompt, mcpOverride, strictMcp: !!options.strictMcpConfig, noSessionPersistence: options.sessionPersistence === false, addDirs: addDirs.value, jsonSchema });
+  await startChatSession({ model, workDir, prompt: prompt2, resume, continueLast: !!options.continue, initialMode: modeRes.mode, lockMode: modeRes.locked, debug: !!options.debug || debugFile !== void 0, debugFile, fallbackModel, maxTurns, onlyTools, newSessionId, sessionName, forkSession: !!options.forkSession, stdinText, stdinFollowUps, showBanner, outputFormat, effort, audit: options.audit, worktree, fullscreen: !!options.fullscreen, strictPermissions: options.permissionMode !== void 0, budgetUsd, appendSystemPrompt, mcpOverride, strictMcp: !!options.strictMcpConfig, systemPrompt: sysPrompt.value, verbose: !!options.verbose, includePartialMessages: !!options.includePartialMessages, agents: agentsParsed.value, selectedAgent: selectedAgent ? { name: selectedAgent.name, prompt: selectedAgent.prompt, tools: selectedAgent.tools, model: selectedAgent.model } : void 0, replayUserMessages: !!options.replayUserMessages, inputFormatWasStreamJson: options.inputFormat !== void 0 && String(options.inputFormat).toLowerCase() === "stream-json", bare: !!(options.bare || options.safeMode), noSessionPersistence: options.sessionPersistence === false, addDirs: addDirs.value, jsonSchema });
 });
 program2.parse();
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.161",
+  "version": "0.5.163",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",