agency-lang 0.7.0 → 0.7.2

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

@@ -6,21 +6,13 @@ import {
  } from "std::agency/local"
 import { parseArgs } from "std::args"
 import { map } from "std::array"
-import {
-  clearMessages,
-  pushMessage,
-  repl,
-  clearScreen,
-  clearHistory,
- } from "std::ui/cli"
 import { today } from "std::date"
 import { generateImage } from "std::image"
 import { applyAgentCwd, setAgentCwd } from "std::index"
+import { listHostedModels, hostedModelInfo, setLlmOptions } from "std::llm"
+import { setMemoryId, disableMemory } from "std::memory"
 import { keys } from "std::object"
 import { basename, dirname } from "std::path"
-import { box, render } from "std::ui/layout"
-import { listHostedModels, hostedModelInfo } from "std::llm"
-import { setMemoryId, disableMemory } from "std::memory"
 import {
   ScopedRuleFields,
   cliPolicyHandler,
@@ -31,15 +23,38 @@ import { exists } from "std::shell"
 import { commandsDir, expandSlash } from "std::skills"
 import { highlight } from "std::syntax"
 import { cwd, env, isTTY, readStdin, setTitle } from "std::system"
-import { Attachment, attachToReply, getCost, getModelCosts, image, systemMessage } from "std::thread"
+import {
+  Attachment,
+  attachToReply,
+  getCost,
+  getModelCosts,
+  image,
+  systemMessage,
+ } from "std::thread"
 import { chooseOption, ChoiceItem } from "std::ui"
+import {
+  clearMessages,
+  pushMessage,
+  repl,
+  clearScreen,
+  clearHistory,
+ } from "std::ui/cli"
+import { box, render } from "std::ui/layout"
 
 import { figs, title } from "./images/images.agency"
 import { detectAttachments, modalityFilter } from "./lib/attachments.agency"
-import { POLICY_PATH, HISTORY_PATH, ALWAYS_FIELDS } from "./lib/config.agency"
+import {
+  POLICY_PATH,
+  SESSION_POLICY_PATH,
+  HISTORY_PATH,
+  ALWAYS_FIELDS,
+ } from "./lib/config.agency"
 import {
   minimalAutoApprovePolicy,
   recommendedAutoApprovePolicy,
+  builtinPolicy,
+  builtinPolicyNames,
+  BUILTIN_POLICIES,
  } from "./lib/defaultPolicy.agency"
 import { filterHostedModels, ModelFilters } from "./lib/modelFilters.agency"
 import { parseModelFlag, knownProviders, Resolved } from "./lib/models.agency"
@@ -66,6 +81,7 @@ import {
   applyResolved,
   promoteAll,
   currentProvider,
+  resolveMaxToolCallRounds,
  } from "./shared.agency"
 import { codeAgent } from "./subagents/code.agency"
 import { explorerAgent } from "./subagents/explorer.agency"
@@ -128,6 +144,11 @@ let VERBOSE: boolean = false
 // scroll-output writes when stdout is destined for a Unix pipe.
 let _isInteractive: boolean = true
 
+// The `--policy` argument (a built-in name or a policy-file path), or ""
+// when the flag is absent. Set in main() before `setupSession` runs;
+// consumed there to override the saved policy for this run only.
+let _policyArg: string = ""
+
 // Live tool-call tracing. Always shown in the interactive REPL; in
 // one-shot mode it's suppressed so piped output is just the reply,
 // unless the user opts in with `--verbose` / `--debug` (AGENT_DEBUG).
@@ -856,7 +877,12 @@ export def generateImageFile(
   // writeBinary rejects an absolute filename when dir is set, so split
   // path into (dir, name); useAgentCwd resolves a relative dir against
   // the agent cwd (absolute dirs pass through untouched).
-  const written = writeBinary(basename(path), generated.value.base64, dirname(path), useAgentCwd: true)
+  const written = writeBinary(
+    basename(path),
+    generated.value.base64,
+    dirname(path),
+    useAgentCwd: true,
+  )
   if (isFailure(written)) {
     return "Generated the image, but saving to ${path} failed: ${written.error}"
   }
@@ -921,7 +947,9 @@ export def agentReplyVia(target: string, userMsg: string): string {
   // every attach and every skip prints a visible line.
   const detected = modalityFilter(detectAttachments(expanded))
   for (skippedFile in detected.skipped) {
-    pushMessage(color.yellow("📎 skipped ${skippedFile.label} (${skippedFile.reason})"))
+    pushMessage(
+      color.yellow("📎 skipped ${skippedFile.label} (${skippedFile.reason})"),
+    )
   }
   if (detected.attached.length == 0) {
     // Deliberate special case: a text-only turn stays a bare string. A
@@ -993,6 +1021,21 @@ def printHeader() {
   print(render(data, color: true))
 }
 
+// Print `--policy` usage and list the built-in policies (name + one-line
+// description). Shown when `--policy` is passed with no value.
+def printPolicyHelp() {
+  print(color.bold("Usage: agency agent --policy <name | path>"))
+  print(
+    "Select the approval policy for this run: a built-in name below, or a path to a policy JSON file.",
+  )
+  print("")
+  print(color.bold("Built-in policies:"))
+  for (p in BUILTIN_POLICIES) {
+    print("  ${color.cyan(p.name)}")
+    print("      ${p.description}")
+  }
+}
+
 def givePolicyChoice() {
   const title = "Welcome to the agency agent. Please pick a policy to start."
   const body = "Don't worry, you can change this later. The policy just controls how the agent asks for your approval when it wants to do something. You can also create your own custom policy file at ${POLICY_PATH} and the agent will use it automatically."
@@ -1034,25 +1077,66 @@ def setupSession(interactive: boolean): any {
   const projectContext = loadAgentsMd(cwd()) with approve
   _context = "\n\nCurrent date: ${today()}\nCurrent working directory: ${cwd()}${projectContext}"
 
-  const policy = parsePolicyFile(POLICY_PATH)
-  if (policy is failure(f)) {
-    if (f.status == "doesnt-exist") {
-      if (interactive) {
-        print(color.yellow("No existing policy found at ${POLICY_PATH}."))
-        setPolicy(POLICY_PATH, givePolicyChoice())
+  // Which file the handler persists against, and an optional in-memory
+  // policy to start from. Normally the user's saved policy loaded from
+  // POLICY_PATH; a `--policy` override redirects this (see below) so the
+  // saved policy is never read or written.
+  let policyFile = POLICY_PATH
+  let sessionPolicy: any = null
+
+  if (_policyArg != "") {
+    // `--policy` override: a built-in name or a path to a policy file.
+    // The cwd-scoped built-ins pin the launch directory, so we resolve
+    // them against `cwd()` (what `setAgentCwd` just stored, and what the
+    // write/git/bash interrupts resolve their default paths back to).
+    const builtin = builtinPolicy(_policyArg, cwd())
+    if (builtin != null) {
+      // Hand the policy to the handler in memory (no disk write): a
+      // one-off, cwd-scoped override must not clobber the saved policy
+      // or leak into a later run from a different directory. Any new
+      // interactive "always" decision persists to the session file.
+      policyFile = SESSION_POLICY_PATH
+      sessionPolicy = builtin
+    } else {
+      // Not a built-in name — treat it as a policy file path and use it
+      // directly (the handler loads/persists it). Validate up front so a
+      // typo fails fast instead of silently starting from empty.
+      const loaded = parsePolicyFile(_policyArg)
+      if (loaded is failure(f)) {
+        print(
+          color.red(
+          "--policy '${_policyArg}' is neither a built-in policy (${builtinPolicyNames().join(", ")}) nor a readable policy file (${f.status}).",
+        ),
+        )
+        process.exit(1)
+      }
+      policyFile = _policyArg
+    }
+  } else {
+    const policy = parsePolicyFile(POLICY_PATH)
+    if (policy is failure(f)) {
+      if (f.status == "doesnt-exist") {
+        if (interactive) {
+          print(color.yellow("No existing policy found at ${POLICY_PATH}."))
+          setPolicy(POLICY_PATH, givePolicyChoice())
+        } else {
+          setPolicy(POLICY_PATH, recommendedAutoApprovePolicy)
+        }
       } else {
-        setPolicy(POLICY_PATH, recommendedAutoApprovePolicy)
+        print(color.red("Failed to load policy: ${JSON.stringify(f.error)}"))
+        process.exit(1)
       }
     } else {
-      print(color.red("Failed to load policy: ${JSON.stringify(f.error)}"))
-      process.exit(1)
+      setPolicy(POLICY_PATH, policy.value)
     }
-  } else {
-    setPolicy(POLICY_PATH, policy.value)
   }
   // Bind the handler to a local var so `with handler` parses (the
   // `with` clause only accepts an identifier, not a call expression).
-  return cliPolicyHandler(file: POLICY_PATH, fields: ALWAYS_FIELDS)
+  return cliPolicyHandler(
+    file: policyFile,
+    fields: ALWAYS_FIELDS,
+    policy: sessionPolicy,
+  )
 }
 
 // One-shot entry: run a single turn through the same `mainAgent` the
@@ -1170,6 +1254,11 @@ node main() {
         type: "string",
         description: "Route the starting prompt to a named subagent: code, research, oracle, explorer, review (default: coordinator)"
       },
+      policy: {
+        type: "string",
+        optional: true,
+        description: "Approval policy for this run: a built-in name (minimal, recommended, with-writes, with-bash) or a path to a policy JSON file. with-writes/with-bash auto-approve writes (and, for with-bash, shell) scoped to the current directory and its children. Overrides the saved policy without persisting it. Pass --policy with no value to list the built-in policies."
+      },
       local: {
         type: "string",
         optional: true,
@@ -1179,17 +1268,48 @@ node main() {
         type: "string",
         optional: true,
         description: "Deprecated alias for --local."
+      },
+      trace: {
+        type: "string",
+        optional: true,
+        description: "Write an execution trace to this file for debugging (bare --trace writes <runId>.agencytrace in the current directory)"
+      },
+      "log-file": {
+        type: "string",
+        description: "Append structured statelog events (one JSON object per line) to this file for debugging"
+      },
+      "max-tool-call-rounds": {
+        type: "number",
+        description: "Max LLM tool-call rounds before a tool loop halts (default 10 interactive, 50 in one-shot/-p mode)"
+      },
+      "max-tool-result-chars": {
+        type: "number",
+        description: "Max chars of a single tool result fed back to the model (0 disables; default 100000)"
       }
     }
   },
   )
 
+  // NOTE: --trace / --log-file are declared here only for --help and so
+  // parseArgs accepts them. runBundledAgent extracts them from the forwarded
+  // args and passes them to this process as the AGENCY_CONFIG_OVERRIDES env
+  // var, read when the RuntimeContext is constructed — before this main() runs.
+  // Do not re-handle them here.
+
   if (args.flags.debug) {
     AGENT_DEBUG = true
   }
   if (args.flags.verbose) {
     VERBOSE = true
   }
+  // `--policy` is an optional-value flag: a bare `--policy` (no name or
+  // path) prints the usage + the built-in policies and exits, rather than
+  // silently doing nothing.
+  if (args.flags.policy == "") {
+    printPolicyHelp()
+    process.exit(0)
+  }
+  _policyArg = args.flags.policy ?? ""
 
   // Model setup. `--local` (deprecated alias: `--local-model`) is an optional-
   // value flag with three states: absent (null); bare empty-string for guided
@@ -1292,6 +1412,28 @@ node main() {
   const startAgent = args.flags.agent ?? ""
   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 runningOneShot = !seededInteractive && (args.flags.print || hasQuery || !isTTY())
+
+  // Tool-loop caps. One-shot runs (--print / piped / a positional query) have
+  // no REPL to continue an autonomous task, so maxToolCallRounds defaults
+  // higher (resolveMaxToolCallRounds); an explicit --max-tool-call-rounds always
+  // wins. Set as branch-scoped defaults on the root branch BEFORE any subagent
+  // is dispatched, so every (fork-seeded) subagent inherits them. setLlmOptions
+  // merges only present keys, so this never clobbers the model defaults above.
+  // Separate calls, each gated on its own value: setLlmOptions only skips
+  // `undefined`, not `null`, so passing an absent key would clobber the bag.
+  const maxRounds = resolveMaxToolCallRounds(args.flags["max-tool-call-rounds"] ?? null, runningOneShot)
+  if (maxRounds != null) {
+    setLlmOptions({ maxToolCallRounds: maxRounds })
+  }
+  const maxResultChars = args.flags["max-tool-result-chars"]
+  if (maxResultChars != null) {
+    setLlmOptions({ maxToolResultChars: maxResultChars })
+  }
+
   // Validate the target subagent name up front (empty = coordinator).
   if (startAgent != "" && !START_AGENTS.includes(startAgent)) {
     print(
@@ -1308,7 +1450,7 @@ node main() {
   // and exit with no REPL. Without a TTY (or with `--print`) we fall
   // through to one-shot below; `--interactive` with no prompt falls through
   // to the plain REPL.
-  if (wantInteractive && hasQuery && isTTY() && !args.flags.print) {
+  if (seededInteractive) {
     setTitle("Agency Agent")
     clearScreen()
     printHeader()
@@ -1352,4 +1494,3 @@ node main() {
   const handler = setupSession(true)
   startInteractive(handler, "", "")
 }
-