t3 0.0.4 → 0.0.6

package/dist/index.mjs

@@ -443,6 +443,11 @@ const ProviderSandboxMode = Schema.Literals([
 	"danger-full-access"
 ]);
 const ProviderServiceTier = Schema.Literals(["fast", "flex"]);
+const CodexProviderStartOptions$1 = Schema.Struct({
+	binaryPath: Schema.optional(TrimmedNonEmptyString),
+	homePath: Schema.optional(TrimmedNonEmptyString)
+});
+const ProviderStartOptions$1 = Schema.Struct({ codex: Schema.optional(CodexProviderStartOptions$1) });
 const RuntimeMode = Schema.Literals(["approval-required", "full-access"]);
 const DEFAULT_RUNTIME_MODE$2 = "full-access";
 const ProviderInteractionMode = Schema.Literals(["default", "plan"]);
@@ -701,6 +706,7 @@ const ThreadTurnStartCommand = Schema.Struct({
 	model: Schema.optional(TrimmedNonEmptyString),
 	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
+	providerOptions: Schema.optional(ProviderStartOptions$1),
 	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
 	runtimeMode: RuntimeMode.pipe(Schema.withDecodingDefault(() => DEFAULT_RUNTIME_MODE$2)),
 	interactionMode: ProviderInteractionMode.pipe(Schema.withDecodingDefault(() => DEFAULT_PROVIDER_INTERACTION_MODE)),
@@ -720,6 +726,7 @@ const ClientThreadTurnStartCommand = Schema.Struct({
 	model: Schema.optional(TrimmedNonEmptyString),
 	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
+	providerOptions: Schema.optional(ProviderStartOptions$1),
 	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
 	runtimeMode: RuntimeMode,
 	interactionMode: ProviderInteractionMode,
@@ -962,6 +969,7 @@ const ThreadTurnStartRequestedPayload = Schema.Struct({
 	model: Schema.optional(TrimmedNonEmptyString),
 	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
+	providerOptions: Schema.optional(ProviderStartOptions$1),
 	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
 	runtimeMode: RuntimeMode.pipe(Schema.withDecodingDefault(() => DEFAULT_RUNTIME_MODE$2)),
 	interactionMode: ProviderInteractionMode.pipe(Schema.withDecodingDefault(() => DEFAULT_PROVIDER_INTERACTION_MODE)),
@@ -4396,6 +4404,7 @@ const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand")(funct
 					...command.model !== void 0 ? { model: command.model } : {},
 					...command.serviceTier !== void 0 ? { serviceTier: command.serviceTier } : {},
 					...command.modelOptions !== void 0 ? { modelOptions: command.modelOptions } : {},
+					...command.providerOptions !== void 0 ? { providerOptions: command.providerOptions } : {},
 					assistantDeliveryMode: command.assistantDeliveryMode ?? DEFAULT_ASSISTANT_DELIVERY_MODE$1,
 					runtimeMode: readModel.threads.find((entry) => entry.id === command.threadId)?.runtimeMode ?? command.runtimeMode,
 					interactionMode: readModel.threads.find((entry) => entry.id === command.threadId)?.interactionMode ?? command.interactionMode,
@@ -5817,6 +5826,7 @@ const make$1 = Effect.gen(function* () {
 		lookup: () => Effect.succeed(true)
 	});
 	const hasHandledTurnStartRecently = (key) => Cache.getOption(handledTurnStartKeys, key).pipe(Effect.flatMap((cached) => Cache.set(handledTurnStartKeys, key, true).pipe(Effect.as(Option.isSome(cached)))));
+	const threadProviderOptions = /* @__PURE__ */ new Map();
 	const appendProviderFailureActivity = (input) => orchestrationEngine.dispatch({
 		type: "thread.activity.append",
 		commandId: serverCommandId("provider-failure-activity"),
@@ -5865,6 +5875,7 @@ const make$1 = Effect.gen(function* () {
 			...desiredModel ? { model: desiredModel } : {},
 			...options?.serviceTier !== void 0 ? { serviceTier: options.serviceTier } : {},
 			...options?.modelOptions !== void 0 ? { modelOptions: options.modelOptions } : {},
+			...options?.providerOptions !== void 0 ? { providerOptions: options.providerOptions } : {},
 			...input?.resumeCursor !== void 0 ? { resumeCursor: input.resumeCursor } : {},
 			runtimeMode: desiredRuntimeMode
 		});
@@ -5924,11 +5935,13 @@ const make$1 = Effect.gen(function* () {
 	});
 	const sendTurnForThread = Effect.fnUntraced(function* (input) {
 		if (!(yield* resolveThread(input.threadId))) return;
+		if (input.providerOptions !== void 0) threadProviderOptions.set(input.threadId, input.providerOptions);
 		yield* ensureSessionForThread(input.threadId, input.createdAt, {
 			...input.provider !== void 0 ? { provider: input.provider } : {},
 			...input.model !== void 0 ? { model: input.model } : {},
 			...input.serviceTier !== void 0 ? { serviceTier: input.serviceTier } : {},
-			...input.modelOptions !== void 0 ? { modelOptions: input.modelOptions } : {}
+			...input.modelOptions !== void 0 ? { modelOptions: input.modelOptions } : {},
+			...input.providerOptions !== void 0 ? { providerOptions: input.providerOptions } : {}
 		});
 		const normalizedInput = toNonEmptyProviderInput(input.messageText);
 		const normalizedAttachments = input.attachments ?? [];
@@ -6017,6 +6030,7 @@ const make$1 = Effect.gen(function* () {
 			...event.payload.model !== void 0 ? { model: event.payload.model } : {},
 			...event.payload.serviceTier !== void 0 ? { serviceTier: event.payload.serviceTier } : {},
 			...event.payload.modelOptions !== void 0 ? { modelOptions: event.payload.modelOptions } : {},
+			...event.payload.providerOptions !== void 0 ? { providerOptions: event.payload.providerOptions } : {},
 			interactionMode: event.payload.interactionMode,
 			createdAt: event.payload.createdAt
 		});
@@ -6118,7 +6132,8 @@ const make$1 = Effect.gen(function* () {
 			case "thread.runtime-mode-set": {
 				const thread = yield* resolveThread(event.payload.threadId);
 				if (!thread?.session || thread.session.status === "stopped") return;
-				yield* ensureSessionForThread(event.payload.threadId, event.occurredAt);
+				const cachedProviderOptions = threadProviderOptions.get(event.payload.threadId);
+				yield* ensureSessionForThread(event.payload.threadId, event.occurredAt, { ...cachedProviderOptions !== void 0 ? { providerOptions: cachedProviderOptions } : {} });
 				return;
 			}
 			case "thread.turn-start-requested":
@@ -9044,6 +9059,8 @@ const make = Effect.gen(function* () {
 		if (assistantCompletion) {
 			const assistantMessageId = assistantCompletion.messageId;
 			const turnId = toTurnId$1(event.turnId);
+			const existingAssistantMessage = thread.messages.find((entry) => entry.id === assistantMessageId);
+			const shouldApplyFallbackCompletionText = !existingAssistantMessage || existingAssistantMessage.text.length === 0;
 			if (turnId) yield* rememberAssistantMessageId(thread.id, turnId, assistantMessageId);
 			yield* finalizeAssistantMessage({
 				event,
@@ -9053,7 +9070,7 @@ const make = Effect.gen(function* () {
 				createdAt: now,
 				commandTag: "assistant-complete",
 				finalDeltaCommandTag: "assistant-delta-finalize",
-				...assistantCompletion.fallbackText !== void 0 ? { fallbackText: assistantCompletion.fallbackText } : {}
+				...assistantCompletion.fallbackText !== void 0 && shouldApplyFallbackCompletionText ? { fallbackText: assistantCompletion.fallbackText } : {}
 			});
 			if (turnId) yield* forgetAssistantMessageId(thread.id, turnId, assistantMessageId);
 		}
@@ -9203,8 +9220,82 @@ function normalizeModelSlug(model, provider = "codex") {
 	return typeof aliased === "string" ? aliased : trimmed;
 }
 
+//#endregion
+//#region src/provider/codexCliVersion.ts
+const CODEX_VERSION_PATTERN = /\bv?(\d+\.\d+(?:\.\d+)?(?:-[0-9A-Za-z.-]+)?)\b/;
+const MINIMUM_CODEX_CLI_VERSION = "0.37.0";
+function normalizeCodexVersion(version) {
+	const [main, prerelease] = version.trim().split("-", 2);
+	const segments = (main ?? "").split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
+	if (segments.length === 2) segments.push("0");
+	return prerelease ? `${segments.join(".")}-${prerelease}` : segments.join(".");
+}
+function parseSemver(version) {
+	const [main = "", prerelease] = normalizeCodexVersion(version).split("-", 2);
+	const segments = main.split(".");
+	if (segments.length !== 3) return null;
+	const [majorSegment, minorSegment, patchSegment] = segments;
+	if (majorSegment === void 0 || minorSegment === void 0 || patchSegment === void 0) return null;
+	const major = Number.parseInt(majorSegment, 10);
+	const minor = Number.parseInt(minorSegment, 10);
+	const patch = Number.parseInt(patchSegment, 10);
+	if (![
+		major,
+		minor,
+		patch
+	].every(Number.isInteger)) return null;
+	return {
+		major,
+		minor,
+		patch,
+		prerelease: prerelease?.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0) ?? []
+	};
+}
+function comparePrereleaseIdentifier(left, right) {
+	const leftNumeric = /^\d+$/.test(left);
+	const rightNumeric = /^\d+$/.test(right);
+	if (leftNumeric && rightNumeric) return Number.parseInt(left, 10) - Number.parseInt(right, 10);
+	if (leftNumeric) return -1;
+	if (rightNumeric) return 1;
+	return left.localeCompare(right);
+}
+function compareCodexCliVersions(left, right) {
+	const parsedLeft = parseSemver(left);
+	const parsedRight = parseSemver(right);
+	if (!parsedLeft || !parsedRight) return left.localeCompare(right);
+	if (parsedLeft.major !== parsedRight.major) return parsedLeft.major - parsedRight.major;
+	if (parsedLeft.minor !== parsedRight.minor) return parsedLeft.minor - parsedRight.minor;
+	if (parsedLeft.patch !== parsedRight.patch) return parsedLeft.patch - parsedRight.patch;
+	if (parsedLeft.prerelease.length === 0 && parsedRight.prerelease.length === 0) return 0;
+	if (parsedLeft.prerelease.length === 0) return 1;
+	if (parsedRight.prerelease.length === 0) return -1;
+	const length = Math.max(parsedLeft.prerelease.length, parsedRight.prerelease.length);
+	for (let index = 0; index < length; index += 1) {
+		const leftIdentifier = parsedLeft.prerelease[index];
+		const rightIdentifier = parsedRight.prerelease[index];
+		if (leftIdentifier === void 0) return -1;
+		if (rightIdentifier === void 0) return 1;
+		const comparison = comparePrereleaseIdentifier(leftIdentifier, rightIdentifier);
+		if (comparison !== 0) return comparison;
+	}
+	return 0;
+}
+function parseCodexCliVersion(output) {
+	const match = CODEX_VERSION_PATTERN.exec(output);
+	if (!match?.[1]) return null;
+	if (!parseSemver(match[1])) return null;
+	return normalizeCodexVersion(match[1]);
+}
+function isCodexCliVersionSupported(version) {
+	return compareCodexCliVersions(version, MINIMUM_CODEX_CLI_VERSION) >= 0;
+}
+function formatCodexCliUpgradeMessage(version) {
+	return `Codex CLI ${version ? `v${version}` : "the installed version"} is too old for T3 Code. Upgrade to v${MINIMUM_CODEX_CLI_VERSION} or newer and restart T3 Code.`;
+}
+
 //#endregion
 //#region src/codexAppServerManager.ts
+const CODEX_VERSION_CHECK_TIMEOUT_MS = 4e3;
 const ANSI_ESCAPE_CHAR = String.fromCharCode(27);
 const ANSI_ESCAPE_REGEX = new RegExp(`${ANSI_ESCAPE_CHAR}\\[[0-9;]*m`, "g");
 const CODEX_STDERR_LOG_REGEX = /^\d{4}-\d{2}-\d{2}T\S+\s+(TRACE|DEBUG|INFO|WARN|ERROR)\s+\S+:\s+(.*)$/;
@@ -9499,6 +9590,11 @@ var CodexAppServerManager = class extends EventEmitter {
 			const codexOptions = readCodexProviderOptions(input);
 			const codexBinaryPath = codexOptions.binaryPath ?? "codex";
 			const codexHomePath = codexOptions.homePath;
+			this.assertSupportedCodexCliVersion({
+				binaryPath: codexBinaryPath,
+				cwd: resolvedCwd,
+				...codexHomePath ? { homePath: codexHomePath } : {}
+			});
 			const child = spawn(codexBinaryPath, ["app-server"], {
 				cwd: resolvedCwd,
 				env: {
@@ -10050,6 +10146,9 @@ var CodexAppServerManager = class extends EventEmitter {
 	emitEvent(event) {
 		this.emit("event", event);
 	}
+	assertSupportedCodexCliVersion(input) {
+		assertSupportedCodexCliVersion(input);
+	}
 	updateSession(context, updates) {
 		context.session = {
 			...context.session,
@@ -10139,6 +10238,37 @@ function readCodexProviderOptions(input) {
 		...options.homePath ? { homePath: options.homePath } : {}
 	};
 }
+function assertSupportedCodexCliVersion(input) {
+	const result = spawnSync(input.binaryPath, ["--version"], {
+		cwd: input.cwd,
+		env: {
+			...process.env,
+			...input.homePath ? { CODEX_HOME: input.homePath } : {}
+		},
+		encoding: "utf8",
+		shell: process.platform === "win32",
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		],
+		timeout: CODEX_VERSION_CHECK_TIMEOUT_MS,
+		maxBuffer: 1024 * 1024
+	});
+	if (result.error) {
+		const lower = result.error.message.toLowerCase();
+		if (lower.includes("enoent") || lower.includes("command not found") || lower.includes("not found")) throw new Error(`Codex CLI (${input.binaryPath}) is not installed or not executable.`);
+		throw new Error(`Failed to execute Codex CLI version check: ${result.error.message || String(result.error)}`);
+	}
+	const stdout = result.stdout ?? "";
+	const stderr = result.stderr ?? "";
+	if (result.status !== 0) {
+		const detail = stderr.trim() || stdout.trim() || `Command exited with code ${result.status}.`;
+		throw new Error(`Codex CLI version check failed. ${detail}`);
+	}
+	const parsedVersion = parseCodexCliVersion(`${stdout}\n${stderr}`);
+	if (parsedVersion && !isCodexCliVersionSupported(parsedVersion)) throw new Error(formatCodexCliUpgradeMessage(parsedVersion));
+}
 function readResumeCursorThreadId(resumeCursor) {
 	if (!resumeCursor || typeof resumeCursor !== "object" || Array.isArray(resumeCursor)) return;
 	const rawThreadId = resumeCursor.threadId;
@@ -11395,14 +11525,21 @@ function toRuntimeStatus(session) {
 		default: return "running";
 	}
 }
-function toRuntimePayloadFromSession(session) {
+function toRuntimePayloadFromSession(session, extra) {
 	return {
 		cwd: session.cwd ?? null,
 		model: session.model ?? null,
 		activeTurnId: session.activeTurnId ?? null,
-		lastError: session.lastError ?? null
+		lastError: session.lastError ?? null,
+		...extra?.providerOptions !== void 0 ? { providerOptions: extra.providerOptions } : {}
 	};
 }
+function readPersistedProviderOptions(runtimePayload) {
+	if (!runtimePayload || typeof runtimePayload !== "object" || Array.isArray(runtimePayload)) return;
+	const raw = "providerOptions" in runtimePayload ? runtimePayload.providerOptions : void 0;
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+	return raw;
+}
 function readPersistedCwd(runtimePayload) {
 	if (!runtimePayload || typeof runtimePayload !== "object" || Array.isArray(runtimePayload)) return;
 	const rawCwd = "cwd" in runtimePayload ? runtimePayload.cwd : void 0;
@@ -11418,13 +11555,13 @@ const makeProviderService = (options) => Effect.gen(function* () {
 	const runtimeEventQueue = yield* Queue.unbounded();
 	const runtimeEventPubSub = yield* PubSub.unbounded();
 	const publishRuntimeEvent = (event) => Effect.succeed(event).pipe(Effect.tap((canonicalEvent) => canonicalEventLogger ? canonicalEventLogger.write(canonicalEvent, null) : Effect.void), Effect.flatMap((canonicalEvent) => PubSub.publish(runtimeEventPubSub, canonicalEvent)), Effect.asVoid);
-	const upsertSessionBinding = (session, threadId) => directory.upsert({
+	const upsertSessionBinding = (session, threadId, extra) => directory.upsert({
 		threadId,
 		provider: session.provider,
 		runtimeMode: session.runtimeMode,
 		status: toRuntimeStatus(session),
 		...session.resumeCursor !== void 0 ? { resumeCursor: session.resumeCursor } : {},
-		runtimePayload: toRuntimePayloadFromSession(session)
+		runtimePayload: toRuntimePayloadFromSession(session, extra)
 	});
 	const providers = yield* registry.listProviders();
 	const adapters = yield* Effect.forEach(providers, (provider) => registry.getByProvider(provider));
@@ -11452,10 +11589,12 @@ const makeProviderService = (options) => Effect.gen(function* () {
 		}
 		if (!hasResumeCursor) return yield* toValidationError(input.operation, `Cannot recover thread '${input.binding.threadId}' because no provider resume state is persisted.`);
 		const persistedCwd = readPersistedCwd(input.binding.runtimePayload);
+		const persistedProviderOptions = readPersistedProviderOptions(input.binding.runtimePayload);
 		const resumed = yield* adapter.startSession({
 			threadId: input.binding.threadId,
 			provider: input.binding.provider,
 			...persistedCwd ? { cwd: persistedCwd } : {},
+			...persistedProviderOptions ? { providerOptions: persistedProviderOptions } : {},
 			...hasResumeCursor ? { resumeCursor: input.binding.resumeCursor } : {},
 			runtimeMode: input.binding.runtimeMode ?? "full-access"
 		});
@@ -11509,7 +11648,7 @@ const makeProviderService = (options) => Effect.gen(function* () {
 		const adapter = yield* registry.getByProvider(input.provider);
 		const session = yield* adapter.startSession(input);
 		if (session.provider !== adapter.provider) return yield* toValidationError("ProviderService.startSession", `Adapter/provider mismatch: requested '${adapter.provider}', received '${session.provider}'.`);
-		yield* upsertSessionBinding(session, threadId);
+		yield* upsertSessionBinding(session, threadId, { ...input.providerOptions !== void 0 ? { providerOptions: input.providerOptions } : {} });
 		yield* analytics.record("provider.session.started", {
 			provider: session.provider,
 			runtimeMode: input.runtimeMode,
@@ -15380,6 +15519,15 @@ const checkCodexProviderStatus = Effect.gen(function* () {
 			message: detail ? `Codex CLI is installed but failed to run. ${detail}` : "Codex CLI is installed but failed to run."
 		};
 	}
+	const parsedVersion = parseCodexCliVersion(`${version.stdout}\n${version.stderr}`);
+	if (parsedVersion && !isCodexCliVersionSupported(parsedVersion)) return {
+		provider: CODEX_PROVIDER,
+		status: "error",
+		available: false,
+		authStatus: "unknown",
+		checkedAt,
+		message: formatCodexCliUpgradeMessage(parsedVersion)
+	};
 	const authProbe = yield* runCodexCommand(["login", "status"]).pipe(Effect.timeoutOption(DEFAULT_TIMEOUT_MS), Effect.result);
 	if (Result.isFailure(authProbe)) {
 		const error = authProbe.failure;
@@ -16465,7 +16613,7 @@ const getTelemetryIdentifier = Effect.gen(function* () {
 
 //#endregion
 //#region package.json
-var version = "0.0.3";
+var version = "0.0.5";
 
 //#endregion
 //#region src/telemetry/Layers/AnalyticsService.ts