t3 0.0.0-alpha.21 → 0.0.0-alpha.22

package/dist/index.mjs

@@ -409,6 +409,18 @@ const ORCHESTRATION_WS_METHODS = {
 };
 const ORCHESTRATION_WS_CHANNELS = { domainEvent: "orchestration.domainEvent" };
 const ProviderKind = Schema.Literal("codex");
+const ProviderApprovalPolicy = Schema.Literals([
+	"untrusted",
+	"on-failure",
+	"on-request",
+	"never"
+]);
+const ProviderSandboxMode = Schema.Literals([
+	"read-only",
+	"workspace-write",
+	"danger-full-access"
+]);
+const ProviderServiceTier = Schema.Literals(["fast", "flex"]);
 const RuntimeMode = Schema.Literals(["approval-required", "full-access"]);
 const DEFAULT_RUNTIME_MODE$2 = "full-access";
 const ProviderInteractionMode = Schema.Literals(["default", "plan"]);
@@ -665,6 +677,7 @@ const ThreadTurnStartCommand = Schema.Struct({
 	}),
 	provider: Schema.optional(ProviderKind),
 	model: Schema.optional(TrimmedNonEmptyString),
+	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
 	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
 	runtimeMode: RuntimeMode.pipe(Schema.withDecodingDefault(() => DEFAULT_RUNTIME_MODE$2)),
@@ -683,6 +696,7 @@ const ClientThreadTurnStartCommand = Schema.Struct({
 	}),
 	provider: Schema.optional(ProviderKind),
 	model: Schema.optional(TrimmedNonEmptyString),
+	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
 	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
 	runtimeMode: RuntimeMode,
@@ -924,6 +938,7 @@ const ThreadTurnStartRequestedPayload = Schema.Struct({
 	messageId: MessageId,
 	provider: Schema.optional(ProviderKind),
 	model: Schema.optional(TrimmedNonEmptyString),
+	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
 	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
 	runtimeMode: RuntimeMode.pipe(Schema.withDecodingDefault(() => DEFAULT_RUNTIME_MODE$2)),
@@ -1296,6 +1311,9 @@ const ProviderSessionStartInput = Schema.Struct({
 	model: Schema.optional(TrimmedNonEmptyStringSchema$2),
 	modelOptions: Schema.optional(ProviderModelOptions),
 	resumeCursor: Schema.optional(Schema.Unknown),
+	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
+	approvalPolicy: Schema.optional(ProviderApprovalPolicy),
+	sandboxMode: Schema.optional(ProviderSandboxMode),
 	providerOptions: Schema.optional(ProviderStartOptions),
 	runtimeMode: RuntimeMode
 });
@@ -1304,6 +1322,7 @@ const ProviderSendTurnInput = Schema.Struct({
 	input: Schema.optional(TrimmedNonEmptyStringSchema$2.check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_INPUT_CHARS))),
 	attachments: Schema.optional(Schema.Array(ChatAttachment).check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_ATTACHMENTS))),
 	model: Schema.optional(TrimmedNonEmptyStringSchema$2),
+	serviceTier: Schema.optional(Schema.NullOr(ProviderServiceTier)),
 	modelOptions: Schema.optional(ProviderModelOptions),
 	interactionMode: Schema.optional(ProviderInteractionMode)
 });
@@ -4353,6 +4372,7 @@ const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand")(funct
 					messageId: command.message.messageId,
 					...command.provider !== void 0 ? { provider: command.provider } : {},
 					...command.model !== void 0 ? { model: command.model } : {},
+					...command.serviceTier !== void 0 ? { serviceTier: command.serviceTier } : {},
 					...command.modelOptions !== void 0 ? { modelOptions: command.modelOptions } : {},
 					assistantDeliveryMode: command.assistantDeliveryMode ?? DEFAULT_ASSISTANT_DELIVERY_MODE$1,
 					runtimeMode: readModel.threads.find((entry) => entry.id === command.threadId)?.runtimeMode ?? command.runtimeMode,
