offsite 0.0.12 → 0.0.13

package/apps/server/dist/main.mjs

@@ -788,58 +788,31 @@ const modelSetting = z.strictObject({
 	hidden: z.boolean(),
 	effort: z.string().nullable()
 });
+const posixDir = z.string().refine((value) => path.posix.isAbsolute(value), "must be an absolute path").nullable().default(null);
+const platformDirs = z.strictObject({
+	macos: posixDir,
+	linux: posixDir,
+	windows: z.string().refine((value) => path.win32.isAbsolute(value), "must be an absolute path").nullable().default(null)
+}).prefault({});
+function accountSchema(provider) {
+	return z.strictObject({
+		id: z.string(),
+		provider: z.literal(provider),
+		name: z.string(),
+		configDir: platformDirs,
+		enabled: z.boolean().default(true),
+		hiddenModels: z.record(z.string(), z.boolean()).default({})
+	});
+}
 const configSchema = z.strictObject({
-	claudeBaseDir: z.string().refine((value) => path.isAbsolute(value), "must be an absolute path").default(path.join(os.homedir(), ".claude")),
+	claudeBaseDir: platformDirs,
+	claudeAccounts: z.array(accountSchema("claude")).default([]),
+	codexAccounts: z.array(accountSchema("codex")).default([]),
 	enabledProviders: z.strictObject({
 		claude: z.boolean().default(true),
 		codex: z.boolean().default(true),
 		opencode: z.boolean().default(true)
 	}).prefault({}),
-	composer: z.strictObject({
-		provider: z.enum([
-			"claude",
-			"codex",
-			"opencode"
-		]).default("claude"),
-		claude: z.strictObject({
-			accountId: z.string().nullable().default(null),
-			model: z.string().nullable().default(null),
-			effort: z.enum([
-				"low",
-				"medium",
-				"high",
-				"xhigh",
-				"max"
-			]).nullable().default(null),
-			mode: z.enum([
-				"default",
-				"acceptEdits",
-				"bypassPermissions",
-				"plan",
-				"dontAsk",
-				"auto"
-			]).nullable().default("bypassPermissions"),
-			plan: z.boolean().default(false)
-		}).prefault({}),
-		codex: z.strictObject({
-			accountId: z.string().nullable().default(null),
-			model: z.string().nullable().default(null),
-			effort: z.string().nullable().default(null),
-			mode: z.enum([
-				"read-only",
-				"auto",
-				"full-access"
-			]).nullable().default("auto"),
-			plan: z.boolean().default(false)
-		}).prefault({}),
-		opencode: z.strictObject({
-			accountId: z.null().default(null),
-			model: z.string().nullable().default(null),
-			effort: z.string().nullable().default(null),
-			mode: z.string().nullable().default(null),
-			plan: z.boolean().default(false)
-		}).prefault({})
-	}).prefault({}),
 	commitMessage: z.strictObject({
 		provider: z.enum([
 			"claude",
@@ -876,13 +849,16 @@ const configSchema = z.strictObject({
 		}).prefault({})
 	}).prefault({})
 });
-const defaults = configSchema.parse({});
+const defaults$1 = configSchema.parse({});
 function platform() {
 	if (process.platform === "darwin") return "macos";
 	if (process.platform === "linux") return "linux";
 	if (process.platform === "win32") return "windows";
 	throw new Error(`unsupported platform ${process.platform}`);
 }
+function claudeBaseDir() {
+	return readConfig().claudeBaseDir[platform()] ?? path.join(os.homedir(), ".claude");
+}
 function defaultShell() {
 	if (process.platform === "win32") return process.env.COMSPEC ?? "cmd.exe";
 	return os.userInfo().shell ?? "/bin/sh";
@@ -890,9 +866,10 @@ function defaultShell() {
 function configInfo() {
 	return {
 		config: readConfig(),
-		defaults,
+		defaults: defaults$1,
 		platform: platform(),
-		defaultShell: defaultShell()
+		defaultShell: defaultShell(),
+		defaultClaudeBaseDir: path.join(os.homedir(), ".claude")
 	};
 }
 function readConfig() {
@@ -901,13 +878,13 @@ function readConfig() {
 		user = readJson("config.json");
 	} catch (error) {
 		console.warn(`invalid ${configFile}, using the default config: ${error}`);
-		return structuredClone(defaults);
+		return structuredClone(defaults$1);
 	}
-	if (user === null) return structuredClone(defaults);
+	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);
+		return structuredClone(defaults$1);
 	}
 	return result.data;
 }
@@ -915,7 +892,7 @@ function saveConfig(value) {
 	const result = configSchema.safeParse(value);
 	if (!result.success) throw new Error(z.prettifyError(result.error));
 	writeJson("config.json", result.data);
-	process.env.CLAUDE_CONFIG_DIR = result.data.claudeBaseDir;
+	process.env.CLAUDE_CONFIG_DIR = claudeBaseDir();
 	broadcast({
 		type: "config",
 		config: result.data
@@ -2723,7 +2700,7 @@ async function find(provider, paths) {
 }
 function watchSessions() {
 	for (const watcher of watchers) watcher.close();
-	watchers = [["claude", path.join(readConfig().claudeBaseDir, "projects")], ["codex", path.join(codexBaseDir, "sessions")]].flatMap(([provider, dir]) => {
+	watchers = [["claude", path.join(claudeBaseDir(), "projects")], ["codex", path.join(codexBaseDir, "sessions")]].flatMap(([provider, dir]) => {
 		if (!readConfig().enabledProviders[provider]) return [];
 		try {
 			const watcher = watch(dir, { recursive: true }, () => refreshSessions(provider));
@@ -2919,14 +2896,15 @@ function providerName(provider) {
 	return providerNames[provider];
 }
 function storedAccounts() {
-	return (readJson("accounts.json") ?? []).map((item) => ({
-		id: item.id,
-		provider: item.provider,
-		name: item.name,
-		configDir: item.configDir,
-		enabled: item.enabled ?? true,
-		hiddenModels: item.hiddenModels ?? {}
-	}));
+	const config = readConfig();
+	return [...config.claudeAccounts, ...config.codexAccounts].flatMap((item) => {
+		const configDir = item.configDir[platform()];
+		if (configDir === null) return [];
+		return [{
+			...item,
+			configDir
+		}];
+	});
 }
 function assertEnabled(provider, accountId) {
 	if (!readConfig().enabledProviders[provider]) throw new Error(`${providerName(provider)} is disabled in Settings`);
@@ -3025,29 +3003,50 @@ function providerCapabilities(provider, accountId, cwd) {
 	}
 }
 function addAccount(provider, name, configDir) {
-	saveAccounts([...storedAccounts(), {
-		id: randomUUID(),
-		provider,
-		...validAccount(name, configDir),
-		enabled: true,
-		hiddenModels: {}
-	}]);
+	const account = validAccount(name, configDir);
+	const config = readConfig();
+	const key = `${provider}Accounts`;
+	saveConfig({
+		...config,
+		[key]: [...config[key], {
+			id: randomUUID(),
+			provider,
+			name: account.name,
+			configDir: { [platform()]: account.configDir },
+			enabled: true,
+			hiddenModels: {}
+		}]
+	});
 }
 async function updateAccount(update) {
 	const before = storedAccounts().find((item) => item.id === update.id);
 	if (before === void 0) throw new Error("That account was removed");
 	const account = validAccount(update.name, update.configDir);
-	saveAccounts(storedAccounts().map((item) => item.id === update.id ? {
-		...item,
-		...account,
-		enabled: update.enabled,
-		hiddenModels: update.hiddenModels
-	} : item));
+	const config = readConfig();
+	const key = `${before.provider}Accounts`;
+	saveConfig({
+		...config,
+		[key]: config[key].map((item) => item.id === update.id ? {
+			...item,
+			name: account.name,
+			configDir: {
+				...item.configDir,
+				[platform()]: account.configDir
+			},
+			enabled: update.enabled,
+			hiddenModels: update.hiddenModels
+		} : item)
+	});
 	forgetClaude(update.id);
 	if (before.enabled && !update.enabled) await stopAccount(before);
 }
 function removeAccount(id) {
-	saveAccounts(storedAccounts().filter((item) => item.id !== id));
+	const config = readConfig();
+	saveConfig({
+		...config,
+		claudeAccounts: config.claudeAccounts.filter((item) => item.id !== id),
+		codexAccounts: config.codexAccounts.filter((item) => item.id !== id)
+	});
 	forgetClaude(id);
 }
 function validAccount(name, configDir) {
@@ -3063,9 +3062,6 @@ function validAccount(name, configDir) {
 	};
 	throw new Error("Use an absolute config directory or one starting with ~/");
 }
-function saveAccounts(items) {
-	writeJson("accounts.json", items);
-}
 //#endregion
 //#region src/lib/claude/claude.ts
 const efforts = [
@@ -3239,7 +3235,7 @@ async function recordUsage(accountId, probe) {
 	}
 }
 function isLinked(configDir) {
-	const base = readConfig().claudeBaseDir;
+	const base = claudeBaseDir();
 	try {
 		if (realpathSync(configDir) === realpathSync(base)) return true;
 		return realpathSync(path.join(configDir, "projects")) === realpathSync(path.join(base, "projects"));
@@ -3695,7 +3691,7 @@ function text$1(value) {
 //#endregion
 //#region src/lib/claude/history.ts
 async function sessionFile(sessionId) {
-	const projectsDir = path.join(readConfig().claudeBaseDir, "projects");
+	const projectsDir = path.join(claudeBaseDir(), "projects");
 	for (const dir of await readdir(projectsDir)) {
 		const file = path.join(projectsDir, dir, `${sessionId}.jsonl`);
 		try {
@@ -5624,6 +5620,81 @@ function send(connection, event) {
 	});
 }
 //#endregion
+//#region src/storage/state.ts
+const stateFile = path.join(home, "state.json");
+const stateSchema = z.strictObject({ composer: z.strictObject({
+	provider: z.enum([
+		"claude",
+		"codex",
+		"opencode"
+	]).default("claude"),
+	claude: z.strictObject({
+		accountId: z.string().nullable().default(null),
+		model: z.string().nullable().default(null),
+		effort: z.enum([
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		]).nullable().default(null),
+		mode: z.enum([
+			"default",
+			"acceptEdits",
+			"bypassPermissions",
+			"plan",
+			"dontAsk",
+			"auto"
+		]).nullable().default("bypassPermissions"),
+		plan: z.boolean().default(false)
+	}).prefault({}),
+	codex: z.strictObject({
+		accountId: z.string().nullable().default(null),
+		model: z.string().nullable().default(null),
+		effort: z.string().nullable().default(null),
+		mode: z.enum([
+			"read-only",
+			"auto",
+			"full-access"
+		]).nullable().default("auto"),
+		plan: z.boolean().default(false)
+	}).prefault({}),
+	opencode: z.strictObject({
+		accountId: z.null().default(null),
+		model: z.string().nullable().default(null),
+		effort: z.string().nullable().default(null),
+		mode: z.string().nullable().default(null),
+		plan: z.boolean().default(false)
+	}).prefault({})
+}).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;
+}
+function saveComposer(value) {
+	const result = stateSchema.safeParse({ composer: value });
+	if (!result.success) throw new Error(z.prettifyError(result.error));
+	writeJson("state.json", result.data);
+	broadcast({
+		type: "composer",
+		composer: result.data.composer
+	});
+	return result.data.composer;
+}
+//#endregion
 //#region src/api/socket.ts
 const handlers = {
 	ping: () => null,
@@ -5631,6 +5702,7 @@ const handlers = {
 		refreshAll();
 		return {
 			...configInfo(),
+			composer: readComposer(),
 			hostname: os.hostname(),
 			projects: projects$1(),
 			sessions: sessions(),
@@ -5639,6 +5711,8 @@ const handlers = {
 		};
 	},
 	"config.get": () => configInfo(),
+	"composer.get": () => readComposer(),
+	"composer.save": (params) => saveComposer(params),
 	"config.save": async (params) => {
 		const before = readConfig();
 		const saved = saveConfig(params);
@@ -5647,7 +5721,7 @@ const handlers = {
 			"codex",
 			"opencode"
 		]) if (before.enabledProviders[provider] && !saved.enabledProviders[provider]) await stopProvider(provider);
-		if (saved.claudeBaseDir === before.claudeBaseDir && JSON.stringify(saved.enabledProviders) === JSON.stringify(before.enabledProviders)) return saved;
+		if (JSON.stringify(saved.claudeBaseDir) === JSON.stringify(before.claudeBaseDir) && JSON.stringify(saved.enabledProviders) === JSON.stringify(before.enabledProviders)) return saved;
 		watchSessions();
 		refreshAll();
 		publishAccounts();
@@ -5907,7 +5981,7 @@ if (args.command === "unpair") {
 	process.exit(0);
 }
 lockHome();
-process.env.CLAUDE_CONFIG_DIR = readConfig().claudeBaseDir;
+process.env.CLAUDE_CONFIG_DIR = claudeBaseDir();
 watchSessions();
 refreshAll();
 if (findClaude() === null) {