zidane 7.0.16 → 7.0.18

package/dist/acp-cli.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
-import { m as openaiCompat } from "./openai-compat-DY-AKxCg.js";
-import { xt as basic_default } from "./agent-B_uQo4f1.js";
+import { m as openaiCompat } from "./openai-compat-cIeLSED_.js";
+import { xt as basic_default } from "./agent-Djzx-1kD.js";
 import { r as createProcessContext } from "./contexts-BSFQVclW.js";
 import { createSandboxContext } from "./contexts/sandbox.js";
 import { p as resolveStorageDirs } from "./plugins-B531Tz5b.js";
-import { n as anthropic } from "./anthropic-QbHqqTkV.js";
+import { n as anthropic } from "./anthropic-D_aMBEj8.js";
 import { arcee } from "./providers/arcee.js";
 import { baseten } from "./providers/baseten.js";
 import { cerebras } from "./providers/cerebras.js";
 import { openai } from "./providers/openai.js";
 import { openrouter } from "./providers/openrouter.js";
 import { xai } from "./providers/xai.js";
-import { d as StartUsageError, f as buildStartLocalOptions, h as startProviderNames, i as withAcpDefaultTools, m as startLocalArgOptions, p as parseStartArgValues, t as runAcpStdioServer } from "./acp-Bw2b_kka.js";
-import { d as BUILTIN_PROVIDERS, i as readCredentials, m as credKeyOf, r as credentialsPath, t as detectAuth, x as modelsForDescriptor } from "./auth-plw6npda.js";
+import { d as StartUsageError, f as buildStartLocalOptions, h as startProviderNames, i as withAcpDefaultTools, m as startLocalArgOptions, p as parseStartArgValues, t as runAcpStdioServer } from "./acp-BgNj1-gv.js";
+import { d as BUILTIN_PROVIDERS, i as readCredentials, m as credKeyOf, r as credentialsPath, t as detectAuth, x as modelsForDescriptor } from "./auth-UMMUxUhV.js";
 import { createDaytonaProvider } from "./contexts/daytona.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createE2BProvider } from "./contexts/e2b.js";

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { J_ as SessionStore, Mg as PromptPart, Vg as SessionContentBlock, W_ as Session, Xi as AgentOptions, d_ as TurnUsage, g_ as ToolDef, ig as AgentBehavior, mm as Provider, n_ as ToolResultContent, qi as Agent, t as Preset, xg as McpServerConfig } from "./index-Dc_zYpEu.js";
+import { $_ as SessionStore, Fg as PromptPart, Wg as SessionContentBlock, Xi as AgentOptions, Y_ as Session, g_ as TurnUsage, gm as Provider, qi as Agent, s_ as ToolResultContent, sg as AgentBehavior, t as Preset, wg as McpServerConfig, x_ as ToolDef } from "./index-BuntpQUB.js";
 import { c as ExecutionContext } from "./types-U-rIVUDw.js";
 import { Readable, Writable } from "node:stream";
 

package/dist/acp.js

@@ -1,3 +1,3 @@
 import { n as JsonRpcRemoteError, r as createJsonRpcConnection } from "./json-rpc-rSWMUh9b.js";
-import { a as wrapToolsForAcpClient, c as sessionBlocksToAcp, i as withAcpDefaultTools, l as stopReasonFromRun, n as AcpProtocolError, o as acpMcpServersToZidane, r as createAcpServer, s as acpPromptToPromptParts, t as runAcpStdioServer, u as toolResultToAcpContent } from "./acp-Bw2b_kka.js";
+import { a as wrapToolsForAcpClient, c as sessionBlocksToAcp, i as withAcpDefaultTools, l as stopReasonFromRun, n as AcpProtocolError, o as acpMcpServersToZidane, r as createAcpServer, s as acpPromptToPromptParts, t as runAcpStdioServer, u as toolResultToAcpContent } from "./acp-BgNj1-gv.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-B_uQo4f1.js → agent-Djzx-1kD.js}

@@ -1,4 +1,4 @@
-import { B as rewriteMessagesToWire, H as toWireName, I as augmentMcpDoubleUnderscoreAliases, L as buildAliasMaps, M as buildPromptMessage, N as canonicalizePrompt, R as buildSanitizedWireAliases, V as toCanonicalName, z as rewriteContentToCanonical } from "./openai-compat-DY-AKxCg.js";
+import { B as rewriteMessagesToWire, H as toWireName, I as augmentMcpDoubleUnderscoreAliases, L as buildAliasMaps, M as buildPromptMessage, N as canonicalizePrompt, R as buildSanitizedWireAliases, V as toCanonicalName, w as fillEstimatedCost, z as rewriteContentToCanonical } from "./openai-compat-cIeLSED_.js";
 import { a as documentBlockMarker, c as toolOutputBudgetByteLength, l as toolOutputByteLength, o as isWireTurn, s as sanitizeToolResultMetadata, t as DEFAULT_AGENT_CLOCK, u as toolResultToText } from "./types-CWgENVLY.js";
 import { a as stripLineNumberPrefixes, i as resolveOldString, n as buildContextBreakdown, o as styleReplacementForVia, r as describeVia, t as buildContextSegments } from "./context-segments-CJCtJ9sU.js";
 import { n as estimateTokens, r as utf8ByteLength } from "./utils-ngQzYzZD.js";