@@ -5795,6 +5815,7 @@ const make$1 = Effect.gen(function* () {
 			...input?.provider ?? preferredProvider ? { provider: input?.provider ?? preferredProvider } : {},
 			...effectiveCwd ? { cwd: effectiveCwd } : {},
 			...desiredModel ? { model: desiredModel } : {},
+			...options?.serviceTier !== void 0 ? { serviceTier: options.serviceTier } : {},
 			...options?.modelOptions !== void 0 ? { modelOptions: options.modelOptions } : {},
 			...input?.resumeCursor !== void 0 ? { resumeCursor: input.resumeCursor } : {},
 			runtimeMode: desiredRuntimeMode
@@ -5858,6 +5879,7 @@ const make$1 = Effect.gen(function* () {
 		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 } : {}
 		});
 		const normalizedInput = toNonEmptyProviderInput(input.messageText);
@@ -5869,6 +5891,7 @@ const make$1 = Effect.gen(function* () {
 			...normalizedInput ? { input: normalizedInput } : {},
 			...normalizedAttachments.length > 0 ? { attachments: normalizedAttachments } : {},
 			...modelForTurn !== void 0 ? { model: modelForTurn } : {},
+			...input.serviceTier !== void 0 ? { serviceTier: input.serviceTier } : {},
 			...input.modelOptions !== void 0 ? { modelOptions: input.modelOptions } : {},
 			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {}
 		});
@@ -5944,6 +5967,7 @@ const make$1 = Effect.gen(function* () {
 			...message.attachments !== void 0 ? { attachments: message.attachments } : {},
 			...event.payload.provider !== void 0 ? { provider: event.payload.provider } : {},
 			...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 } : {},
 			interactionMode: event.payload.interactionMode,
 			createdAt: event.payload.createdAt
@@ -8479,7 +8503,7 @@ function proposedPlanIdFromEvent(event, threadId) {
 	if (event.itemId) return `plan:${threadId}:item:${event.itemId}`;
 	return `plan:${threadId}:event:${event.eventId}`;
 }
-function asString$1(value) {
+function asString$2(value) {
 	return typeof value === "string" ? value : void 0;
 }
 function runtimePayloadRecord(event) {
@@ -8497,13 +8521,13 @@ function normalizeRuntimeTurnState(value) {
 	}
 }
 function runtimeTurnState(event) {
-	return normalizeRuntimeTurnState(asString$1(runtimePayloadRecord(event)?.state));
+	return normalizeRuntimeTurnState(asString$2(runtimePayloadRecord(event)?.state));
 }
 function runtimeTurnErrorMessage(event) {
-	return asString$1(runtimePayloadRecord(event)?.errorMessage);
+	return asString$2(runtimePayloadRecord(event)?.errorMessage);
 }
 function runtimeErrorMessageFromEvent(event) {
-	return asString$1(runtimePayloadRecord(event)?.message);
+	return asString$2(runtimePayloadRecord(event)?.message);
 }
 function orchestrationSessionStatusFromRuntimeState(state) {
 	switch (state) {
@@ -9133,6 +9157,43 @@ const RECOVERABLE_THREAD_RESUME_ERROR_SNIPPETS = [
 	"unknown thread",
 	"does not exist"
 ];
+const CODEX_DEFAULT_MODEL = "gpt-5.3-codex";
+const CODEX_SPARK_MODEL = "gpt-5.3-codex-spark";
+const CODEX_SPARK_DISABLED_PLAN_TYPES = new Set([
+	"free",
+	"go",
+	"plus"
+]);
+function asObject$1(value) {
+	if (!value || typeof value !== "object") return;
+	return value;
+}
+function asString$1(value) {
+	return typeof value === "string" ? value : void 0;
+}
+function readCodexAccountSnapshot(response) {
+	const record = asObject$1(response);
+	const account = asObject$1(record?.account) ?? record;
+	const accountType = asString$1(account?.type);
+	if (accountType === "apiKey") return {
+		type: "apiKey",
+		planType: null,
+		sparkEnabled: true
+	};
+	if (accountType === "chatgpt") {
+		const planType = account?.planType ?? "unknown";
+		return {
+			type: "chatgpt",
+			planType,
+			sparkEnabled: !CODEX_SPARK_DISABLED_PLAN_TYPES.has(planType)
+		};
+	}
+	return {
+		type: "unknown",
+		planType: null,
+		sparkEnabled: true
+	};
+}
 const CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Plan Mode (Conversational)
 
 You work in 3 phases, and you should *chat your way* to a great plan before finalizing it. A great plan is very detailed-intent- and implementation-wise-so that it can be handed to another engineer or agent to be implemented right away. It must be **decision complete**, where the implementer does not need to make any decisions.
@@ -9276,6 +9337,10 @@ function mapCodexRuntimeMode(runtimeMode) {
 		sandbox: "danger-full-access"
 	};
 }
+function resolveCodexModelForAccount(model, account) {
+	if (model !== CODEX_SPARK_MODEL || account.sparkEnabled) return model;
+	return CODEX_DEFAULT_MODEL;
+}
 /**
 * On Windows with `shell: true`, `child.kill()` only terminates the `cmd.exe`
 * wrapper, leaving the actual command running. Use `taskkill /T` to kill the
@@ -9390,6 +9455,11 @@ var CodexAppServerManager = class extends EventEmitter {
 			});
 			context = {
 				session,
+				account: {
+					type: "unknown",
+					planType: null,
+					sparkEnabled: true
+				},
 				child,
 				output: readline.createInterface({ input: child.stdout }),
 				pending: /* @__PURE__ */ new Map(),
@@ -9403,11 +9473,29 @@ var CodexAppServerManager = class extends EventEmitter {
 			this.emitLifecycleEvent(context, "session/connecting", "Starting codex app-server");
 			await this.sendRequest(context, "initialize", buildCodexInitializeParams());
 			this.writeMessage(context, { method: "initialized" });
-			const normalizedModel = normalizeCodexModelSlug(input.model);
+			try {
+				const modelListResponse = await this.sendRequest(context, "model/list", {});
+				console.log("codex model/list response", modelListResponse);
+			} catch (error) {
+				console.log("codex model/list failed", error);
+			}
+			try {
+				const accountReadResponse = await this.sendRequest(context, "account/read", {});
+				console.log("codex account/read response", accountReadResponse);
+				context.account = readCodexAccountSnapshot(accountReadResponse);
+				console.log("codex subscription status", {
+					type: context.account.type,
+					planType: context.account.planType,
+					sparkEnabled: context.account.sparkEnabled
+				});
+			} catch (error) {
+				console.log("codex account/read failed", error);
+			}
+			const normalizedModel = resolveCodexModelForAccount(normalizeCodexModelSlug(input.model), context.account);
 			const sessionOverrides = {
 				model: normalizedModel ?? null,
-				cwd: input.cwd ?? null,
 				...input.serviceTier !== void 0 ? { serviceTier: input.serviceTier } : {},
+				cwd: input.cwd ?? null,
 				...mapCodexRuntimeMode(input.runtimeMode ?? "full-access")
 			};
 			const threadStartParams = {
@@ -9520,10 +9608,10 @@ var CodexAppServerManager = class extends EventEmitter {
 			threadId: providerThreadId,
 			input: turnInput
 		};
-		const normalizedModel = normalizeCodexModelSlug(input.model ?? context.session.model);
+		const normalizedModel = resolveCodexModelForAccount(normalizeCodexModelSlug(input.model ?? context.session.model), context.account);
 		if (normalizedModel) turnStartParams.model = normalizedModel;
+		if (input.serviceTier !== void 0) turnStartParams.serviceTier = input.serviceTier;
 		if (input.effort) turnStartParams.effort = input.effort;
-		if (input.serviceTier) turnStartParams.serviceTier = input.serviceTier;
 		const collaborationMode = buildCodexCollaborationMode({
 			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {},
 			...normalizedModel !== void 0 ? { model: normalizedModel } : {},
@@ -11050,6 +11138,7 @@ const makeCodexAdapter = (options) => Effect.gen(function* () {
 					threadId: input.threadId,
 					...input.input !== void 0 ? { input: input.input } : {},
 					...input.model !== void 0 ? { model: input.model } : {},
+					...input.serviceTier !== void 0 ? { serviceTier: input.serviceTier } : {},
 					...input.modelOptions?.codex?.reasoningEffort !== void 0 ? { effort: input.modelOptions.codex.reasoningEffort } : {},
 					...input.modelOptions?.codex?.fastMode ? { serviceTier: "fast" } : {},
 					...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {},
@@ -11504,7 +11593,7 @@ const makeProviderService = (options) => Effect.gen(function* () {
 			turns: input.numTurns
 		});
 	});
-	const stopAll = () => Effect.gen(function* () {
+	const runStopAll = () => Effect.gen(function* () {
 		const threadIds = yield* directory.listThreadIds();
 		yield* Effect.forEach(adapters, (adapter) => adapter.stopAll()).pipe(Effect.asVoid);
 		yield* Effect.forEach(threadIds, (threadId) => directory.getProvider(threadId).pipe(Effect.flatMap((provider) => directory.upsert({
@@ -11520,6 +11609,7 @@ const makeProviderService = (options) => Effect.gen(function* () {
 		yield* analytics.record("provider.sessions.stopped_all", { sessionCount: threadIds.length });
 		yield* analytics.flush;
 	});
+	yield* Effect.addFinalizer(() => Effect.catch(runStopAll(), (cause) => Effect.logWarning("failed to stop provider service", { cause })));
 	return {
 		startSession,
 		sendTurn,
@@ -11530,7 +11620,6 @@ const makeProviderService = (options) => Effect.gen(function* () {
 		listSessions,
 		getCapabilities,
 		rollbackConversation,
-		stopAll,
 		streamEvents: Stream.fromPubSub(runtimeEventPubSub)
 	};
 });
@@ -15943,7 +16032,6 @@ const createServer = Effect.fn(function* () {
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const projectionReadModelQuery = yield* ProjectionSnapshotQuery;
 	const checkpointDiffQuery = yield* CheckpointDiffQuery;
-	const liveProviderService = yield* ProviderService;
 	const orchestrationReactor = yield* OrchestrationReactor;
 	const { openInEditor } = yield* Open;
 	const subscriptionsScope = yield* Scope.make("sequential");
@@ -16015,7 +16103,6 @@ const createServer = Effect.fn(function* () {
 		cause
 	})));
 	const runPromise = yield* Effect.map(Effect.services(), Effect.runPromiseWith);
-	yield* Effect.addFinalizer(() => Effect.catch(liveProviderService.stopAll(), (cause) => Effect.logWarning("failed to stop provider service", { cause })));
 	const unsubscribeTerminalEvents = yield* terminalManager.subscribe((event) => void Effect.runPromise(onTerminalEvent(event)));
 	yield* Effect.addFinalizer(() => Effect.sync(() => unsubscribeTerminalEvents()));
 	yield* NodeHttpServer.make(() => httpServer, listenOptions).pipe(Effect.mapError((cause) => new ServerLifecycleError({
@@ -16244,9 +16331,8 @@ const ServerLive = Layer.succeed(Server, {
 //#endregion
 //#region src/serverLogger.ts
 const ServerLoggerLive = Effect.gen(function* () {
-	const config = yield* Effect.serviceOption(ServerConfig$1);
-	if (Option.isNone(config)) return Logger.layer([Logger.defaultLogger]);
-	const logDir = path.join(config.value.stateDir, "logs");
+	const config = yield* ServerConfig$1;
+	const logDir = path.join(config.stateDir, "logs");
 	const logPath = path.join(logDir, "server.log");
 	yield* Effect.sync(() => {
 		fs.mkdirSync(logDir, { recursive: true });
@@ -16300,7 +16386,7 @@ const getTelemetryIdentifier = Effect.gen(function* () {
 
 //#endregion
 //#region package.json
-var version = "0.0.0-alpha.20";
+var version = "0.0.0-alpha.21";
 
 //#endregion
 //#region src/telemetry/Layers/AnalyticsService.ts