fascicle 0.16.3 → 0.16.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import { D as describe, O as is_step } from "./core-CErsxGF6.js";
1
+ import { D as describe, O as is_step } from "./core-BOFcG3tp.js";
2
2
  import { createRequire } from "node:module";
3
3
  import { resolve } from "node:path";
4
4
  import { fileURLToPath, pathToFileURL } from "node:url";
@@ -10,7 +10,7 @@ import { parseArgs } from "node:util";
10
10
  * fascicle-diagram <module> print the diagram of the module's `flow`
11
11
  * fascicle-diagram <module> --export <name> read another export instead
12
12
  *
13
- * Flags: --export <name> --width <n> --prefix <text> --replays --help
13
+ * Flags: --export <name> --width <n> --prefix <text> --replays --internals --help
14
14
  *
15
15
  * The export is a Step, or a function that builds one with no arguments,
16
16
  * which is where an app wires its flow to stub dependencies so that drawing
@@ -37,6 +37,7 @@ Options:
37
37
  --width <n> wrap descriptions so no line runs wider than n
38
38
  --prefix <text> start every line with text, for example ' * '
39
39
  --replays mark the steps a resumed run would pay for again
40
+ --internals draw a named composite's internal steps, not only its parts
40
41
  --help show this message
41
42
  `;
42
43
  /**
@@ -121,6 +122,7 @@ function parse(argv) {
121
122
  }
122
123
  if (values.prefix !== void 0) options.prefix = values.prefix;
123
124
  if (values.replays === true) options.replays = true;
125
+ if (values.internals === true) options.internals = true;
124
126
  return {
125
127
  kind: "run",
126
128
  args: {
@@ -143,6 +145,7 @@ function parse_flags(argv) {
143
145
  width: { type: "string" },
144
146
  prefix: { type: "string" },
145
147
  replays: { type: "boolean" },
148
+ internals: { type: "boolean" },
146
149
  help: { type: "boolean" }
147
150
  }
148
151
  });
@@ -1 +1 @@
1
- {"version":3,"file":"diagram_bin.js","names":[],"sources":["../src/diagram_cli.ts","../src/diagram_bin.ts"],"sourcesContent":["/**\n * fascicle-diagram CLI.\n *\n * fascicle-diagram <module> print the diagram of the module's `flow`\n * fascicle-diagram <module> --export <name> read another export instead\n *\n * Flags: --export <name> --width <n> --prefix <text> --replays --help\n *\n * The export is a Step, or a function that builds one with no arguments,\n * which is where an app wires its flow to stub dependencies so that drawing\n * it needs no credentials. The diagram is `describe.diagram` of that Step, so\n * it is what the code builds today and can be compared with the header in\n * `flow.ts` at a glance.\n *\n * This file holds every decision the command makes and touches nothing of\n * the process: output and module loading arrive through `DiagramCliIo`.\n * diagram_bin.ts binds that io to the real streams and to the project's\n * `tsx`, and is the entry that the package's bin shim runs.\n */\n\nimport { resolve } from 'node:path'\nimport { parseArgs } from 'node:util'\nimport { describe, is_step } from '#core'\nimport type { DiagramOptions } from '#core'\n\nexport type DiagramCliIo = {\n readonly out: (text: string) => void\n readonly err: (text: string) => void\n /** Import the module at an absolute path and return its exports. */\n readonly load: (path: string) => Promise<Readonly<Record<string, unknown>>>\n}\n\ntype CliArgs = {\n readonly module: string\n readonly export_name: string\n readonly options: DiagramOptions\n}\n\ntype Parsed =\n | { readonly kind: 'help' }\n | { readonly kind: 'usage'; readonly message: string }\n | { readonly kind: 'run'; readonly args: CliArgs }\n\nconst HELP = `\\\nfascicle-diagram prints a flow as an annotated box-drawing tree.\n\nUsage:\n fascicle-diagram <module> draw the module's \\`flow\\` export\n fascicle-diagram <module> --export <name> draw another export instead\n\nThe export is a Step, or a function that builds one with no arguments.\n\nOptions:\n --export <name> the export to draw (default flow)\n --width <n> wrap descriptions so no line runs wider than n\n --prefix <text> start every line with text, for example ' * '\n --replays mark the steps a resumed run would pay for again\n --help show this message\n`\n\n\n/**\n * Run the CLI over `argv` and resolve to its exit code: 0 once the diagram is\n * printed, 1 when the module cannot be loaded or holds no Step, and 2 for a\n * usage error. Output and loading go through `io`, so the caller owns the\n * process.\n */\nexport async function run_diagram_cli(argv: readonly string[], io: DiagramCliIo): Promise<number> {\n const parsed = parse(argv)\n if (parsed.kind === 'help') {\n io.out(HELP)\n return 0\n }\n if (parsed.kind === 'usage') {\n io.err(`fascicle-diagram: ${parsed.message}\\n\\n${HELP}`)\n return 2\n }\n const { module, export_name, options } = parsed.args\n const path = resolve(module)\n let exports: Readonly<Record<string, unknown>>\n try {\n exports = await io.load(path)\n } catch (err) {\n io.err(`fascicle-diagram: could not load ${module}: ${message_of(err)}\\n`)\n return 1\n }\n if (!Object.hasOwn(exports, export_name)) {\n const names = Object.keys(exports).join(', ') || 'nothing'\n io.err(\n `fascicle-diagram: ${module} has no export named ${export_name}: pass --export <name> (it exports ${names})\\n`,\n )\n return 1\n }\n let flow: unknown\n try {\n flow = await build(exports[export_name])\n } catch (err) {\n io.err(\n `fascicle-diagram: calling ${export_name}() in ${module} threw: ${message_of(err)}\\n` +\n 'Export a function that builds the flow with no arguments, wired to stub dependencies.\\n',\n )\n return 1\n }\n if (!is_step(flow)) {\n io.err(\n `fascicle-diagram: ${export_name} in ${module} is not a Step: export the flow itself, or a function that builds it with no arguments\\n`,\n )\n return 1\n }\n io.out(`${describe.diagram(flow, options)}\\n`)\n return 0\n}\n\n/**\n * Parse argv into a run request, a help request, or a usage error. Unknown\n * flags and a missing module are usage errors, and so is a width that is not\n * a positive integer.\n */\nfunction parse(argv: readonly string[]): Parsed {\n let parsed: ReturnType<typeof parse_flags>\n try {\n parsed = parse_flags(argv)\n } catch (err) {\n return { kind: 'usage', message: message_of(err) }\n }\n const { values, positionals } = parsed\n if (values.help === true) return { kind: 'help' }\n const [module, ...extra] = positionals\n if (module === undefined) return { kind: 'usage', message: 'a <module> to draw is required' }\n if (extra.length > 0) return { kind: 'usage', message: `expected one <module>, got ${positionals.join(' ')}` }\n const options: { width?: number; prefix?: string; replays?: boolean } = {}\n if (values.width !== undefined) {\n const width = Number(values.width)\n if (!Number.isInteger(width) || width <= 0) {\n return { kind: 'usage', message: `invalid --width '${values.width}': expected a positive integer` }\n }\n options.width = width\n }\n if (values.prefix !== undefined) options.prefix = values.prefix\n if (values.replays === true) options.replays = true\n return { kind: 'run', args: { module, export_name: values.export ?? 'flow', options } }\n}\n\n/**\n * Read the CLI's flags with `node:util`'s strict parser, which throws on a\n * flag it does not know.\n */\nfunction parse_flags(argv: readonly string[]) {\n return parseArgs({\n args: [...argv],\n allowPositionals: true,\n options: {\n export: { type: 'string' },\n width: { type: 'string' },\n prefix: { type: 'string' },\n replays: { type: 'boolean' },\n help: { type: 'boolean' },\n },\n })\n}\n\n/**\n * The Step an export stands for: the export itself, or what calling it with\n * no arguments returns (awaited, so an async builder works too).\n */\nasync function build(value: unknown): Promise<unknown> {\n return typeof value === 'function' ? await value() : value\n}\n\n/**\n * Render a thrown value as its message.\n */\nfunction message_of(err: unknown): string {\n return err instanceof Error ? err.message : String(err)\n}\n","/**\n * The process side of the fascicle-diagram bin: the real streams, and module\n * loading through the project's own `tsx`.\n *\n * Every decision the command makes lives in diagram_cli.ts, which is unit\n * tested through an injected io. This file only binds that io to the process,\n * so it is exercised by spawning it (__tests__/diagram_bin.test.ts) and kept\n * out of mutation testing, which cannot see a spawned child's coverage.\n *\n * A TypeScript module loads through `tsx` because Node's built-in type\n * stripping cannot follow the `./flow.js` specifiers that point at `.ts`\n * files under NodeNext resolution. Anything else, or a project without\n * `tsx`, goes through a plain `import()`.\n */\n\nimport { createRequire } from 'node:module'\nimport { resolve } from 'node:path'\nimport { fileURLToPath, pathToFileURL } from 'node:url'\nimport { run_diagram_cli } from './diagram_cli.js'\n\nconst TS_MODULE = /\\.[cm]?tsx?$/\n\n/**\n * Run the fascicle-diagram command over `argv` against the real process, and\n * leave its exit code on `process.exitCode`. A reader that closes the pipe\n * early (`| head`) ends the output quietly instead of crashing the command on\n * an unhandled EPIPE.\n */\nexport async function run_diagram_bin(argv: readonly string[]): Promise<void> {\n process.stdout.once('error', (err: NodeJS.ErrnoException) => {\n if (err.code !== 'EPIPE') throw err\n })\n process.exitCode = await run_diagram_cli(argv, {\n out: (text) => process.stdout.write(text),\n err: (text) => process.stderr.write(text),\n load: load_module,\n })\n}\n\n/**\n * Import the module at `path`. A TypeScript module goes through the `tsx`\n * that the project installs, looked up from the module's own directory and\n * then from the working directory. Everything else is a plain dynamic import.\n */\nasync function load_module(path: string): Promise<Readonly<Record<string, unknown>>> {\n const url = pathToFileURL(path).href\n if (!TS_MODULE.test(path)) return as_record(await import(url))\n const tsx = find_tsx([path, resolve('package.json')])\n if (tsx === undefined) return import_without_tsx(url)\n const api: unknown = await import(pathToFileURL(tsx).href)\n const ts_import = as_record(api)['tsImport']\n if (typeof ts_import !== 'function') return as_record(await import(url))\n return as_record(await ts_import(url, import.meta.url))\n}\n\n/**\n * Import a TypeScript module with Node's own type stripping, which handles\n * only erasable syntax and specifiers that name real files. A failure says\n * that tsx is the fix, since this path is taken only when none was found.\n */\nasync function import_without_tsx(url: string): Promise<Readonly<Record<string, unknown>>> {\n try {\n return as_record(await import(url))\n } catch (err) {\n const reason = err instanceof Error ? err.message : String(err)\n throw new Error(`${reason} (no tsx was found to load TypeScript: install it with pnpm add -D tsx)`, {\n cause: err,\n })\n }\n}\n\n/**\n * Resolve tsx's programmatic API from the first of `origins` that can see it,\n * or `undefined` when none can.\n */\nfunction find_tsx(origins: readonly string[]): string | undefined {\n for (const origin of origins) {\n try {\n return createRequire(origin).resolve('tsx/esm/api')\n } catch {\n // Not installed where this origin looks; try the next one.\n }\n }\n return undefined\n}\n\n/**\n * View a loaded module namespace as a record of its exports.\n */\nfunction as_record(value: unknown): Readonly<Record<string, unknown>> {\n return typeof value === 'object' && value !== null ? { ...value } : {}\n}\n\n// Auto-run only when this file is the entry script (`tsx src/diagram_bin.ts`),\n// never when the bundle that contains it is imported. The path comparison is\n// the same guard the viewer CLI uses.\nconst invoked_directly =\n process.argv[1] !== undefined && process.argv[1] === fileURLToPath(import.meta.url)\n\nif (invoked_directly) void run_diagram_bin(process.argv.slice(2))\n"],"mappings":"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"}
1
+ {"version":3,"file":"diagram_bin.js","names":[],"sources":["../src/diagram_cli.ts","../src/diagram_bin.ts"],"sourcesContent":["/**\n * fascicle-diagram CLI.\n *\n * fascicle-diagram <module> print the diagram of the module's `flow`\n * fascicle-diagram <module> --export <name> read another export instead\n *\n * Flags: --export <name> --width <n> --prefix <text> --replays --internals --help\n *\n * The export is a Step, or a function that builds one with no arguments,\n * which is where an app wires its flow to stub dependencies so that drawing\n * it needs no credentials. The diagram is `describe.diagram` of that Step, so\n * it is what the code builds today and can be compared with the header in\n * `flow.ts` at a glance.\n *\n * This file holds every decision the command makes and touches nothing of\n * the process: output and module loading arrive through `DiagramCliIo`.\n * diagram_bin.ts binds that io to the real streams and to the project's\n * `tsx`, and is the entry that the package's bin shim runs.\n */\n\nimport { resolve } from 'node:path'\nimport { parseArgs } from 'node:util'\nimport { describe, is_step } from '#core'\nimport type { DiagramOptions } from '#core'\n\nexport type DiagramCliIo = {\n readonly out: (text: string) => void\n readonly err: (text: string) => void\n /** Import the module at an absolute path and return its exports. */\n readonly load: (path: string) => Promise<Readonly<Record<string, unknown>>>\n}\n\ntype CliArgs = {\n readonly module: string\n readonly export_name: string\n readonly options: DiagramOptions\n}\n\ntype Parsed =\n | { readonly kind: 'help' }\n | { readonly kind: 'usage'; readonly message: string }\n | { readonly kind: 'run'; readonly args: CliArgs }\n\nconst HELP = `\\\nfascicle-diagram prints a flow as an annotated box-drawing tree.\n\nUsage:\n fascicle-diagram <module> draw the module's \\`flow\\` export\n fascicle-diagram <module> --export <name> draw another export instead\n\nThe export is a Step, or a function that builds one with no arguments.\n\nOptions:\n --export <name> the export to draw (default flow)\n --width <n> wrap descriptions so no line runs wider than n\n --prefix <text> start every line with text, for example ' * '\n --replays mark the steps a resumed run would pay for again\n --internals draw a named composite's internal steps, not only its parts\n --help show this message\n`\n\n\n/**\n * Run the CLI over `argv` and resolve to its exit code: 0 once the diagram is\n * printed, 1 when the module cannot be loaded or holds no Step, and 2 for a\n * usage error. Output and loading go through `io`, so the caller owns the\n * process.\n */\nexport async function run_diagram_cli(argv: readonly string[], io: DiagramCliIo): Promise<number> {\n const parsed = parse(argv)\n if (parsed.kind === 'help') {\n io.out(HELP)\n return 0\n }\n if (parsed.kind === 'usage') {\n io.err(`fascicle-diagram: ${parsed.message}\\n\\n${HELP}`)\n return 2\n }\n const { module, export_name, options } = parsed.args\n const path = resolve(module)\n let exports: Readonly<Record<string, unknown>>\n try {\n exports = await io.load(path)\n } catch (err) {\n io.err(`fascicle-diagram: could not load ${module}: ${message_of(err)}\\n`)\n return 1\n }\n if (!Object.hasOwn(exports, export_name)) {\n const names = Object.keys(exports).join(', ') || 'nothing'\n io.err(\n `fascicle-diagram: ${module} has no export named ${export_name}: pass --export <name> (it exports ${names})\\n`,\n )\n return 1\n }\n let flow: unknown\n try {\n flow = await build(exports[export_name])\n } catch (err) {\n io.err(\n `fascicle-diagram: calling ${export_name}() in ${module} threw: ${message_of(err)}\\n` +\n 'Export a function that builds the flow with no arguments, wired to stub dependencies.\\n',\n )\n return 1\n }\n if (!is_step(flow)) {\n io.err(\n `fascicle-diagram: ${export_name} in ${module} is not a Step: export the flow itself, or a function that builds it with no arguments\\n`,\n )\n return 1\n }\n io.out(`${describe.diagram(flow, options)}\\n`)\n return 0\n}\n\n/**\n * Parse argv into a run request, a help request, or a usage error. Unknown\n * flags and a missing module are usage errors, and so is a width that is not\n * a positive integer.\n */\nfunction parse(argv: readonly string[]): Parsed {\n let parsed: ReturnType<typeof parse_flags>\n try {\n parsed = parse_flags(argv)\n } catch (err) {\n return { kind: 'usage', message: message_of(err) }\n }\n const { values, positionals } = parsed\n if (values.help === true) return { kind: 'help' }\n const [module, ...extra] = positionals\n if (module === undefined) return { kind: 'usage', message: 'a <module> to draw is required' }\n if (extra.length > 0) return { kind: 'usage', message: `expected one <module>, got ${positionals.join(' ')}` }\n const options: { width?: number; prefix?: string; replays?: boolean; internals?: boolean } = {}\n if (values.width !== undefined) {\n const width = Number(values.width)\n if (!Number.isInteger(width) || width <= 0) {\n return { kind: 'usage', message: `invalid --width '${values.width}': expected a positive integer` }\n }\n options.width = width\n }\n if (values.prefix !== undefined) options.prefix = values.prefix\n if (values.replays === true) options.replays = true\n if (values.internals === true) options.internals = true\n return { kind: 'run', args: { module, export_name: values.export ?? 'flow', options } }\n}\n\n/**\n * Read the CLI's flags with `node:util`'s strict parser, which throws on a\n * flag it does not know.\n */\nfunction parse_flags(argv: readonly string[]) {\n return parseArgs({\n args: [...argv],\n allowPositionals: true,\n options: {\n export: { type: 'string' },\n width: { type: 'string' },\n prefix: { type: 'string' },\n replays: { type: 'boolean' },\n internals: { type: 'boolean' },\n help: { type: 'boolean' },\n },\n })\n}\n\n/**\n * The Step an export stands for: the export itself, or what calling it with\n * no arguments returns (awaited, so an async builder works too).\n */\nasync function build(value: unknown): Promise<unknown> {\n return typeof value === 'function' ? await value() : value\n}\n\n/**\n * Render a thrown value as its message.\n */\nfunction message_of(err: unknown): string {\n return err instanceof Error ? err.message : String(err)\n}\n","/**\n * The process side of the fascicle-diagram bin: the real streams, and module\n * loading through the project's own `tsx`.\n *\n * Every decision the command makes lives in diagram_cli.ts, which is unit\n * tested through an injected io. This file only binds that io to the process,\n * so it is exercised by spawning it (__tests__/diagram_bin.test.ts) and kept\n * out of mutation testing, which cannot see a spawned child's coverage.\n *\n * A TypeScript module loads through `tsx` because Node's built-in type\n * stripping cannot follow the `./flow.js` specifiers that point at `.ts`\n * files under NodeNext resolution. Anything else, or a project without\n * `tsx`, goes through a plain `import()`.\n */\n\nimport { createRequire } from 'node:module'\nimport { resolve } from 'node:path'\nimport { fileURLToPath, pathToFileURL } from 'node:url'\nimport { run_diagram_cli } from './diagram_cli.js'\n\nconst TS_MODULE = /\\.[cm]?tsx?$/\n\n/**\n * Run the fascicle-diagram command over `argv` against the real process, and\n * leave its exit code on `process.exitCode`. A reader that closes the pipe\n * early (`| head`) ends the output quietly instead of crashing the command on\n * an unhandled EPIPE.\n */\nexport async function run_diagram_bin(argv: readonly string[]): Promise<void> {\n process.stdout.once('error', (err: NodeJS.ErrnoException) => {\n if (err.code !== 'EPIPE') throw err\n })\n process.exitCode = await run_diagram_cli(argv, {\n out: (text) => process.stdout.write(text),\n err: (text) => process.stderr.write(text),\n load: load_module,\n })\n}\n\n/**\n * Import the module at `path`. A TypeScript module goes through the `tsx`\n * that the project installs, looked up from the module's own directory and\n * then from the working directory. Everything else is a plain dynamic import.\n */\nasync function load_module(path: string): Promise<Readonly<Record<string, unknown>>> {\n const url = pathToFileURL(path).href\n if (!TS_MODULE.test(path)) return as_record(await import(url))\n const tsx = find_tsx([path, resolve('package.json')])\n if (tsx === undefined) return import_without_tsx(url)\n const api: unknown = await import(pathToFileURL(tsx).href)\n const ts_import = as_record(api)['tsImport']\n if (typeof ts_import !== 'function') return as_record(await import(url))\n return as_record(await ts_import(url, import.meta.url))\n}\n\n/**\n * Import a TypeScript module with Node's own type stripping, which handles\n * only erasable syntax and specifiers that name real files. A failure says\n * that tsx is the fix, since this path is taken only when none was found.\n */\nasync function import_without_tsx(url: string): Promise<Readonly<Record<string, unknown>>> {\n try {\n return as_record(await import(url))\n } catch (err) {\n const reason = err instanceof Error ? err.message : String(err)\n throw new Error(`${reason} (no tsx was found to load TypeScript: install it with pnpm add -D tsx)`, {\n cause: err,\n })\n }\n}\n\n/**\n * Resolve tsx's programmatic API from the first of `origins` that can see it,\n * or `undefined` when none can.\n */\nfunction find_tsx(origins: readonly string[]): string | undefined {\n for (const origin of origins) {\n try {\n return createRequire(origin).resolve('tsx/esm/api')\n } catch {\n // Not installed where this origin looks; try the next one.\n }\n }\n return undefined\n}\n\n/**\n * View a loaded module namespace as a record of its exports.\n */\nfunction as_record(value: unknown): Readonly<Record<string, unknown>> {\n return typeof value === 'object' && value !== null ? { ...value } : {}\n}\n\n// Auto-run only when this file is the entry script (`tsx src/diagram_bin.ts`),\n// never when the bundle that contains it is imported. The path comparison is\n// the same guard the viewer CLI uses.\nconst invoked_directly =\n process.argv[1] !== undefined && process.argv[1] === fileURLToPath(import.meta.url)\n\nif (invoked_directly) void run_diagram_bin(process.argv.slice(2))\n"],"mappings":"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"}
@@ -1,6 +1,6 @@
1
- import { T as validate_schema, f as compute_backoff, k as aborted_error, p as wait_with_abort, w as format_schema_issues } from "./core-CErsxGF6.js";
1
+ import { T as validate_schema, f as compute_backoff, k as aborted_error, p as wait_with_abort, w as format_schema_issues } from "./core-BOFcG3tp.js";
2
2
  import { n as is_record$1 } from "./records-1HU7mWXf.js";
3
- import { A as tool_error, C as provider_capability_error, D as rate_limit_error, E as provider_required_error, O as schema_validation_error, S as provider_auth_error, T as provider_not_configured_error, _ as engine_config_error, b as model_required_error, c as read_dialect_init, d as load_optional_peer, f as missing_peer_error, g as claude_cli_error, h as translate_effort_to_sdk_reasoning, i as invoke_http_turn, j as turn_timeout_error, k as tool_approval_denied_error, l as split_assistant_parts, m as resolve_transport, n as consume_framed_stream, o as map_messages_by_role, p as normalize_local_usage, r as create_line_splitter, s as parse_tool_call_arguments, t as split_leading_system_run, u as default_normalize_usage, v as engine_disposed_error, w as provider_error, x as on_chunk_error, y as incomplete_generation_error } from "./leading_system-PoHzNHuV.js";
3
+ import { A as tool_error, C as provider_capability_error, D as rate_limit_error, E as provider_required_error, O as schema_validation_error, S as provider_auth_error, T as provider_not_configured_error, _ as engine_config_error, b as model_required_error, c as read_dialect_init, d as load_optional_peer, f as missing_peer_error, g as claude_cli_error, h as translate_effort_to_sdk_reasoning, i as invoke_http_turn, j as turn_timeout_error, k as tool_approval_denied_error, l as split_assistant_parts, m as resolve_transport, n as consume_framed_stream, o as map_messages_by_role, p as normalize_local_usage, r as create_line_splitter, s as parse_tool_call_arguments, t as split_leading_system_run, u as default_normalize_usage, v as engine_disposed_error, w as provider_error, x as on_chunk_error, y as incomplete_generation_error } from "./leading_system-WhW76tRn.js";
4
4
  import { join } from "node:path";
5
5
  import { mkdtempSync, writeFileSync } from "node:fs";
6
6
  import { tmpdir } from "node:os";
@@ -3514,13 +3514,20 @@ function gate(raw, recognize) {
3514
3514
  }
3515
3515
  /**
3516
3516
  * Normalize an `assistant` event: its `message` must be an object and its
3517
- * `content` an array, whose recognized parts are kept and the rest dropped.
3517
+ * `content` an array, whose recognized parts are kept and the rest dropped. An
3518
+ * `error` code, when present, must be a string.
3518
3519
  */
3519
3520
  function as_assistant_event(raw) {
3520
3521
  const message = raw["message"];
3521
- if (!is_record(message)) return void 0;
3522
+ if (!is_record(message) || !opt_string(raw, "error")) return void 0;
3522
3523
  const content = collect_parts(message["content"], as_assistant_part);
3523
- return content === void 0 ? void 0 : {
3524
+ if (content === void 0) return void 0;
3525
+ const error = raw["error"];
3526
+ return typeof error === "string" ? {
3527
+ type: "assistant",
3528
+ message: { content },
3529
+ error
3530
+ } : {
3524
3531
  type: "assistant",
3525
3532
  message: { content }
3526
3533
  };
@@ -3701,6 +3708,7 @@ async function handle_assistant(state, event, chunks, dispatch) {
3701
3708
  flush_turn(state);
3702
3709
  state.current_step_index += 1;
3703
3710
  }
3711
+ if (event.error !== void 0) state.api_error = event.error;
3704
3712
  for (const part of event.message.content) {
3705
3713
  if (part.type === "text") {
3706
3714
  state.turn_text += part.text;
@@ -3887,6 +3895,7 @@ function snapshot(state) {
3887
3895
  if (state.total_cost_usd !== void 0) base.total_cost_usd = state.total_cost_usd;
3888
3896
  if (state.duration_ms !== void 0) base.duration_ms = state.duration_ms;
3889
3897
  if (state.duration_api_ms !== void 0) base.duration_api_ms = state.duration_api_ms;
3898
+ if (state.api_error !== void 0) base.api_error = state.api_error;
3890
3899
  return base;
3891
3900
  }
3892
3901
  //#endregion
@@ -4659,27 +4668,35 @@ function compile_schema(schema) {
4659
4668
  return JSON.stringify(to_json_schema(schema, { strip_meta: true }));
4660
4669
  }
4661
4670
  /**
4662
- * Turn a closed CLI subprocess's exit code, signal, and stderr into an
4663
- * `Error`.
4671
+ * Turn a closed CLI subprocess's exit code, signal, stderr, and what its
4672
+ * stream reported into an `Error`.
4664
4673
  *
4665
- * Checks stderr for an auth failure first, then for a claude binary that
4666
- * bwrap started but couldn't find inside its sandbox, then for a missing
4667
- * sandbox binary, then falls back to a generic exit-code error. The stderr
4668
- * snippet attached to each error is truncated to 512 bytes.
4674
+ * Checks for an auth failure first, then for a claude binary that bwrap
4675
+ * started but couldn't find inside its sandbox, then for a missing sandbox
4676
+ * binary, then falls back to a generic exit-code error. The stderr snippet
4677
+ * attached to each error is truncated to 512 bytes.
4678
+ *
4679
+ * A logged-out CLI says so on stdout and leaves stderr empty: it writes an
4680
+ * assistant message with the `authentication_failed` error code and an error
4681
+ * result that reads "Not logged in · Please run /login". So the auth check
4682
+ * reads the stream's error code as well as stderr, and when stderr is empty,
4683
+ * an error result's text stands in for it in the message.
4669
4684
  *
4670
4685
  * The bwrap check has to come before the sandbox check: bwrap's own
4671
4686
  * "execvp <binary>: No such file or directory" names bwrap and says the file
4672
4687
  * is missing, so the sandbox check would blame bwrap for the claude binary.
4673
4688
  */
4674
- function classify_close_error(code, signal, stderr) {
4689
+ function classify_close_error(code, signal, stderr, parsed) {
4675
4690
  const snippet = stderr.slice(0, 512);
4676
- if (stderr_is_auth_failure(stderr)) return new provider_auth_error(PROVIDER_NAME, `claude CLI reported an auth failure: ${snippet}`, { refresh_command: "claude login" });
4691
+ const reported = parsed?.is_error === true ? parsed.final_text.slice(0, 512) : "";
4692
+ const detail = snippet.length > 0 ? snippet : reported;
4693
+ if (stderr_is_auth_failure(stderr) || parsed?.api_error === "authentication_failed") return new provider_auth_error(PROVIDER_NAME, `claude CLI reported an auth failure: ${detail}`, { refresh_command: "claude auth login" });
4677
4694
  const sandboxed_binary = BWRAP_EXEC_MISSING.exec(stderr)?.[1];
4678
4695
  if (sandboxed_binary !== void 0) return new claude_cli_error("binary_not_found", `bwrap ran but found no claude binary at '${sandboxed_binary}' inside its sandbox, which binds only /usr, /bin, /lib, /lib64, and additional_write_paths: ${snippet}`, { stderr_snippet: snippet });
4679
4696
  if (/bwrap|greywall|sandbox/i.test(stderr) && /not found|no such file|enoent/i.test(stderr)) return new claude_cli_error("sandbox_unavailable", `sandbox binary unavailable: ${snippet}`, { stderr_snippet: snippet });
4680
4697
  const status = typeof code === "number" ? code : void 0;
4681
4698
  const signal_part = signal !== null ? ` (signal ${signal})` : "";
4682
- const message = `claude CLI exited with code ${String(code)}${signal_part}: ${snippet}`;
4699
+ const message = `claude CLI exited with code ${String(code)}${signal_part}: ${detail}`;
4683
4700
  const metadata = { stderr_snippet: snippet };
4684
4701
  if (status !== void 0) metadata.status = status;
4685
4702
  return new claude_cli_error("subprocess_exit", message, metadata);
@@ -4731,7 +4748,7 @@ async function run_cli(spawn_runtime, args) {
4731
4748
  throw err;
4732
4749
  }
4733
4750
  const parsed = snapshot(state);
4734
- if (close_outcome.code !== 0) throw classify_close_error(close_outcome.code, close_outcome.signal, close_outcome.stderr);
4751
+ if (close_outcome.code !== 0) throw classify_close_error(close_outcome.code, close_outcome.signal, close_outcome.stderr, parsed);
4735
4752
  if (!parsed.received_result) throw new claude_cli_error("no_result_event", "claude CLI closed without emitting a terminal result event", { stderr_snippet: close_outcome.stderr.slice(0, 512) });
4736
4753
  return {
4737
4754
  parsed,
@@ -6820,7 +6837,7 @@ async function build_ai_sdk_transport(cfg) {
6820
6837
  const provider_options = combined_provider_options !== void 0 && Object.keys(combined_provider_options).length > 0 ? combined_provider_options : void 0;
6821
6838
  let ai_sdk_invoke_mod;
6822
6839
  try {
6823
- ai_sdk_invoke_mod = await import("./invoke-COaeZ-vy.js");
6840
+ ai_sdk_invoke_mod = await import("./invoke-LbzZLZFw.js");
6824
6841
  } catch (err) {
6825
6842
  throw missing_peer_error("ai", err);
6826
6843
  }
@@ -6851,7 +6868,7 @@ async function build_ai_sdk_transport(cfg) {
6851
6868
  * prompt came from.
6852
6869
  */
6853
6870
  function build_prompt_messages(opts) {
6854
- const schema_prefix = opts.schema !== void 0 ? "You must respond with a single JSON value that conforms to the expected schema. Return ONLY the JSON value, with no markdown or commentary." : void 0;
6871
+ const schema_prefix = opts.schema !== void 0 ? schema_instruction(opts.schema) : void 0;
6855
6872
  const initial_messages = build_initial_messages(opts);
6856
6873
  if (schema_prefix !== void 0) {
6857
6874
  const idx = initial_messages.findIndex((m) => m.role === "system");
@@ -6868,6 +6885,28 @@ function build_prompt_messages(opts) {
6868
6885
  }
6869
6886
  return initial_messages;
6870
6887
  }
6888
+ const JSON_ONLY = "Return ONLY the JSON value, with no markdown or commentary.";
6889
+ /**
6890
+ * The instruction that asks for a JSON reply, with the schema that the reply has to fit.
6891
+ *
6892
+ * The instruction is the only place where most transports show the model the
6893
+ * schema. Only an `ai_sdk` adapter with the `structured_output` capability
6894
+ * hands the schema to the provider, and only on a call without tools, so
6895
+ * everywhere else a bare request would leave the model guessing the field
6896
+ * names while the repair loop taught them one failed reply at a time.
6897
+ *
6898
+ * A schema that can't be emitted keeps the bare request. A vendor without
6899
+ * Standard JSON Schema throws, and so does zod for a type that JSON Schema
6900
+ * can't express (a `Date`), and both of those schemas validate replies without
6901
+ * it, so a failed emission must not fail the call.
6902
+ */
6903
+ function schema_instruction(schema) {
6904
+ try {
6905
+ return `You must respond with a single JSON value that conforms to this JSON Schema:\n\n${JSON.stringify(to_json_schema(schema, { strip_meta: true }))}\n\n${JSON_ONLY}`;
6906
+ } catch {
6907
+ return `You must respond with a single JSON value that conforms to the expected schema. ${JSON_ONLY}`;
6908
+ }
6909
+ }
6871
6910
  /**
6872
6911
  * Assemble the ToolLoopConfig base shared by every loop invocation of one
6873
6912
  * generate call. Everything here is per-call state: the mutable transcript,
@@ -7381,4 +7420,4 @@ function create_engine(config) {
7381
7420
  //#endregion
7382
7421
  export { create_engine as t };
7383
7422
 
7384
- //# sourceMappingURL=engine-CR8q2IqV.js.map
7423
+ //# sourceMappingURL=engine-B6rIIM4J.js.map