agency-lang 0.17.0 → 0.18.0

package/dist/lib/agents/agency-agent/agent.agency

@@ -4,20 +4,18 @@ import { setLlmOptions } from "std::llm"
 import { evalOutput, evalValue, setAgentName } from "std::statelog"
 import { cwd, env, isTTY, readStdin, setTitle } from "std::system"
 import { getCost } from "std::thread"
-import {
-  clearMessages,
-  pushMessage,
-  repl,
-  clearScreen,
- } from "std::ui/cli"
+import { setSlashPalette } from "std::ui/cli"
+import { clearMessages, pushMessage, repl, clearScreen } from "std::ui/cli"
 
-import { brainByName, allBrains, brainFlagHelp } from "./brains/registry.agency"
+import { brainByName, allBrains } from "./brains/registry.agency"
 import { agentNameFor } from "./lib/agentName.agency"
 import { parseAgentArgs } from "./lib/args.agency"
+import { mergedPalette } from "./lib/commandPalette.agency"
 import { getHeader } from "./lib/header.agency"
 import { maybeLoadMcp } from "./lib/mcp.agency"
 import { printPolicyHelp } from "./lib/policy.agency"
-import { startInteractive } from "./lib/repl.agency"
+import { installSessionHooks, startInteractive } from "./lib/repl.agency"
+import { chooseSession, startSession } from "./lib/resume.agency"
 import { pickModelsForAgent, maybeEnableMemory } from "./lib/session.agency"
 import { loadSettings } from "./lib/settings.agency"
 import { setDebug, setVerbose, setInteractive } from "./lib/trace.agency"
@@ -32,7 +30,6 @@ import {
 import { formatTurnFailure } from "./lib/utils.agency"
 import { resolveMaxToolCallRounds, getCapabilities } from "./shared.agency"
 
-
 // UI mode select — one-line swap between the alt-screen TUI and the
 // line-mode REPL. Both modules expose the same `repl` / `pushMessage`
 // / `clearMessages` surface (line mode re-exports `pushMessage` and
@@ -69,7 +66,7 @@ It means that agent starts with an initial prompt already there to respond to. *
 node main() {
   // Parse CLI flags first — `parseArgs` exits on --help / --version /
   // usage errors, before any handlers or the TUI are installed.
-  const args = parseAgentArgs(brainFlagHelp())
+  const args = parseAgentArgs()
 
   // NOTE: --trace / --log / --agent-home are declared here only for
   // --help and so parseArgs accepts them. runBundledAgent extracts them from
@@ -91,7 +88,11 @@ node main() {
     printPolicyHelp()
     process.exit(0)
   }
-  setPolicyArg(args.flags.policy ?? "")
+  setPolicyArg(
+    args.flags.policy ?? "",
+    approve: args.flags.approve ?? "",
+    reject: args.flags.reject ?? "",
+  )
 
   const brainName = resolveBrainName(args.flags.brain ?? null, loadSettings())
   const brain = brainByName(brainName)
@@ -102,6 +103,19 @@ node main() {
     return
   }
   setBrain(brain)
+
+  // Positional args (everything after flags) are joined with spaces to
+  // form the starting prompt. `--` ends flag parsing if a positional
+  // would otherwise look like a flag.
+  const positionalQuery = args.positionals.join(" ")
+  const hasQuery = positionalQuery != ""
+  const wantInteractive = args.flags.interactive
+
+  // Seeded interactive: run the prompt as the first turn, then hand over the
+  // REPL (needs a TTY + query, and not --print). Everything else is one-shot.
+  const seededInteractive = wantInteractive && hasQuery && isTTY() && !args.flags.print
+  const isOneShot = !seededInteractive && (args.flags.print || hasQuery || !isTTY())
+
   // Group this trace under its brain wherever runs are compared.
   setAgentName(agentNameFor(brain))
 
@@ -111,7 +125,11 @@ node main() {
   let startAgent = ""
   if (resolvedStartTarget == null) {
     const validTargets = ["main", ...brain.startTargets].join(", ")
-    print(color.red("Unknown --agent value: ${requestedStartTarget}. Valid for the ${brain.name} brain: ${validTargets}"))
+    print(
+      color.red(
+        "Unknown --agent value: ${requestedStartTarget}. Valid for the ${brain.name} brain: ${validTargets}",
+      ),
+    )
     process.exit(1)
     return
   } else {
@@ -128,28 +146,13 @@ node main() {
   // coordinator. Must run before the first turn (mcpTools ordering contract).
   maybeLoadMcp(loadSettings())
 
-  // Positional args (everything after flags) are joined with spaces to
-  // form the starting prompt. `--` ends flag parsing if a positional
-  // would otherwise look like a flag.
-  const positionalQuery = args.positionals.join(" ")
-  const hasQuery = positionalQuery != ""
-
-  const wantInteractive = args.flags.interactive
-
-  // Seeded interactive: run the prompt as the first turn, then hand over the
-  // REPL (needs a TTY + query, and not --print). Everything else is one-shot.
-  const seededInteractive = wantInteractive && hasQuery && isTTY() && !args.flags.print
-  const isOneShot = !seededInteractive && (args.flags.print || hasQuery || !isTTY())
-
   const maxRounds = resolveMaxToolCallRounds(
     args.flags["max-tool-call-rounds"] ?? null,
     isOneShot,
   )
-  if (maxRounds != null) {
-    setLlmOptions({
-      maxToolCallRounds: maxRounds
-    })
-  }
+  setLlmOptions({
+    maxToolCallRounds: maxRounds
+  })
   const maxResultChars = args.flags["max-tool-result-chars"]
   if (maxResultChars != null) {
     setLlmOptions({
@@ -166,6 +169,31 @@ node main() {
 
   setAgentCwd(cwd())
 
+  // Interactive runs are saved per turn, and a resumed one restores its
+  // checkpoint here, after the setup above and before the session starts.
+  // One-shot runs are not saved, so a resume flag on one is a mistake
+  // rather than something to ignore.
+  if (isOneShot && (args.flags.continue || args.flags.resume != null)) {
+    print(
+      color.red(
+        "--continue and --resume need an interactive session; one-shot runs are not saved.",
+      ),
+    )
+    process.exit(1)
+  }
+  // Everything above is process-level: model resolution feeds the memory
+  // layer, and memory, MCP, and the settings reads behind them must run
+  // before the policy handler exists or they prompt. A restore keeps
+  // those TypeScript-side effects and replaces only the Agency state.
+  if (!isOneShot) {
+    installSessionHooks()
+    setSlashPalette(mergedPalette())
+    startSession(
+      chooseSession(args.flags.continue, args.flags.resume ?? null),
+      brain,
+    )
+  }
+
   if (isOneShot) {
     let prompt = positionalQuery
     if (!hasQuery) {