@@ -17,8 +17,8 @@ import { t as escapeXml } from "./xml-D5HBhJle.js";
 import { n as reconcileImageMediaType } from "./media-sniff-UKijEaiQ.js";
 import { f as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-BIWa57eY.js";
 import { appendStaticSection, renderSystemForWire } from "./prompt.js";
-import { a as detectTurnInterruption, c as ensureToolResultPairing, l as filterUnresolvedToolUses, m as resolveContentRefsInMessages, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, p as remintDuplicateToolCallIds, s as ensureEndsWithUserMessage } from "./messages-21XfHxyF.js";
-import { a as getExtensionSessionState, c as setExtensionSessionState, l as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as resumeChainRunIds } from "./session-DPZnncaQ.js";
+import { a as detectTurnInterruption, c as ensureToolResultPairing, l as filterUnresolvedToolUses, m as resolveContentRefsInMessages, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, p as remintDuplicateToolCallIds, s as ensureEndsWithUserMessage } from "./messages-aORUmIKe.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, l as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as resumeChainRunIds } from "./session-23Stp71-.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { a as settleWithinTimeout, i as resolveTimeoutMs, n as abortableSleep, o as withInactivityTimeout, r as linkAbortSignal, s as withTimeout$1, t as OperationTimeoutError } from "./timeout-CjOG2mea.js";
 import { createRequire } from "node:module";
@@ -1530,6 +1530,44 @@ function createArtifactDetectHook(registration, options = {}) {
 //#endregion
 //#region src/extensions/builtin-artifact-kinds.ts
 const GITHUB_PR_URL = /https:\/\/github\.com\/([\w.-]+)\/([\w.-]+)\/pull\/(\d+)/g;
+/**
+* GitHub token for PR refresh: `GITHUB_TOKEN` / `GH_TOKEN` from the
+* environment, else whatever the `gh` CLI is logged in with (`gh auth
+* token`) — the same credential git-flow's `/pull-request` uses, so a PR the
+* user could create is a PR we can read. The CLI lookup is cached for five
+* minutes (per process) and never throws: no `gh`, not logged in → `null`,
+* and the request goes out anonymous (public repos still work).
+*/
+let ghTokenCache = null;
+const GH_TOKEN_TTL_MS = 5 * 6e4;
+async function resolveGithubToken() {
+	const env = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
+	if (env) return env;
+	if (ghTokenCache && Date.now() - ghTokenCache.at < GH_TOKEN_TTL_MS) return ghTokenCache.value;
+	let value = null;
+	try {
+		const { execFile } = await import("node:child_process");
+		value = await new Promise((resolve) => {
+			execFile("gh", ["auth", "token"], { timeout: 3e3 }, (err, stdout) => {
+				resolve(err ? null : stdout.trim() || null);
+			});
+		});
+	} catch {
+		value = null;
+	}
+	ghTokenCache = {
+		value,
+		at: Date.now()
+	};
+	return value;
+}
+/**
+* Indirection so tests (and hosts with their own credential store) can swap
+* the token source without touching the environment or the `gh` binary.
+*/
+const githubTokenSource = { resolve: resolveGithubToken };
+/** A single GitHub path segment (owner / repo), as the detector captures it. */
+const GITHUB_SEGMENT = /^[\w.-]+$/;
 const GITLAB_MR_URL = /https?:\/\/[\w.-]+\/([\w./-]+?)\/-\/merge_requests\/(\d+)/g;
 const GIT_COMMIT_LINE = /^\[([^\s\]]+)(?: \(root-commit\))? ([0-9a-f]{7,40})\] (.*)$/m;
 /** Don't re-resolve an open PR more often than this. */
@@ -1588,49 +1626,125 @@ const pullRequestKind = {
 	render(artifact) {
 		const meta = metaRecord(artifact);
 		const state = typeof meta.state === "string" ? meta.state : void 0;
+		const badges = [];
+		if (typeof meta.additions === "number" || typeof meta.deletions === "number") badges.push({
+			text: `+${meta.additions ?? 0} −${meta.deletions ?? 0}`,
+			tone: "diff",
+			...typeof meta.changedFiles === "number" ? { title: `${meta.changedFiles} file${meta.changedFiles === 1 ? "" : "s"} changed` } : {}
+		});
+		if (typeof meta.reviews === "number" && meta.reviews > 0) badges.push({
+			text: `${meta.reviews} review${meta.reviews === 1 ? "" : "s"}`,
+			tone: "neutral"
+		});
+		if (typeof meta.comments === "number" && meta.comments > 0) badges.push({
+			text: `${meta.comments} comment${meta.comments === 1 ? "" : "s"}`,
+			tone: "neutral"
+		});
+		if (meta.mergeable === "clean" && (state === "open" || state === "approved")) badges.push({
+			text: "ready to merge",
+			tone: "success"
+		});
+		else if (meta.mergeable === "unstable") badges.push({
+			text: "checks failing",
+			tone: "warn"
+		});
+		else if (meta.mergeable === "dirty") badges.push({
+			text: "conflicts",
+			tone: "warn"
+		});
+		const prTitle = typeof meta.title === "string" && meta.title.trim() ? meta.title.trim() : null;
 		return {
-			title: artifact.label,
-			...typeof meta.title === "string" ? { subtitle: meta.title } : {},
+			title: prTitle ?? artifact.label,
+			...prTitle ? { subtitle: artifact.label } : {},
 			href: artifact.uri,
-			...state ? { status: state } : {}
+			...state ? { status: state.replace("_", " ") } : {},
+			...badges.length > 0 ? { badges } : {}
 		};
 	},
 	/**
-	* GitHub only (GitLab needs per-host auth). Unauthenticated when no
-	* `GITHUB_TOKEN` / `GH_TOKEN` is in the environment — public repos work,
-	* private ones (and the 60/h anonymous limit) degrade to `undefined`, i.e.
-	* "no refresh", never an error. Bounded by a 4 s timeout.
+	* GitHub only (GitLab needs per-host auth). Token from the environment or
+	* the `gh` CLI (see {@link resolveGithubToken}); without either the call is
+	* anonymous — public repos work, private ones (and the 60/h anonymous
+	* limit) degrade to `undefined`, i.e. "no refresh", never an error.
+	* Bounded by a 4 s timeout. Captures state, title, diff size, changed
+	* files and comment counts into `meta` for the rail.
 	*
 	* Rate-limit hygiene: terminal states (`merged` / `closed`) never change,
 	* and a fresh `resolvedAt` (within {@link PR_RESOLVE_TTL_MS}) is reused, so
 	* reopening the modal and arrowing through a dozen PRs doesn't spend a
 	* dozen anonymous API calls each time.
+	*
+	* `meta` is NOT trusted here: the detector regex-captures these fields, but
+	* `record_artifact` and `ctx.artifacts.record` let a model or an extension
+	* write anything. Path segments are re-validated to the shape a real repo
+	* has — rejecting is clearer than escaping, since nothing else is a repo —
+	* so a crafted `owner` can't steer this token-bearing request at another
+	* endpoint.
 	*/
-	async resolve(artifact) {
+	async resolve(artifact, opts) {
 		const meta = metaRecord(artifact);
-		if (meta.provider !== "github" || typeof meta.owner !== "string" || typeof meta.repo !== "string" || typeof meta.number !== "number") return void 0;
-		if (meta.state === "merged" || meta.state === "closed") return void 0;
-		if (typeof meta.resolvedAt === "number" && Date.now() - meta.resolvedAt < PR_RESOLVE_TTL_MS) return void 0;
-		const token = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
+		if (meta.provider !== "github") return void 0;
+		const { owner, repo, number } = meta;
+		if (typeof owner !== "string" || !GITHUB_SEGMENT.test(owner)) return void 0;
+		if (typeof repo !== "string" || !GITHUB_SEGMENT.test(repo)) return void 0;
+		if (typeof number !== "number" || !Number.isInteger(number) || number <= 0) return void 0;
+		if (meta.state === "merged" || meta.state === "closed" && !opts?.force) return void 0;
+		if (!opts?.force && typeof meta.resolvedAt === "number" && Date.now() - meta.resolvedAt < PR_RESOLVE_TTL_MS) return void 0;
+		const token = await githubTokenSource.resolve();
 		const controller = new AbortController();
 		const timer = setTimeout(() => controller.abort(), 4e3);
+		const headers = {
+			"Accept": "application/vnd.github+json",
+			"User-Agent": "zidane",
+			...token ? { Authorization: `Bearer ${token}` } : {}
+		};
 		try {
-			const res = await fetch(`https://api.github.com/repos/${meta.owner}/${meta.repo}/pulls/${meta.number}`, {
-				headers: {
-					"Accept": "application/vnd.github+json",
-					"User-Agent": "zidane",
-					...token ? { Authorization: `Bearer ${token}` } : {}
-				},
+			const base = `https://api.github.com/repos/${owner}/${repo}/pulls/${number}`;
+			const res = await fetch(base, {
+				headers,
 				signal: controller.signal
 			});
 			if (!res.ok) return void 0;
 			const body = await res.json();
-			const state = body.merged ? "merged" : body.draft ? "draft" : typeof body.state === "string" ? body.state : void 0;
+			const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : void 0;
+			const comments = (num(body.comments) ?? 0) + (num(body.review_comments) ?? 0);
+			let decision;
+			let reviews;
+			const isOpen = !body.merged && body.state === "open";
+			if (isOpen) try {
+				const rr = await fetch(`${base}/reviews?per_page=100`, {
+					headers,
+					signal: controller.signal
+				});
+				if (rr.ok) {
+					const list = await rr.json();
+					if (Array.isArray(list)) {
+						reviews = list.filter((r) => r.state && r.state !== "PENDING").length;
+						const latest = /* @__PURE__ */ new Map();
+						for (const r of list) {
+							const login = r.user?.login;
+							if (!login || login === body.user?.login || !r.state || r.state === "COMMENTED" || r.state === "PENDING") continue;
+							latest.set(login, r.state);
+						}
+						const states = [...latest.values()];
+						if (states.includes("CHANGES_REQUESTED")) decision = "changes_requested";
+						else if (states.includes("APPROVED")) decision = "approved";
+					}
+				}
+			} catch {}
+			const state = body.merged ? "merged" : body.draft ? "draft" : body.state === "open" ? decision ?? "open" : typeof body.state === "string" ? body.state : void 0;
 			if (!state) return void 0;
+			const mergeable = typeof body.mergeable_state === "string" ? body.mergeable_state : void 0;
 			return { meta: {
 				...meta,
 				state,
 				...typeof body.title === "string" ? { title: body.title } : {},
+				...num(body.additions) !== void 0 ? { additions: num(body.additions) } : {},
+				...num(body.deletions) !== void 0 ? { deletions: num(body.deletions) } : {},
+				...num(body.changed_files) !== void 0 ? { changedFiles: num(body.changed_files) } : {},
+				...num(body.comments) !== void 0 || num(body.review_comments) !== void 0 ? { comments } : {},
+				...reviews !== void 0 ? { reviews } : {},
+				...isOpen && mergeable ? { mergeable } : {},
 				resolvedAt: Date.now()
 			} };
 		} catch {
@@ -1702,18 +1816,18 @@ const branchKind = {
 	},
 	render: (artifact) => ({ title: artifact.label })
 };
+/**
+* `file` has NO automatic detector on purpose. Every `write_file` becoming
+* an artifact is noise — a refactor would produce dozens of rows that are
+* really just the diff and go stale on the next rename. A file is an
+* artifact only when something deliberately says so: the model via
+* `record_artifact` (a generated report, an export) or an extension via
+* `ctx.artifacts.record` (a build output). The kind keeps its rendering
+* and `file:` URI canonicalization for those paths.
+*/
 const fileKind = {
 	kind: ARTIFACT_KINDS.file,
 	label: "File",
-	detect({ tool, input, result, isError }) {
-		if (isError || tool !== "write_file") return void 0;
-		const path = typeof input.path === "string" ? input.path : void 0;
-		if (!path || !resultText(result).startsWith(`Created ${path} (`)) return void 0;
-		return {
-			uri: `file:${path}`,
-			label: path
-		};
-	},
 	render(artifact) {
 		const path = artifact.uri.startsWith("file://") ? artifact.uri.slice(7) : artifact.uri;
 		return {
@@ -1788,11 +1902,11 @@ function renderArtifactRow(artifact, registry) {
 * no resolver, the resolver declined, or it threw. Callers persist the
 * result through their store / RPC — this never writes.
 */
-async function refreshArtifact(artifact, registry) {
+async function refreshArtifact(artifact, registry, opts) {
 	const registration = resolveArtifactKind(artifact.kind, registry);
 	if (!registration?.resolve) return void 0;
 	try {
-		const patch = await registration.resolve(artifact);
+		const patch = await registration.resolve(artifact, opts);
 		if (!patch || patch.label === void 0 && patch.meta === void 0) return void 0;
 		return {
 			...artifact,
@@ -2787,7 +2901,7 @@ const KEYBINDING_DEFS = [
 		action: "openArtifacts",
 		default: "ctrl+shift+a",
 		label: "artifacts",
-		description: "open the session's artifacts (pull requests, branches, commits, files). Same as /artifacts",
+		description: "toggle the artifacts rail (pull requests, branches, commits, recorded files) — same as clicking the ▢ chip on the title bar",
 		group: "Global"
 	},
 	{
@@ -3360,8 +3474,10 @@ const recordArtifact = {
 	spec: {
 		name: RECORD_ARTIFACT_TOOL,
 		description: [
-			"Record an artifact this session produced so it is tracked on the session (visible via /artifacts).",
-			"Pull requests from `gh pr create`, commits, branches and files created with `write_file` are detected automatically — call this only for outputs the automatic detection cannot see: a PR opened from a background shell task, a deployment, an issue, a release, a file created by a script.",
+			"Record a deliverable this session produced so the user can find it later in the artifacts panel. An artifact is an OUTPUT the user would want a link to — not a step of the work.",
+			"Worth recording: a pull request or merge request URL, a deployment / preview URL, an issue or ticket you filed, a release or tag, a generated report / export / dataset the user asked for, a build output they will pick up.",
+			"Not worth recording: source files you edited or created as part of implementing a change, scratch files, logs, intermediate results, anything already implied by the diff.",
+			"Pull requests from `gh pr create`, `git commit` commits and newly created branches are detected automatically — record those only when the automatic path could not see them (e.g. a PR opened from a background shell task).",
 			"Idempotent per (kind, uri): recording the same artifact again refreshes its label/meta."
 		].join("\n"),
 		inputSchema: {
@@ -3369,7 +3485,7 @@ const recordArtifact = {
 			properties: {
 				kind: {
 					type: "string",
-					description: "Artifact kind: `pull_request`, `branch`, `commit`, `file`, or a custom kind such as `deployment` / `issue` (`[\\w.:-]+`)."
+					description: "Artifact kind: `pull_request`, `branch`, `commit`, `file` (a deliverable file, not a source edit), or a custom kind such as `deployment`, `issue`, `release` (`[\\w.:-]+`)."
 				},
 				uri: {
 					type: "string",
@@ -3403,7 +3519,7 @@ const recordArtifact = {
 //#region src/presets/artifacts.ts
 /**
 * Built-in artifact detection — records pull requests, branches, commits
-* and created files a session produces (see `session/artifacts.ts`).
+* a session produces — never files automatically (see `session/artifacts.ts`).
 *
 * Opt-in by composition, not baked into `basic`: SDK consumers who never
 * spread this preset see zero behavior change, while the TUI / daemon
@@ -7299,6 +7415,32 @@ function createArtifactsSurface(resolve) {
 				kind,
 				uri
 			});
+		},
+		record: async (input) => {
+			const scope = resolve();
+			if (!scope?.sessionId) return void 0;
+			const write = scope.record ?? scope.store.upsertArtifact?.bind(scope.store);
+			if (!write) return void 0;
+			const normalized = normalizeArtifactInput(input);
+			if (!normalized) return void 0;
+			const now = Date.now();
+			const projectRoot = normalized.projectRoot ?? scope.projectRoot;
+			try {
+				return await write({
+					id: crypto.randomUUID(),
+					sessionId: scope.sessionId,
+					...scope.runId ? { runId: scope.runId } : {},
+					kind: normalized.kind,
+					uri: normalized.uri,
+					label: normalized.label,
+					...projectRoot ? { projectRoot } : {},
+					...normalized.meta !== void 0 ? { meta: normalized.meta } : {},
+					createdAt: now,
+					updatedAt: now
+				}) ?? void 0;
+			} catch {
+				return;
+			}
 		}
 	};
 }
@@ -13116,6 +13258,26 @@ const DEFAULT_AUTO_COMPACT_MAX_FAILURES = 2;
 */
 const COMPACT_PROGRESS_THROTTLE_MS = 250;
 /**
+* Minimum gap between `stream:progress` dispatches during a parent turn. Same
+* cadence as compaction progress: fast enough to read as live, slow enough
+* that the (possibly async, catalog-priced) hook never becomes a hot path.
+*/
+const STREAM_PROGRESS_THROTTLE_MS = 250;
+/**
+* Prompt-side proxy for a live cost estimate when the provider hasn't reported
+* mid-stream usage: the previous assistant turn's split. Consecutive turns
+* ride nearly the same prefix, so its fresh/cached/written breakdown is a far
+* better guess than "all fresh input" (which would overprice a cached prompt
+* ten-fold). `undefined` on the first turn of a session — the estimate then
+* prices output only until `turn:after` settles it.
+*/
+function lastAssistantUsage(turns) {
+	for (let i = turns.length - 1; i >= 0; i--) {
+		const t = turns[i];
+		if (t.role === "assistant" && t.usage && t.usage.input + (t.usage.cacheRead ?? 0) + (t.usage.cacheCreation ?? 0) > 0) return t.usage;
+	}
+}
+/**
 * Normalize `behavior.autoCompact` into the loop's {@link ResolvedAutoCompact}
 * shape, or `undefined` when disabled (`false` / unset). Applies the
 * `provider.meta.contextWindow` fallback and inherits `compactKeepTurns` for
@@ -13460,6 +13622,71 @@ async function executeTurn(ctx, turn, priorUsage) {
 			if (process.env.ZIDANE_DEBUG) process.stderr.write(`[zidane/loop] stream hook handler threw: ${errorMessage(err)}\n`);
 		});
 	};
+	let liveUsage;
+	let lastProgressAt = 0;
+	let progressTimer;
+	let progressEnded = false;
+	const priorTurnUsage = lastAssistantUsage(ctx.turns);
+	const emitProgress = async () => {
+		if (progressEnded) return;
+		const providerOutput = liveUsage?.outputTokens;
+		const outputTokens = providerOutput ?? estimateTokens(currentText + currentThinking);
+		const promptSide = liveUsage?.inputTokens !== void 0 ? {
+			input: liveUsage.inputTokens,
+			cacheRead: liveUsage.cacheRead,
+			cacheCreation: liveUsage.cacheCreation
+		} : priorTurnUsage ? {
+			input: priorTurnUsage.input,
+			cacheRead: priorTurnUsage.cacheRead,
+			cacheCreation: priorTurnUsage.cacheCreation
+		} : { input: 0 };
+		let estCostUsd;
+		if (liveUsage?.billable !== false) estCostUsd = (await fillEstimatedCost({
+			...promptSide,
+			output: outputTokens,
+			modelId: streamOptions.model
+		}, ctx.provider.name, void 0, ctx.behavior.modelCatalog)).cost;
+		if (progressEnded) return;
+		await ctx.hooks.callHook("stream:progress", {
+			turnId,
+			elapsedMs: Date.now() - streamStartedAt,
+			outputTokens,
+			...liveUsage?.inputTokens !== void 0 ? { inputTokens: liveUsage.inputTokens } : {},
+			...liveUsage?.cacheRead !== void 0 ? { cacheRead: liveUsage.cacheRead } : {},
+			...liveUsage?.cacheCreation !== void 0 ? { cacheCreation: liveUsage.cacheCreation } : {},
+			estimated: providerOutput === void 0,
+			...estCostUsd !== void 0 ? { estCostUsd } : {}
+		});
+	};
+	const fireProgress = () => {
+		lastProgressAt = Date.now();
+		emitProgress().catch((err) => {
+			if (process.env.ZIDANE_DEBUG) process.stderr.write(`[zidane/loop] stream:progress handler threw: ${errorMessage(err)}\n`);
+		});
+	};
+	const scheduleProgress = () => {
+		if (progressEnded) return;
+		const wait = STREAM_PROGRESS_THROTTLE_MS - (Date.now() - lastProgressAt);
+		if (wait <= 0) {
+			if (progressTimer) {
+				clearTimeout(progressTimer);
+				progressTimer = void 0;
+			}
+			fireProgress();
+			return;
+		}
+		if (!progressTimer) progressTimer = setTimeout(() => {
+			progressTimer = void 0;
+			fireProgress();
+		}, wait);
+	};
+	const endProgress = () => {
+		progressEnded = true;
+		if (progressTimer) {
+			clearTimeout(progressTimer);
+			progressTimer = void 0;
+		}
+	};
 	const retryCfg = resolveRetryConfig(ctx.behavior.retry);
 	let result;
 	let attempt = 0;
@@ -13477,6 +13704,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 						text,
 						turnId
 					}));
+					scheduleProgress();
 				},
 				onThinking(delta) {
 					markTurnTtft();
@@ -13487,6 +13715,11 @@ async function executeTurn(ctx, turn, priorUsage) {
 						thinking,
 						turnId
 					}));
+					scheduleProgress();
+				},
+				onUsage(usage) {
+					liveUsage = usage;
+					scheduleProgress();
 				},
 				onServerToolUse({ id, name, input }) {
 					enqueueStreamHook(() => ctx.hooks.callHook("stream:server_tool_use", {
@@ -13516,6 +13749,11 @@ async function executeTurn(ctx, turn, priorUsage) {
 			break;
 		} catch (caught) {
 			let terminalErr = caught;
+			liveUsage = void 0;
+			if (progressTimer) {
+				clearTimeout(progressTimer);
+				progressTimer = void 0;
+			}
 			const failure = assessStreamFailure({
 				err: caught,
 				runAborted: ctx.signal.aborted,
@@ -13633,10 +13871,19 @@ async function executeTurn(ctx, turn, priorUsage) {
 				},
 				cumulativeUsage: buildCumulativeUsage(priorUsage, errorUsage)
 			}));
+			endProgress();
 			throw wrapProviderError(terminalErr, ctx);
 		}
 	}
 	await streamHookChain;
+	if (progressTimer || currentText || currentThinking || liveUsage) {
+		if (progressTimer) {
+			clearTimeout(progressTimer);
+			progressTimer = void 0;
+		}
+		await settledHook(ctx, "hook stream:progress", emitProgress());
+	}
+	endProgress();
 	if (currentText) await settledHook(ctx, "hook stream:end", ctx.hooks.callHook("stream:end", {
 		text: currentText,
 		turnId
@@ -14385,7 +14632,7 @@ async function emitToolResult(ctx, params) {
 const MAX_ARTIFACTS_PER_TOOL_RESULT = 50;
 async function recordArtifactsFromMetadata(ctx, params) {
 	const raw = params.metadata?.[ARTIFACTS_METADATA_KEY];
-	if (!Array.isArray(raw) || raw.length === 0 || !ctx.session) return;
+	if (ctx.artifactsDisabled || !Array.isArray(raw) || raw.length === 0 || !ctx.session) return;
 	const inputs = [];
 	for (const entry of raw.slice(0, MAX_ARTIFACTS_PER_TOOL_RESULT)) {
 		const normalized = normalizeArtifactInput(entry);
@@ -15551,6 +15798,7 @@ const HOOK_EVENT_SET = /* @__PURE__ */ new Set([
 	"stream:text",
 	"stream:end",
 	"stream:thinking",
+	"stream:progress",
 	"stream:server_tool_use",
 	"stream:server_tool_result",
 	"stream:error",
@@ -16640,7 +16888,7 @@ function warnContextContributorFailureOnce(contributor, err) {
 	process.stderr.write(`[zidane/agent] context breakdown contributor failed${owner}: ${errorMessage(err)}\n`);
 }
 function createAgent(rawOptions) {
-	const { provider: providerOption, name: agentName, system: agentSystem, tools: agentTools, toolAliases, behavior: agentBehavior, execution, handle: injectedHandle, mcpServers, session, readState: agentReadState, toolState: toolStateStore, skills: agentSkills, mcpConnector, mcpToolWrap, eager, hooks: initialHooks, clock: agentClock, toolKill, contextBreakdownSections, runTransforms, behaviorTransforms, toolCatalogTransforms, mcpConfigTransforms, skillPolicies, toolResultMetadata } = foldExtensionRegistry(rawOptions);
+	const { provider: providerOption, name: agentName, system: agentSystem, tools: agentTools, toolAliases, behavior: agentBehavior, execution, handle: injectedHandle, mcpServers, session, readState: agentReadState, toolState: toolStateStore, skills: agentSkills, mcpConnector, mcpToolWrap, eager, hooks: initialHooks, clock: agentClock, toolKill, contextBreakdownSections, runTransforms, behaviorTransforms, toolCatalogTransforms, mcpConfigTransforms, skillPolicies, toolResultMetadata, artifacts: artifactsOption } = foldExtensionRegistry(rawOptions);
 	const providers = normalizeProviders(providerOption);
 	const provider = providers[0];
 	const hooks = createHooks();
@@ -17290,6 +17538,7 @@ function createAgent(rawOptions) {
 					...modelOptions ? { modelOptions } : {},
 					...resolvedAutoCompact ? { autoCompact: resolvedAutoCompact } : {},
 					...session ? { session } : {},
+					...artifactsOption === false ? { artifactsDisabled: true } : {},
 					...agentReadState ? { readState: agentReadState } : {},
 					toolState: toolStateController,
 					...options.parentRunId ? { parentRunId: options.parentRunId } : {},
@@ -17817,6 +18066,6 @@ function createAgent(rawOptions) {
 	};
 }
 //#endregion
-export { installExtensionFromSpec as $, normalizeShellCommand as $n, KEYBINDING_DEF_BY_ACTION as $t, selectFilesFromSession as A, resolveExtensionConfig as An, createSkillsRunScriptTool as At, buildUpToCompactPrompt as B, commitKind as Bn, formatModelLine as Bt, resolveLegacySessionDir as C, createDebugLog as Cn, WAIT_TASK_TIMED_OUT_PREFIX as Ct, resolveTasksDir as D, coerceExtensionConfigInput as Dn, isSpawnTool as Dt, resolveSessionDir as E, clampExtensionConfigNumber as En, createSpawnTool as Et, TRAILER as F, createExtensionBus as Fn, tailTruncate as Ft, summaryToTurn as G, resolveArtifactKind as Gn, glob as Gt, anchorPreviewFor as H, pullRequestKind as Hn, listFiles as Ht, buildCompactPrompt as I, serializedPayloadBytes as In, readFile$1 as It, CompactPromptTooLongError as J, OUTPUT_RESERVE_TOKENS as Jn, artifacts_default as Jt, truncateHeadForPtlRetry as K, createArtifactDetectHook as Kn, edit as Kt, buildFromCompactPrompt as L, BUILTIN_ARTIFACT_KINDS as Ln, looksBinary as Lt, compactConversation as M, sanitizeExtensionConfigActionPatch as Mn, shellKill as Mt, BASE_INSTRUCTIONS as N, toWireConfigSchema as Nn, createShellTool as Nt, buildPostCompactAttachments as O, isValidExtensionConfigItem as On, reserveChildLabel as Ot, NO_TOOLS_PREAMBLE as P, EXTENSION_BUS_MAX_PAYLOAD_BYTES as Pn, shell as Pt, fetchExtensionSource as Q, defaultRepeatGuardTracked as Qn, KEYBINDING_DEFS as Qt, buildFullCompactPrompt as R, artifactKindLabel as Rn, multiEdit as Rt, resolveLegacyPersistDir as S, scanExtensionDirectories as Sn, writeFile$1 as St, resolvePersistDir as T, defineExtension as Tn, createToolSearchTool as Tt, sliceForCompaction as U, refreshArtifact as Un, createInteractionTool as Ut, ANCHOR_PREVIEW_MAX_CHARS as V, fileKind as Vn, matchModelEntries as Vt, stripImagesFromTurns as W, renderArtifactRow as Wn, grep as Wt, createExtensionPromptBridge as X, shouldAutoCompact as Xn, recordArtifact as Xt, EMPTY_EXTENSION_REGISTRY as Y, effectiveContextWindow as Yn, RECORD_ARTIFACT_TOOL as Yt, ExtensionInstallError as Z, defaultRepeatGuardNormalize as Zn, DEFAULT_KEYBINDINGS as Zt, buildPersistedStub as _, defaultExtensionScanPaths as _n, createWorkspaceSurface as _t, stagedToolState as a, matchesBinding as an, readStateKey as ar, createExtensionHud as at, migrateSessionArtifactDirs as b, isExtensionDefinition as bn, basicTools as bt, INTERRUPT_MESSAGE_FOR_TOOL_USE as c, readKeybindings as cn, buildExtensionRegistry as ct, TOOL_USE_SKIPPED_MESSAGE as d, stripJsonComments as dn, filterExtensionRegistry as dt, KEYBINDING_KEY_COL_WIDTH as en, stableStringify as er, listExtensionCandidates as et, applyCompactSummaryCutoff as f, ALTERNATE_CRED_KEY_SUFFIX as fn, filterRegistryPlugins as ft, PERSISTENCE_PREVIEW_BYTES as g, ENTRY_CANDIDATES as gn, createExtensionHostRuntimeBridge as gt, PERSISTED_STUB_PREFIX as h, registerExtensionHostModules as hn, createArtifactsSurface as ht, isToolStateOps as i, keybindingsPath as in, hydrateReadStateFromSessionAsync as ir, updateInstalledExtension as it, selectRecentFiles as j, resolveExtensionConfigValue as jn, createSkillsReadTool as jt, selectFilesFromReadState as k, isValidExtensionConfigValue as kn, createSkillsUseTool as kt, SHELL_CASCADE_CANCEL_MESSAGE as l, readKeybindingsRaw as ln, composeExtensionPreset as lt, renderStaleReadNotice as m, isReservedCredKey as mn, partitionExtensionCatalog as mt, DEFAULT_MAX_VALUE_BYTES as n, formatBindingForDisplay as nn, hashContent as nr, readExtensionInstallProvenance as nt, normalizeProviders as o, mergeKeybindings as on, resolveReadStateMap as or, discoverAndBuildExtensionRegistry as ot, collectNewlyStaleReadPaths as p, alternateCredKey as pn, mergeContributions as pt, CompactInvalidInputError as q, AUTO_COMPACT_MIN_GROWTH_FRACTION as qn, validateToolArgs as qt, createToolStateController as r, groupBindings as rn, hydrateReadStateFromSession as rr, removeInstalledExtension as rt, resolveModelTargets as s, parseBindingSpec as sn, buildExtensionPreset as st, createAgent as t, ensureKeybindingsFile as tn, getReadState as tr, parseExtensionInstallSource as tt, TOOL_USE_CANCELLED_MESSAGE as u, resolveExtensionKeybindings as un, disposeExtensionRegistry as ut, cleanupPersistedSession as v, discoverExtensions as vn, composePresets as vt, resolveMcpWarningsDir as w, setDebugLogSink as wn, waitTask as wt, rehomePersistedStubs as x, parseExtensionScanPathEnv as xn, basic_default as xt, maybePersistToolResult as y, inlineLoadedExtension as yn, definePreset as yt, buildTailCompactPrompt as z, branchKind as zn, createModelSearchTool as zt };
+export { installExtensionFromSpec as $, defaultRepeatGuardTracked as $n, KEYBINDING_DEF_BY_ACTION as $t, selectFilesFromSession as A, resolveExtensionConfig as An, createSkillsRunScriptTool as At, buildUpToCompactPrompt as B, commitKind as Bn, formatModelLine as Bt, resolveLegacySessionDir as C, createDebugLog as Cn, WAIT_TASK_TIMED_OUT_PREFIX as Ct, resolveTasksDir as D, coerceExtensionConfigInput as Dn, isSpawnTool as Dt, resolveSessionDir as E, clampExtensionConfigNumber as En, createSpawnTool as Et, TRAILER as F, createExtensionBus as Fn, tailTruncate as Ft, summaryToTurn as G, renderArtifactRow as Gn, glob as Gt, anchorPreviewFor as H, githubTokenSource as Hn, listFiles as Ht, buildCompactPrompt as I, serializedPayloadBytes as In, readFile$1 as It, CompactPromptTooLongError as J, AUTO_COMPACT_MIN_GROWTH_FRACTION as Jn, artifacts_default as Jt, truncateHeadForPtlRetry as K, resolveArtifactKind as Kn, edit as Kt, buildFromCompactPrompt as L, BUILTIN_ARTIFACT_KINDS as Ln, looksBinary as Lt, compactConversation as M, sanitizeExtensionConfigActionPatch as Mn, shellKill as Mt, BASE_INSTRUCTIONS as N, toWireConfigSchema as Nn, createShellTool as Nt, buildPostCompactAttachments as O, isValidExtensionConfigItem as On, reserveChildLabel as Ot, NO_TOOLS_PREAMBLE as P, EXTENSION_BUS_MAX_PAYLOAD_BYTES as Pn, shell as Pt, fetchExtensionSource as Q, defaultRepeatGuardNormalize as Qn, KEYBINDING_DEFS as Qt, buildFullCompactPrompt as R, artifactKindLabel as Rn, multiEdit as Rt, resolveLegacyPersistDir as S, scanExtensionDirectories as Sn, writeFile$1 as St, resolvePersistDir as T, defineExtension as Tn, createToolSearchTool as Tt, sliceForCompaction as U, pullRequestKind as Un, createInteractionTool as Ut, ANCHOR_PREVIEW_MAX_CHARS as V, fileKind as Vn, matchModelEntries as Vt, stripImagesFromTurns as W, refreshArtifact as Wn, grep as Wt, createExtensionPromptBridge as X, effectiveContextWindow as Xn, recordArtifact as Xt, EMPTY_EXTENSION_REGISTRY as Y, OUTPUT_RESERVE_TOKENS as Yn, RECORD_ARTIFACT_TOOL as Yt, ExtensionInstallError as Z, shouldAutoCompact as Zn, DEFAULT_KEYBINDINGS as Zt, buildPersistedStub as _, defaultExtensionScanPaths as _n, createWorkspaceSurface as _t, stagedToolState as a, matchesBinding as an, hydrateReadStateFromSessionAsync as ar, createExtensionHud as at, migrateSessionArtifactDirs as b, isExtensionDefinition as bn, basicTools as bt, INTERRUPT_MESSAGE_FOR_TOOL_USE as c, readKeybindings as cn, buildExtensionRegistry as ct, TOOL_USE_SKIPPED_MESSAGE as d, stripJsonComments as dn, filterExtensionRegistry as dt, KEYBINDING_KEY_COL_WIDTH as en, normalizeShellCommand as er, listExtensionCandidates as et, applyCompactSummaryCutoff as f, ALTERNATE_CRED_KEY_SUFFIX as fn, filterRegistryPlugins as ft, PERSISTENCE_PREVIEW_BYTES as g, ENTRY_CANDIDATES as gn, createExtensionHostRuntimeBridge as gt, PERSISTED_STUB_PREFIX as h, registerExtensionHostModules as hn, createArtifactsSurface as ht, isToolStateOps as i, keybindingsPath as in, hydrateReadStateFromSession as ir, updateInstalledExtension as it, selectRecentFiles as j, resolveExtensionConfigValue as jn, createSkillsReadTool as jt, selectFilesFromReadState as k, isValidExtensionConfigValue as kn, createSkillsUseTool as kt, SHELL_CASCADE_CANCEL_MESSAGE as l, readKeybindingsRaw as ln, composeExtensionPreset as lt, renderStaleReadNotice as m, isReservedCredKey as mn, partitionExtensionCatalog as mt, DEFAULT_MAX_VALUE_BYTES as n, formatBindingForDisplay as nn, getReadState as nr, readExtensionInstallProvenance as nt, normalizeProviders as o, mergeKeybindings as on, readStateKey as or, discoverAndBuildExtensionRegistry as ot, collectNewlyStaleReadPaths as p, alternateCredKey as pn, mergeContributions as pt, CompactInvalidInputError as q, createArtifactDetectHook as qn, validateToolArgs as qt, createToolStateController as r, groupBindings as rn, hashContent as rr, removeInstalledExtension as rt, resolveModelTargets as s, parseBindingSpec as sn, resolveReadStateMap as sr, buildExtensionPreset as st, createAgent as t, ensureKeybindingsFile as tn, stableStringify as tr, parseExtensionInstallSource as tt, TOOL_USE_CANCELLED_MESSAGE as u, resolveExtensionKeybindings as un, disposeExtensionRegistry as ut, cleanupPersistedSession as v, discoverExtensions as vn, composePresets as vt, resolveMcpWarningsDir as w, setDebugLogSink as wn, waitTask as wt, rehomePersistedStubs as x, parseExtensionScanPathEnv as xn, basic_default as xt, maybePersistToolResult as y, inlineLoadedExtension as yn, definePreset as yt, buildTailCompactPrompt as z, branchKind as zn, createModelSearchTool as zt };
 
-//# sourceMappingURL=agent-B_uQo4f1.js.map
+//# sourceMappingURL=agent-Djzx-1kD.js.map