offsite 0.0.44 → 0.0.46

package/apps/server/dist/main.mjs

@@ -171,6 +171,43 @@ function readJson(name) {
 		throw error;
 	}
 }
+function readSettings(name, schema, defaults) {
+	const file = path.join(home, name);
+	let value;
+	try {
+		value = readJson(name);
+	} catch (error) {
+		console.warn(`invalid ${file}, using the defaults: ${error}`);
+		return structuredClone(defaults);
+	}
+	if (value === null) return structuredClone(defaults);
+	let result = schema.safeParse(value);
+	if (result.success) return result.data;
+	while (!result.success) {
+		const issue = result.error.issues[0];
+		const targets = issue.code === "unrecognized_keys" ? issue.keys.map((key) => [...issue.path, key]) : [issue.path];
+		for (const target of targets) {
+			const discarded = discard(value, target);
+			if (discarded === null) {
+				console.warn(`invalid ${file}, using the defaults:\n${z.prettifyError(result.error)}`);
+				return structuredClone(defaults);
+			}
+			console.warn(`${file}: discarded ${discarded.map(String).join(".")} (${issue.message} at ${target.map(String).join(".")})`);
+		}
+		result = schema.safeParse(value);
+	}
+	writeJson(name, result.data);
+	return result.data;
+}
+function discard(value, target) {
+	const key = target.at(0);
+	if (key === void 0 || typeof value !== "object" || value === null || !Object.hasOwn(value, key)) return null;
+	const inner = target.length > 1 ? discard(Reflect.get(value, key), target.slice(1)) : null;
+	if (inner !== null) return [key, ...inner];
+	if (Array.isArray(value)) value.splice(Number(key), 1);
+	else Reflect.deleteProperty(value, key);
+	return [key];
+}
 function writeJson(name, value) {
 	let file = path.join(home, name);
 	mkdirSync(home, { recursive: true });
@@ -880,7 +917,6 @@ function record$1(value) {
 }
 //#endregion
 //#region src/storage/config.ts
-const configFile = path.join(home, "config.json");
 const modelSetting = z.strictObject({
 	hidden: z.boolean(),
 	effort: z.string().nullable()
@@ -901,8 +937,7 @@ function accountSchema(provider) {
 		name: z.string(),
 		color: z.string().regex(/^#[0-9a-f]{6}$/i, "must be a hex color like #3b82f6").nullable().default(null),
 		configDir: platformDirs,
-		enabled: z.boolean().default(true),
-		hiddenModels: z.record(z.string(), z.boolean()).default({})
+		enabled: z.boolean().default(true)
 	});
 }
 const configSchema = z.strictObject({
@@ -919,6 +954,19 @@ const configSchema = z.strictObject({
 		codex: z.boolean().default(true),
 		opencode: z.boolean().default(true)
 	}).prefault({}),
+	newThreads: z.strictObject({
+		provider: z.enum([
+			"claude",
+			"codex",
+			"opencode"
+		]).default("claude"),
+		accountId: z.string().nullable().default(null),
+		models: z.strictObject({
+			claude: z.string().nullable().default(null),
+			codex: z.string().nullable().default(null),
+			opencode: z.string().nullable().default(null)
+		}).prefault({})
+	}).prefault({}),
 	commitMessage: z.strictObject({
 		provider: z.enum([
 			"claude",
@@ -981,20 +1029,7 @@ function configInfo() {
 	};
 }
 function readConfig() {
-	let user;
-	try {
-		user = readJson("config.json");
-	} catch (error) {
-		console.warn(`invalid ${configFile}, using the default config: ${error}`);
-		return structuredClone(defaults$1);
-	}
-	if (user === null) return structuredClone(defaults$1);
-	const result = configSchema.safeParse(user);
-	if (!result.success) {
-		console.warn(`invalid ${configFile}, using the default config:\n${z.prettifyError(result.error)}`);
-		return structuredClone(defaults$1);
-	}
-	return result.data;
+	return readSettings("config.json", configSchema, defaults$1);
 }
 function saveConfig(value) {
 	const result = configSchema.safeParse(value);
@@ -4675,7 +4710,6 @@ async function capabilities(provider, accountId, cwd) {
 	assertEnabled(provider, accountId);
 	const result = await providerCapabilities(provider, accountId, cwd);
 	const settings = readConfig().models[provider];
-	const overrides = provider === "opencode" ? {} : storedAccount(provider, accountId).hiddenModels;
 	return {
 		...result,
 		defaultModel: defaultModels[provider],
@@ -4690,7 +4724,7 @@ async function capabilities(provider, accountId, cwd) {
 			return {
 				...model,
 				deprecated,
-				hidden: overrides[model.value] ?? setting.hidden,
+				hidden: setting.hidden,
 				effort: setting.effort ?? effort
 			};
 		})
@@ -4717,8 +4751,7 @@ function addAccount(provider, name, configDir) {
 			name: account.name,
 			color: null,
 			configDir: { [platform()]: account.configDir },
-			enabled: true,
-			hiddenModels: {}
+			enabled: true
 		}]
 	});
 }
@@ -4738,8 +4771,7 @@ async function updateAccount(update) {
 				...item.configDir,
 				[platform()]: account.configDir
 			},
-			enabled: update.enabled,
-			hiddenModels: update.hiddenModels
+			enabled: update.enabled
 		} : item)
 	});
 	forgetClaude(update.id);
@@ -6424,7 +6456,6 @@ function savePastedImage(type, data) {
 }
 //#endregion
 //#region src/storage/state.ts
-const stateFile = path.join(home, "state.json");
 const stateSchema = z.strictObject({ composer: z.strictObject({
 	provider: z.enum([
 		"claude",
@@ -6472,20 +6503,7 @@ const stateSchema = z.strictObject({ composer: z.strictObject({
 }).prefault({}) });
 const defaults = stateSchema.parse({});
 function readComposer() {
-	let user;
-	try {
-		user = readJson("state.json");
-	} catch (error) {
-		console.warn(`invalid ${stateFile}, using the default state: ${error}`);
-		return structuredClone(defaults.composer);
-	}
-	if (user === null) return structuredClone(defaults.composer);
-	const result = stateSchema.safeParse(user);
-	if (!result.success) {
-		console.warn(`invalid ${stateFile}, using the default state:\n${z.prettifyError(result.error)}`);
-		return structuredClone(defaults.composer);
-	}
-	return result.data.composer;
+	return readSettings("state.json", stateSchema, defaults).composer;
 }
 function saveComposer(value) {
 	const result = stateSchema.safeParse({ composer: value });