@oh-my-pi/pi-ai 17.2.11 → 17.2.13

package/src/usage/minimax-code.ts

@@ -1,18 +1,11 @@
-import type {
-	UsageFetchContext,
-	UsageFetchParams,
-	UsageLimit,
-	UsageProvider,
-	UsageReport,
-	UsageStatus,
-} from "../usage";
+import { toNumber } from "@oh-my-pi/pi-catalog/utils";
+import type { UsageFetchContext, UsageFetchParams, UsageLimit, UsageProvider, UsageReport } from "../usage";
 import { isRecord } from "../utils";
-import { toNumber } from "./shared";
+import { HOUR_MS, parsePositiveTimestamp, usageStatus } from "./shared";
 
 const INTL_PROVIDER = "minimax-code";
 const INTL_BASE_URL = "https://api.minimax.io";
 const REMAINS_PATH = "/v1/token_plan/remains";
-const HOUR_MS = 60 * 60 * 1000;
 /** `current_*_status` enum reported per window: 1 normal, 2 exhausted, 3 unlimited. */
 const STATUS_EXHAUSTED = 2;
 const STATUS_UNLIMITED = 3;
@@ -42,13 +35,6 @@ interface TokenPlanBucket {
 	weeklyStatus?: number;
 }
 
-/** MiniMax reports epoch milliseconds; tolerate seconds in case a deployment differs. */
-function parseTimestamp(value: unknown): number | undefined {
-	const parsed = toNumber(value);
-	if (parsed === undefined || parsed <= 0) return undefined;
-	return parsed < 1_000_000_000_000 ? parsed * 1000 : parsed;
-}
-
 /** `current_*_remaining_percent` is 0..100 remaining; usage fractions are 0..1 used. */
 function usedFractionFromRemainingPercent(value: unknown): number | undefined {
 	const parsed = toNumber(value);
@@ -57,26 +43,20 @@ function usedFractionFromRemainingPercent(value: unknown): number | undefined {
 	return Math.min(1, Math.max(0, (100 - parsed) / 100));
 }
 
-function usageStatus(usedFraction: number): UsageStatus {
-	if (usedFraction >= 1) return "exhausted";
-	if (usedFraction >= 0.9) return "warning";
-	return "ok";
-}
-
 function parseBucket(value: unknown): TokenPlanBucket | null {
 	if (!isRecord(value)) return null;
 	const modelName = typeof value.model_name === "string" ? value.model_name.trim() : "";
 	if (!modelName) return null;
 	return {
 		modelName,
-		intervalStart: parseTimestamp(value.start_time),
-		intervalEnd: parseTimestamp(value.end_time),
+		intervalStart: parsePositiveTimestamp(value.start_time),
+		intervalEnd: parsePositiveTimestamp(value.end_time),
 		intervalRemainingPercent: toNumber(value.current_interval_remaining_percent),
 		intervalTotalCount: toNumber(value.current_interval_total_count),
 		intervalUsageCount: toNumber(value.current_interval_usage_count),
 		intervalStatus: toNumber(value.current_interval_status),
-		weeklyStart: parseTimestamp(value.weekly_start_time),
-		weeklyEnd: parseTimestamp(value.weekly_end_time),
+		weeklyStart: parsePositiveTimestamp(value.weekly_start_time),
+		weeklyEnd: parsePositiveTimestamp(value.weekly_end_time),
 		weeklyRemainingPercent: toNumber(value.current_weekly_remaining_percent),
 		weeklyTotalCount: toNumber(value.current_weekly_total_count),
 		weeklyUsageCount: toNumber(value.current_weekly_usage_count),

package/src/usage/openai-codex-reset.ts

@@ -18,10 +18,11 @@
  * (the `/usage reset` command + auto-redeem) and any out-of-band tooling can
  * share one wire contract.
  */
+import { toNumber } from "@oh-my-pi/pi-catalog/utils";
+import { USER_AGENT } from "@oh-my-pi/pi-utils";
 import type { FetchImpl } from "../types";
 import { isRecord } from "../utils";
 import { normalizeCodexBaseUrl } from "./openai-codex-base-url";
-import { toNumber } from "./shared";
 
 const RESET_CREDITS_PATH = "wham/rate-limit-reset-credits";
 const RESET_CREDITS_CONSUME_PATH = "wham/rate-limit-reset-credits/consume";
@@ -89,7 +90,7 @@ function buildUrl(baseUrl: string | undefined, routePath: string): string {
 function buildHeaders(auth: CodexResetAuth, json: boolean): Record<string, string> {
 	const headers: Record<string, string> = {
 		Authorization: `Bearer ${auth.accessToken}`,
-		"User-Agent": "OpenCode-Status-Plugin/1.0",
+		"User-Agent": USER_AGENT,
 	};
 	if (auth.accountId) headers["ChatGPT-Account-Id"] = auth.accountId;
 	if (json) headers["Content-Type"] = "application/json";

package/src/usage/openai-codex.ts

@@ -1,4 +1,6 @@
 import { Buffer } from "node:buffer";
+import { toNumber } from "@oh-my-pi/pi-catalog/utils";
+import { USER_AGENT } from "@oh-my-pi/pi-utils";
 import type {
 	CredentialRankingContext,
 	CredentialRankingStrategy,
@@ -14,7 +16,7 @@ import type {
 import { isRecord } from "../utils";
 import { normalizeCodexBaseUrl } from "./openai-codex-base-url";
 import { listCodexResetCredits } from "./openai-codex-reset";
-import { toNumber } from "./shared";
+import { HOUR_MS } from "./shared";
 
 const CODEX_USAGE_PATH = "wham/usage";
 const JWT_AUTH_CLAIM = "https://api.openai.com/auth";
@@ -416,7 +418,7 @@ export const openaiCodexUsageProvider: UsageProvider = {
 
 		const headers: Record<string, string> = {
 			Authorization: `Bearer ${accessToken}`,
-			"User-Agent": "OpenCode-Status-Plugin/1.0",
+			"User-Agent": USER_AGENT,
 		};
 		if (accountId) {
 			headers["ChatGPT-Account-Id"] = accountId;
@@ -558,8 +560,6 @@ export const openaiCodexUsageProvider: UsageProvider = {
 	},
 };
 
-const FIVE_HOUR_MS = 5 * 60 * 60 * 1000;
-
 // A Codex request gates only on the chat windows it actually consumes. A
 // "-spark" model spends the separate Spark meter; every other Codex model spends
 // the 5h/weekly chat windows. Scoping the gating set this way keeps an exhausted
@@ -619,7 +619,7 @@ export const codexRankingStrategy: CredentialRankingStrategy = {
 			windowId === "5h" ||
 			(typeof durationMs === "number" &&
 				Number.isFinite(durationMs) &&
-				Math.abs(durationMs - FIVE_HOUR_MS) <= 60_000);
+				Math.abs(durationMs - 5 * HOUR_MS) <= 60_000);
 		if (!isFiveHourWindow) return false;
 		const usedFraction = primary.amount.usedFraction;
 		return typeof usedFraction === "number" && Number.isFinite(usedFraction) && usedFraction === 0;

package/src/usage/opencode-go.ts

@@ -1,8 +1,7 @@
 import type { UsageCostHistoryEntry, UsageLimit, UsageProvider, UsageWindow } from "../usage";
+import { DAY_MS, HOUR_MS } from "./shared";
 
 const OPENCODE_GO_PROVIDER = "opencode-go";
-const HOUR_MS = 60 * 60 * 1000;
-const DAY_MS = 24 * HOUR_MS;
 const OPENCODE_GO_LIMITS = [
 	{ id: "rolling-5h", label: "5 Hour", durationMs: 5 * HOUR_MS, limitUsd: 12 },
 	{ id: "weekly", label: "Weekly", durationMs: 7 * DAY_MS, limitUsd: 30 },

package/src/usage/shared.ts

@@ -1,10 +1,33 @@
-export const toNumber = (value: unknown): number | undefined => {
-	if (typeof value === "number" && Number.isFinite(value)) return value;
-	if (typeof value === "string") {
-		const trimmed = value.trim();
-		if (!trimmed) return undefined;
-		const parsed = Number(trimmed);
-		if (Number.isFinite(parsed)) return parsed;
-	}
-	return undefined;
-};
+import { toNumber } from "@oh-my-pi/pi-catalog/utils";
+import type { UsageStatus } from "../usage";
+
+/** Milliseconds in one hour. */
+export const HOUR_MS = 60 * 60 * 1000;
+
+/** Milliseconds in one day. */
+export const DAY_MS = 24 * HOUR_MS;
+
+/** Milliseconds in one seven-day week. */
+export const WEEK_MS = 7 * DAY_MS;
+
+/** Parses a finite positive epoch timestamp, tolerating seconds or milliseconds. */
+export function parsePositiveTimestamp(value: unknown): number | undefined {
+	const parsed = toNumber(value);
+	if (parsed === undefined || parsed <= 0) return undefined;
+	return parsed < 1_000_000_000_000 ? parsed * 1000 : parsed;
+}
+
+/** Parses an ISO timestamp into epoch milliseconds. */
+export function parseIsoTimestamp(value: unknown): number | undefined {
+	if (typeof value !== "string" || !value) return undefined;
+	const parsed = Date.parse(value);
+	return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+/** Maps a used fraction to the standard quota status thresholds. */
+export function usageStatus(usedFraction: number | undefined): UsageStatus {
+	if (usedFraction === undefined) return "unknown";
+	if (usedFraction >= 1) return "exhausted";
+	if (usedFraction >= 0.9) return "warning";
+	return "ok";
+}

package/src/usage/synthetic.ts

@@ -9,10 +9,9 @@ import type {
 	UsageStatus,
 	UsageWindow,
 } from "../usage";
+import { HOUR_MS, parseIsoTimestamp, WEEK_MS } from "./shared";
 
 const QUOTAS_URL = "https://api.synthetic.new/v2/quotas";
-const FIVE_HOUR_MS = 5 * 60 * 60 * 1000;
-const WEEK_MS = 7 * 24 * 60 * 60 * 1000;
 
 function parseDollarAmount(value: unknown): number | undefined {
 	if (typeof value !== "string") return undefined;
@@ -21,12 +20,6 @@ function parseDollarAmount(value: unknown): number | undefined {
 	return Number.isFinite(parsed) ? parsed : undefined;
 }
 
-function parseIsoMs(value: unknown): number | undefined {
-	if (typeof value !== "string" || !value) return undefined;
-	const ms = Date.parse(value);
-	return Number.isFinite(ms) ? ms : undefined;
-}
-
 function buildUsageAmount(args: {
 	used: number | undefined;
 	limit: number | undefined;
@@ -61,7 +54,7 @@ function parseRollingFiveHourLimit(raw: unknown, provider: UsageFetchParams["pro
 	const remaining = typeof raw.remaining === "number" ? raw.remaining : undefined;
 	const max = typeof raw.max === "number" ? raw.max : undefined;
 	const limited = raw.limited === true;
-	const nextTickAt = parseIsoMs(raw.nextTickAt);
+	const nextTickAt = parseIsoTimestamp(raw.nextTickAt);
 	const tickPercent = typeof raw.tickPercent === "number" ? raw.tickPercent : undefined;
 
 	if (remaining === undefined && max === undefined) return null;
@@ -71,7 +64,7 @@ function parseRollingFiveHourLimit(raw: unknown, provider: UsageFetchParams["pro
 	const window: UsageWindow = {
 		id: "5h",
 		label: regenPercent !== undefined ? `5h · regen ${regenPercent}%/tick` : "5h",
-		durationMs: FIVE_HOUR_MS,
+		durationMs: 5 * HOUR_MS,
 		...(nextTickAt !== undefined ? { resetsAt: nextTickAt, resetLabel: "tick" } : {}),
 	};
 	const amount = buildUsageAmount({
@@ -97,7 +90,7 @@ function parseWeeklyTokenLimit(raw: unknown, provider: UsageFetchParams["provide
 	const remainingCredits = parseDollarAmount(raw.remainingCredits);
 	const maxCredits = parseDollarAmount(raw.maxCredits);
 	const percentRemaining = typeof raw.percentRemaining === "number" ? raw.percentRemaining : undefined;
-	const nextRegenAt = parseIsoMs(raw.nextRegenAt);
+	const nextRegenAt = parseIsoTimestamp(raw.nextRegenAt);
 
 	if (remainingCredits === undefined && maxCredits === undefined) return null;
 

package/src/usage/umans.ts

@@ -10,11 +10,11 @@ import type {
 	UsageWindow,
 } from "../usage";
 import { isRecord } from "../utils";
+import { HOUR_MS } from "./shared";
 
 const UMANS_PROVIDER = "umans";
 const DEFAULT_ENDPOINT = "https://api.code.umans.ai";
 const USAGE_PATH = "/v1/usage";
-const FIVE_HOURS_MS = 5 * 60 * 60 * 1000;
 
 /** Umans `GET /v1/usage` response (subset; extras ignored). */
 interface UmansUsagePayload {
@@ -89,7 +89,7 @@ function buildRequestsLimit(payload: UmansUsagePayload, provider: string): Usage
 	const window: UsageWindow = {
 		id: "5h",
 		label: "rolling 5h",
-		durationMs: windowSeconds ? windowSeconds * 1000 : FIVE_HOURS_MS,
+		durationMs: windowSeconds ? windowSeconds * 1000 : 5 * HOUR_MS,
 	};
 	return {
 		id: "umans:requests",

package/src/usage/xai-oauth.ts

@@ -9,6 +9,7 @@
  * product and must never be sent here.
  */
 
+import { toNumber } from "@oh-my-pi/pi-catalog/utils";
 import {
 	buildXAICliBillingUrl,
 	extractXAIAccessTokenSubject,
@@ -22,15 +23,12 @@ import type {
 	UsageLimit,
 	UsageProvider,
 	UsageReport,
-	UsageStatus,
 	UsageWindow,
 } from "../usage";
 import { isRecord } from "../utils";
-import { toNumber } from "./shared";
+import { DAY_MS, parseIsoTimestamp, usageStatus, WEEK_MS } from "./shared";
 
 const PROVIDER_ID = "xai-oauth";
-const WEEK_MS = 7 * 24 * 60 * 60 * 1000;
-const DAY_MS = 24 * 60 * 60 * 1000;
 const BILLING_SOURCE = "cli-chat-proxy.grok.com/v1/billing";
 
 interface XaiBillingPeriod {
@@ -71,11 +69,6 @@ interface XaiMonthlyBillingConfig {
 
 type XaiBillingConfig = XaiWeeklyBillingConfig | XaiMonthlyBillingConfig;
 
-function parseIsoMs(value: string): number | undefined {
-	const parsed = Date.parse(value);
-	return Number.isFinite(parsed) ? parsed : undefined;
-}
-
 function parsePercent(value: unknown): number | undefined {
 	const percent = toNumber(value);
 	return percent !== undefined && percent >= 0 && percent <= 100 ? percent : undefined;
@@ -99,12 +92,6 @@ function buildPercentAmount(usagePercent: number): UsageAmount {
 	};
 }
 
-function buildUsageStatus(usedFraction: number): UsageStatus {
-	if (usedFraction >= 1) return "exhausted";
-	if (usedFraction >= 0.9) return "warning";
-	return "ok";
-}
-
 function slugifyProduct(product: string): string {
 	return product
 		.trim()
@@ -118,13 +105,13 @@ function buildPeriodWindow(period: XaiBillingPeriod): UsageWindow {
 		id: "1w",
 		label: "Weekly",
 		durationMs: WEEK_MS,
-		resetsAt: parseIsoMs(period.end),
+		resetsAt: parseIsoTimestamp(period.end),
 	};
 }
 
 function buildMonthlyWindow(periodStart: string, periodEnd: string): UsageWindow | undefined {
-	const startMs = parseIsoMs(periodStart);
-	const endMs = parseIsoMs(periodEnd);
+	const startMs = parseIsoTimestamp(periodStart);
+	const endMs = parseIsoTimestamp(periodEnd);
 	if (startMs === undefined || endMs === undefined || endMs <= startMs) return undefined;
 	// Real calendar months vary; use the observed period length from the API.
 	const durationMs = endMs - startMs;
@@ -140,8 +127,8 @@ function buildMonthlyWindow(periodStart: string, periodEnd: string): UsageWindow
 function parseWeeklyBillingConfig(raw: Record<string, unknown>): XaiWeeklyBillingConfig | null {
 	if (!isRecord(raw.currentPeriod)) return null;
 
-	const start = typeof raw.currentPeriod.start === "string" ? parseIsoMs(raw.currentPeriod.start) : undefined;
-	const end = typeof raw.currentPeriod.end === "string" ? parseIsoMs(raw.currentPeriod.end) : undefined;
+	const start = typeof raw.currentPeriod.start === "string" ? parseIsoTimestamp(raw.currentPeriod.start) : undefined;
+	const end = typeof raw.currentPeriod.end === "string" ? parseIsoTimestamp(raw.currentPeriod.end) : undefined;
 	const type = typeof raw.currentPeriod.type === "string" ? raw.currentPeriod.type : "";
 	// Keep recently-ended weekly windows so /usage still renders across period
 	// rollover while the billing API is mid-refresh. Reject only inverted ranges
@@ -182,8 +169,8 @@ function parseWeeklyBillingConfig(raw: Record<string, unknown>): XaiWeeklyBillin
 function parseMonthlyBillingConfig(raw: Record<string, unknown>): XaiMonthlyBillingConfig | null {
 	const periodStart = typeof raw.billingPeriodStart === "string" ? raw.billingPeriodStart : "";
 	const periodEnd = typeof raw.billingPeriodEnd === "string" ? raw.billingPeriodEnd : "";
-	const startMs = parseIsoMs(periodStart);
-	const endMs = parseIsoMs(periodEnd);
+	const startMs = parseIsoTimestamp(periodStart);
+	const endMs = parseIsoTimestamp(periodEnd);
 	if (!periodStart || !periodEnd || startMs === undefined || endMs === undefined || endMs <= startMs) {
 		return null;
 	}
@@ -227,7 +214,7 @@ function buildOnDemandLimit(
 			remainingFraction: 1 - usedFraction,
 			unit: "unknown",
 		},
-		status: buildUsageStatus(usedFraction),
+		status: usageStatus(usedFraction),
 	};
 }
 
@@ -248,7 +235,7 @@ function buildLimits(config: XaiBillingConfig, accountId: string | undefined): U
 				scope,
 				window,
 				amount: overall,
-				status: buildUsageStatus(overall.usedFraction ?? 0),
+				status: usageStatus(overall.usedFraction ?? 0),
 			},
 		];
 
@@ -262,7 +249,7 @@ function buildLimits(config: XaiBillingConfig, accountId: string | undefined): U
 				scope,
 				window,
 				amount,
-				status: buildUsageStatus(amount.usedFraction ?? 0),
+				status: usageStatus(amount.usedFraction ?? 0),
 			});
 		}
 		const onDemand = buildOnDemandLimit(config.onDemandCap, config.onDemandUsed, accountId);
@@ -293,7 +280,7 @@ function buildLimits(config: XaiBillingConfig, accountId: string | undefined): U
 				// xAI does not label the unit; amounts match the dashboard quota points.
 				unit: "unknown",
 			},
-			status: buildUsageStatus(usedFraction),
+			status: usageStatus(usedFraction),
 		},
 	];
 	const onDemand = buildOnDemandLimit(config.onDemandCap, config.onDemandUsed, accountId);

package/src/usage/zai.ts

@@ -1,4 +1,5 @@
 import { toNumber } from "@oh-my-pi/pi-catalog/utils";
+import { USER_AGENT } from "@oh-my-pi/pi-utils";
 import type {
 	CredentialRankingStrategy,
 	UsageAmount,
@@ -11,14 +12,11 @@ import type {
 	UsageWindow,
 } from "../usage";
 import { isRecord } from "../utils";
+import { DAY_MS, HOUR_MS, WEEK_MS } from "./shared";
 
 const DEFAULT_ENDPOINT = "https://api.z.ai";
 const QUOTA_PATH = "/api/monitor/usage/quota/limit";
 const MODEL_USAGE_PATH = "/api/monitor/usage/model-usage";
-const SEVEN_DAYS_MS = 7 * 24 * 60 * 60 * 1000;
-const HOUR_MS = 60 * 60 * 1000;
-const DAY_MS = 24 * HOUR_MS;
-const WEEK_MS = 7 * DAY_MS;
 const MONTH_MS = 30 * DAY_MS;
 
 interface ZaiUsageDetail {
@@ -188,7 +186,7 @@ function requestQuotaLabel(parsed: ZaiUsageLimitItem): string {
 }
 
 function buildModelUsageUrl(baseUrl: string, now: Date): string {
-	const start = new Date(now.getTime() - SEVEN_DAYS_MS);
+	const start = new Date(now.getTime() - WEEK_MS);
 	const startTime = formatDate(start);
 	const endTime = formatDate(now);
 	return `${baseUrl}${MODEL_USAGE_PATH}?startTime=${encodeURIComponent(startTime)}&endTime=${encodeURIComponent(endTime)}`;
@@ -231,7 +229,7 @@ async function fetchZaiUsage(params: UsageFetchParams, ctx: UsageFetchContext):
 	const headers: Record<string, string> = {
 		Authorization: token,
 		"Content-Type": "application/json",
-		"User-Agent": "OpenCode-Status-Plugin/1.0",
+		"User-Agent": USER_AGENT,
 	};
 
 	let payload: ZaiQuotaPayload | null = null;

package/src/utils/aws-profile.ts

@@ -78,7 +78,45 @@ export function hasConfiguredAwsProfile(profile?: string): boolean {
 	const configPath = $env.AWS_CONFIG_FILE || path.join(os.homedir(), ".aws", "config");
 	const credentialsIni = readAwsIniSync(credentialsPath);
 	const configIni = shouldLoadAwsSharedConfig(profile) ? readAwsIniSync(configPath) : undefined;
-	const merged = { ...(configIni?.[selectedProfile] ?? {}), ...(credentialsIni?.[selectedProfile] ?? {}) };
+	return profileHasCredentialSource(selectedProfile, credentialsIni, configIni, new Set());
+}
+
+/**
+ * Whether a profile terminates in a usable credential source. Mirrors the
+ * resolver's per-profile dispatch (static keys, SSO, `credential_process`,
+ * `role_arn` chaining) so the availability probe never diverges from what
+ * `resolveAwsCredentials` can actually resolve. `role_arn` chains follow
+ * `source_profile` recursively (cycle-guarded by `seen`); MFA-gated roles are
+ * treated as unusable because non-interactive resolution cannot supply a token.
+ */
+function profileHasCredentialSource(
+	profile: string,
+	credentialsIni: AwsIniFile | undefined,
+	configIni: AwsIniFile | undefined,
+	seen: Set<string>,
+): boolean {
+	if (seen.has(profile)) return false;
+	seen.add(profile);
+	const merged = { ...(configIni?.[profile] ?? {}), ...(credentialsIni?.[profile] ?? {}) };
+	if (merged.role_arn) {
+		if (merged.web_identity_token_file) return true;
+		if (merged.mfa_serial) return false;
+		if (merged.credential_source) {
+			switch (merged.credential_source) {
+				case "Environment":
+					return !!($env.AWS_ACCESS_KEY_ID && $env.AWS_SECRET_ACCESS_KEY);
+				case "EcsContainer":
+					return !!($env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI || $env.AWS_CONTAINER_CREDENTIALS_FULL_URI);
+				case "Ec2InstanceMetadata":
+					return $env.AWS_EC2_METADATA_DISABLED?.toLowerCase() !== "true";
+				default:
+					return false;
+			}
+		}
+		if (merged.source_profile)
+			return profileHasCredentialSource(merged.source_profile, credentialsIni, configIni, seen);
+		return false;
+	}
 	if (merged.aws_access_key_id && merged.aws_secret_access_key) return true;
 	if (merged.credential_process) return true;
 	if (!merged.sso_account_id || !merged.sso_role_name) return false;

package/src/utils/block-symbols.ts

@@ -59,6 +59,24 @@ export const kCursorExecResolved = Symbol("provider.block.cursorExecResolved");
 /** Carries the resolved marker without exposing a string-keyed property. */
 export type CursorExecResolvedCarrier = object & { [kCursorExecResolved]?: true };
 
+/** True when a toolCall block was already executed by Cursor's exec channel. */
+export function isCursorExecResolved(block: CursorExecResolvedCarrier | null | undefined): boolean {
+	return block?.[kCursorExecResolved] === true;
+}
+
+/**
+ * Copy {@link kCursorExecResolved} onto a cloned/projected toolCall block.
+ *
+ * Stream projectors (owned/in-band dialect, leaked-thinking heal) rebuild
+ * toolCall objects field-by-field. Dropping this marker lets `agent-loop.ts`
+ * re-execute a call Cursor already settled — duplicate toolResults and a
+ * second bash/write/delete. Partial-JSON is already copied explicitly; this
+ * marker is the other load-bearing symbol that must survive the same way.
+ */
+export function copyCursorExecResolved(target: CursorExecResolvedCarrier, source: CursorExecResolvedCarrier): void {
+	if (source[kCursorExecResolved] === true) target[kCursorExecResolved] = true;
+}
+
 /**
  * Marks a text block synthesized by cross-model thinking demotion in
  * `transformMessages`. Converters that flatten adjacent text blocks into one

package/src/utils/leaked-thinking-stream.ts

@@ -36,6 +36,7 @@ import type {
 } from "../types";
 import {
 	clearStreamingPartialJson,
+	copyCursorExecResolved,
 	getStreamingPartialJson,
 	type StreamingPartialJsonCarrier,
 	setStreamingPartialJson,
@@ -49,6 +50,7 @@ function cloneToolCall(source: StreamingToolCall): StreamingToolCall {
 	const block: StreamingToolCall = { ...source, arguments: source.arguments };
 	const partialJson = getStreamingPartialJson(source);
 	if (partialJson !== undefined) setStreamingPartialJson(block, partialJson);
+	copyCursorExecResolved(block, source);
 	return block;
 }
 
@@ -57,6 +59,7 @@ function syncToolCall(target: StreamingToolCall, source: StreamingToolCall): voi
 	const partialJson = getStreamingPartialJson(source);
 	if (partialJson === undefined) clearStreamingPartialJson(target);
 	else setStreamingPartialJson(target, partialJson);
+	copyCursorExecResolved(target, source);
 }
 
 /**

package/src/utils/openrouter-headers.ts

@@ -1,10 +1,10 @@
-import packageJson from "../../package.json" with { type: "json" };
+import { USER_AGENT } from "@oh-my-pi/pi-utils";
 
 export function getOpenRouterHeaders(): Record<string, string> {
 	return {
-		"User-Agent": `Oh-My-Pi/${packageJson.version}`,
+		"User-Agent": USER_AGENT,
 		"HTTP-Referer": "https://omp.sh/",
-		"X-OpenRouter-Title": "Oh-My-Pi",
+		"X-OpenRouter-Title": "omp",
 		"X-OpenRouter-Categories": "cli-agent",
 		"X-OpenRouter-Cache": "true",
 		"X-OpenRouter-Cache-TTL": "3600",