macroclaw 0.38.0 → 0.40.0

package/README.md

@@ -43,12 +43,12 @@ Settings are stored in `~/.macroclaw/settings.json` and validated on startup.
 | `chatId`       | `AUTHORIZED_CHAT_ID`   | —                          | Yes      |
 | `model`        | `MODEL`                | `sonnet`                   | No       |
 | `workspace`    | `WORKSPACE`            | `~/.macroclaw-workspace`   | No       |
-| `timezone`     | `TIMEZONE`             | `UTC`                      | No       |
+| `timeZone`     | `TIMEZONE`             | `UTC`                      | No       |
 | `openaiApiKey` | `OPENAI_API_KEY`       | —                          | No       |
 | `logLevel`     | `LOG_LEVEL`            | `info`                     | No       |
 | `pinoramaUrl`  | `PINORAMA_URL`         | —                          | No       |
 
-**`timezone`** sets the agent's local timezone (IANA format, e.g. `Europe/Prague`, `America/New_York`). Used for the agent's clock display and scheduled event timing.
+**`timeZone`** sets the agent's local time zone (IANA format, e.g. `Europe/Prague`, `America/New_York`). Used for the agent's clock display and scheduled event timing.
 
 **`openaiApiKey`** is used for voice message transcription via [OpenAI Whisper](https://platform.openai.com/docs/guides/speech-to-text). Without it, voice messages are ignored.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macroclaw",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "description": "Telegram-to-Claude-Code bridge",
   "license": "MIT",
   "type": "module",

package/src/app.test.ts

@@ -133,7 +133,7 @@ function makeConfig(overrides?: Partial<AppConfig>): AppConfig {
     authorizedChatId: "12345",
     workspace: "/tmp/macroclaw-test-workspace",
     model: "sonnet",
-    timezone: "UTC",
+    timeZone: "UTC",
     settingsDir: tmpSettingsDir,
     claude: defaultMockClaude(),
     stt: mockStt(),

package/src/app.ts

@@ -12,7 +12,7 @@ export interface AppConfig {
   authorizedChatId: string;
   workspace: string;
   model: string;
-  timezone: string;
+  timeZone: string;
   settingsDir?: string;
   claude?: Claude;
   stt?: SpeechToText;
@@ -30,7 +30,7 @@ export class App {
     this.#orchestrator = new Orchestrator({
       model: config.model,
       workspace: config.workspace,
-      timezone: config.timezone,
+      timeZone: config.timeZone,
       settingsDir: config.settingsDir,
       claude: config.claude,
       healthCheckInterval: config.healthCheckInterval,
@@ -51,7 +51,7 @@ export class App {
   start() {
     log.info("Starting macroclaw...");
     const scheduler = new Scheduler(this.#config.workspace, {
-      timezone: this.#config.timezone,
+      timeZone: this.#config.timeZone,
       onJob: (name, prompt, model, missed) => this.#orchestrator.handleCron(name, prompt, model, missed),
     });
     scheduler.start();

package/src/index.ts

@@ -40,7 +40,7 @@ export async function start(): Promise<void> {
     authorizedChatId: resolved.chatId,
     workspace,
     model: resolved.model,
-    timezone: resolved.timezone,
+    timeZone: resolved.timeZone,
     stt: resolved.openaiApiKey ? new SpeechToText(resolved.openaiApiKey) : undefined,
   };
 

package/src/orchestrator.test.ts

@@ -117,7 +117,7 @@ function makeOrchestrator(claude: Claude, extraConfig?: Partial<OrchestratorConf
   const orch = new Orchestrator({
     workspace: TEST_WORKSPACE,
     model: "sonnet",
-    timezone: "UTC",
+    timeZone: "UTC",
     settingsDir: tmpSettingsDir,
     onResponse,
     claude,
@@ -1156,7 +1156,7 @@ describe("Orchestrator", () => {
       const orch = new Orchestrator({
         workspace: TEST_WORKSPACE,
         model: "sonnet",
-        timezone: "UTC",
+        timeZone: "UTC",
         settingsDir: tmpSettingsDir,
         onResponse: failingOnResponse,
         claude,

package/src/orchestrator.ts

@@ -92,7 +92,7 @@ interface SessionInfo {
 export interface OrchestratorConfig {
   model: string;
   workspace: string;
-  timezone: string;
+  timeZone: string;
   settingsDir?: string;
   onResponse: (response: OrchestratorResponse) => Promise<void>;
   claude?: Claude;
@@ -119,8 +119,8 @@ export class Orchestrator {
 
   constructor(config: OrchestratorConfig) {
     this.#config = config;
-    this.#prompts = new PromptBuilder(config.timezone);
-    const envVars: Record<string, string> = { TZ: config.timezone };
+    this.#prompts = new PromptBuilder(config.timeZone);
+    const envVars: Record<string, string> = { TZ: config.timeZone };
     this.#claude = config.claude ?? new Claude({ workspace: config.workspace, systemPrompt: this.#prompts.systemPrompt, envVars });
     this.#waitThreshold = config.waitThreshold ?? WAIT_THRESHOLD;
     this.#healthCheckInterval = config.healthCheckInterval ?? HEALTH_CHECK_INTERVAL_MS;

package/src/prompt-builder.test.ts

@@ -51,7 +51,7 @@ describe("systemPrompt", () => {
     expect(p.systemPrompt).toContain("opus");
   });
 
-  it("includes timezone but not a fixed date", () => {
+  it("includes time zone but not a fixed date", () => {
     const prague = new PromptBuilder("Europe/Prague");
     expect(prague.systemPrompt).not.toContain("Current date:");
     expect(prague.systemPrompt).toContain("Timezone: Europe/Prague");

package/src/prompt-builder.ts

@@ -82,18 +82,18 @@ interface BuildXmlFields {
 }
 
 export class PromptBuilder {
-  readonly #timezone: string;
+  readonly #timeZone: string;
 
-  constructor(timezone: string) {
-    this.#timezone = timezone;
+  constructor(timeZone: string) {
+    this.#timeZone = timeZone;
   }
 
   get systemPrompt(): string {
-    return `${SYSTEM_PROMPT_BASE}\n\nTimezone: ${this.#timezone}. TZ env var is set — \`date\` and other CLI tools return local time.`;
+    return `${SYSTEM_PROMPT_BASE}\n\nTimezone: ${this.#timeZone}. TZ env var is set — \`date\` and other CLI tools return local time.`;
   }
 
   #localTime(): string {
-    return DateTime.now().setZone(this.#timezone).toFormat("yyyy-MM-dd'T'HH:mm");
+    return DateTime.now().setZone(this.#timeZone).toFormat("yyyy-MM-dd'T'HH:mm");
   }
 
   static #escapeXml(text: string): string {

package/src/scheduler.test.ts

@@ -73,7 +73,7 @@ describe("Scheduler — cron jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -86,7 +86,7 @@ describe("Scheduler — cron jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -102,7 +102,7 @@ describe("Scheduler — cron jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -119,7 +119,7 @@ describe("Scheduler — cron jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -134,7 +134,7 @@ describe("Scheduler — cron jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -147,7 +147,7 @@ describe("Scheduler — cron jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -164,7 +164,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -181,7 +181,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -197,7 +197,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -214,7 +214,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -236,7 +236,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -252,7 +252,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -273,7 +273,7 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -290,14 +290,14 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
 		expect(onJob).toHaveBeenCalledWith("smart", "think", "opus");
 	});
 
-	it("interprets offset-less fireAt in the configured timezone", () => {
+	it("interprets offset-less fireAt in the configured time zone", () => {
 		// Create a fireAt 30 seconds ago in Europe/Prague local time (no offset)
 		const now = new Date();
 		const pragueStr = now.toLocaleString("en-US", { timeZone: "Europe/Prague" });
@@ -312,21 +312,21 @@ describe("Scheduler — fireAt jobs", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "Europe/Prague", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "Europe/Prague", onJob });
 		s.start();
 		s.stop();
 
 		expect(onJob).toHaveBeenCalledWith("local", "local time", undefined);
 	});
 
-	it("preserves explicit offset in fireAt (ignores configured timezone)", () => {
+	it("preserves explicit offset in fireAt (ignores configured time zone)", () => {
 		// fireAt with explicit +00:00 offset, 30s ago — should fire regardless of configured tz
 		writeScheduleConfig({
 			jobs: [{ name: "explicit", fireAt: justNowFireAt(), prompt: "with offset" }],
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "Asia/Tokyo", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "Asia/Tokyo", onJob });
 		s.start();
 		s.stop();
 
@@ -342,7 +342,7 @@ describe("Scheduler — fireAt jobs", () => {
 		chmodSync(SCHEDULE_FILE, 0o444);
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -357,7 +357,7 @@ describe("Scheduler — validation and edge cases", () => {
 		rmSync(SCHEDULE_FILE, { force: true });
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -368,7 +368,7 @@ describe("Scheduler — validation and edge cases", () => {
 		writeFileSync(SCHEDULE_FILE, "not json{{{");
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -379,7 +379,7 @@ describe("Scheduler — validation and edge cases", () => {
 		writeScheduleConfig({ jobs: "not-array" });
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -392,7 +392,7 @@ describe("Scheduler — validation and edge cases", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -405,7 +405,7 @@ describe("Scheduler — validation and edge cases", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -420,7 +420,7 @@ describe("Scheduler — validation and edge cases", () => {
 		writeScheduleConfig({ jobs: [] });
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop(); // should not throw
 	});
@@ -431,7 +431,7 @@ describe("Scheduler — validation and edge cases", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 
@@ -439,7 +439,7 @@ describe("Scheduler — validation and edge cases", () => {
 
 		// Start again with a new instance — the lastMinute tracker is per-instance
 		const onJob2 = makeOnJob();
-		const s2 = new Scheduler(TEST_DIR, { timezone: "UTC", onJob: onJob2 });
+		const s2 = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob: onJob2 });
 		s2.start();
 		s2.stop();
 
@@ -452,7 +452,7 @@ describe("Scheduler — validation and edge cases", () => {
 		});
 
 		const onJob = makeOnJob();
-		const s = new Scheduler(TEST_DIR, { timezone: "UTC", onJob });
+		const s = new Scheduler(TEST_DIR, { timeZone: "UTC", onJob });
 		s.start();
 		s.stop();
 

package/src/scheduler.ts

@@ -28,7 +28,7 @@ export interface MissedInfo {
 }
 
 export interface SchedulerConfig {
-	timezone: string;
+	timeZone: string;
 	onJob: (name: string, prompt: string, model?: string, missed?: MissedInfo) => void;
 }
 
@@ -39,13 +39,13 @@ export class Scheduler {
 	#lastMinute = -1;
 	#schedulePath: string;
 	#config: SchedulerConfig;
-	#timezone: string;
+	#timeZone: string;
 	#timer: Timer | null = null;
 
 	constructor(workspace: string, config: SchedulerConfig) {
 		this.#schedulePath = join(workspace, "data", "schedule.json");
 		this.#config = config;
-		this.#timezone = config.timezone;
+		this.#timeZone = config.timeZone;
 	}
 
 	start(): void {
@@ -120,7 +120,7 @@ export class Scheduler {
 
 	#evaluateCronJob(job: { name: string; cron: string; prompt: string; model?: string }, now: Date): void {
 		try {
-			const interval = CronExpressionParser.parse(job.cron, { tz: this.#timezone });
+			const interval = CronExpressionParser.parse(job.cron, { tz: this.#timeZone });
 			const prev = interval.prev();
 			const diff = Math.abs(now.getTime() - prev.getTime());
 			if (diff < 60_000) {
@@ -132,22 +132,22 @@ export class Scheduler {
 		}
 	}
 
-	/** Parse a fireAt string, interpreting offset-less timestamps in the given timezone. */
-	static #parseFireAt(fireAt: string, timezone: string): Date {
+	/** Parse a fireAt string, interpreting offset-less timestamps in the given time zone. */
+	static #parseFireAt(fireAt: string, timeZone: string): Date {
 		const probe = DateTime.fromISO(fireAt, { setZone: true });
 		if (probe.isValid && probe.isOffsetFixed) {
 			// Has explicit offset (Z, +HH:MM, etc.) — use as-is
 			return probe.toJSDate();
 		}
-		// No offset — interpret as local time in the configured timezone
-		return DateTime.fromISO(fireAt, { zone: timezone }).toJSDate();
+		// No offset — interpret as local time in the configured time zone
+		return DateTime.fromISO(fireAt, { zone: timeZone }).toJSDate();
 	}
 
 	#evaluateFireAtJob(
 		job: { name: string; fireAt: string; prompt: string; model?: string },
 		now: Date,
 	): "remove" | "keep" {
-		const fireAt = Scheduler.#parseFireAt(job.fireAt, this.#timezone);
+		const fireAt = Scheduler.#parseFireAt(job.fireAt, this.#timeZone);
 		if (Number.isNaN(fireAt.getTime())) {
 			log.warn({ name: job.name, fireAt: job.fireAt }, "Invalid fireAt date");
 			return "keep";

package/src/settings.test.ts

@@ -10,7 +10,7 @@ const validSettings: Settings = {
   chatId: "12345678",
   model: "sonnet",
   workspace: "~/.macroclaw-workspace",
-  timezone: "UTC",
+  timeZone: "UTC",
   logLevel: "debug",
 };
 
@@ -40,7 +40,7 @@ describe("SettingsManager.load", () => {
       chatId: "12345678",
       model: "sonnet",
       workspace: "~/.macroclaw-workspace",
-      timezone: "UTC",
+      timeZone: "UTC",
       logLevel: "info",
     });
   });
@@ -52,7 +52,7 @@ describe("SettingsManager.load", () => {
       chatId: " 12345678 ",
       model: " opus ",
       workspace: "  /custom/workspace  ",
-      timezone: "  Europe/Prague  ",
+      timeZone: "  Europe/Prague  ",
       openaiApiKey: "  sk-test  ",
       logLevel: " warn ",
       pinoramaUrl: "  http://localhost:6200  ",
@@ -63,7 +63,7 @@ describe("SettingsManager.load", () => {
       chatId: "12345678",
       model: "opus",
       workspace: "/custom/workspace",
-      timezone: "Europe/Prague",
+      timeZone: "Europe/Prague",
       openaiApiKey: "sk-test",
       logLevel: "warn",
       pinoramaUrl: "http://localhost:6200",
@@ -87,7 +87,7 @@ describe("SettingsManager.load", () => {
       chatId: "123",
       model: "opus",
       workspace: "/custom",
-      timezone: "UTC",
+      timeZone: "UTC",
       openaiApiKey: "sk-test",
       logLevel: "info",
       pinoramaUrl: "http://localhost:6200",
@@ -152,12 +152,12 @@ describe("SettingsManager.load", () => {
     process.exit = origExit;
   });
 
-  it("exits with code 1 when validation fails (invalid timezone)", () => {
+  it("exits with code 1 when validation fails (invalid timeZone)", () => {
     mkdirSync(tmpDir, { recursive: true });
     writeFileSync(join(tmpDir, "settings.json"), JSON.stringify({
       botToken: "tok",
       chatId: "123",
-      timezone: "Europe/Prgaaue",
+      timeZone: "Europe/Prgaaue",
     }));
 
     const mockExit = mock(() => { throw new Error("exit"); });
@@ -283,7 +283,7 @@ describe("SettingsManager.applyEnvOverrides", () => {
     const { settings } = new SettingsManager(tmpDir).applyEnvOverrides(validSettings);
     expect(settings.model).toBe("opus");
     expect(settings.workspace).toBe("/override/path");
-    expect(settings.timezone).toBe("Europe/Prague");
+    expect(settings.timeZone).toBe("Europe/Prague");
     expect(settings.logLevel).toBe("error");
     expect(settings.pinoramaUrl).toBe("http://override:6200");
   });

package/src/settings.ts

@@ -11,7 +11,7 @@ export const settingsSchema = z.object({
   chatId: z.string().trim().regex(/^-?\d+$/, "Must be a numeric Telegram chat ID"),
   model: z.string().trim().pipe(z.enum(["haiku", "sonnet", "opus"])).default("sonnet"),
   workspace: z.string().trim().default("~/.macroclaw-workspace"),
-  timezone: z.string().trim().refine((tz) => IANAZone.isValidZone(tz), "Must be a valid IANA timezone").default("UTC"),
+  timeZone: z.string().trim().refine((tz) => IANAZone.isValidZone(tz), "Must be a valid IANA timezone").default("UTC"),
   openaiApiKey: z.string().trim().optional(),
   logLevel: z.string().trim().pipe(z.enum(["debug", "info", "warn", "error"])).default("info"),
   pinoramaUrl: z.string().trim().optional(),
@@ -37,7 +37,7 @@ export class SettingsManager {
     chatId: "AUTHORIZED_CHAT_ID",
     model: "MODEL",
     workspace: "WORKSPACE",
-    timezone: "TIMEZONE",
+    timeZone: "TIMEZONE",
     openaiApiKey: "OPENAI_API_KEY",
     logLevel: "LOG_LEVEL",
     pinoramaUrl: "PINORAMA_URL",

package/src/setup.test.ts

@@ -122,7 +122,7 @@ describe("SetupWizard", () => {
     expect(settings.chatId).toBe("12345678");
     expect(settings.model).toBe("opus");
     expect(settings.workspace).toBe("/my/ws");
-    expect(settings.timezone).toBe("Europe/Prague");
+    expect(settings.timeZone).toBe("Europe/Prague");
     expect(settings.openaiApiKey).toBe("sk-test");
     expect(settings.logLevel).toBe("info");
   });
@@ -151,7 +151,7 @@ describe("SetupWizard", () => {
     expect(settings.chatId).toBe("99887766");
     expect(settings.model).toBe("haiku");
     expect(settings.workspace).toBe("/env/ws");
-    expect(settings.timezone).toBe("America/New_York");
+    expect(settings.timeZone).toBe("America/New_York");
     expect(settings.openaiApiKey).toBe("sk-env");
   });
 

package/src/setup.ts

@@ -88,8 +88,8 @@ export class SetupWizard {
       this.#io.write("\nLocal timezone for the agent's clock and scheduled events.\n");
       this.#io.write("Use an IANA timezone name (e.g. Europe/Prague, America/New_York, UTC).\n\n");
       const detectedTz = Intl.DateTimeFormat().resolvedOptions().timeZone;
-      const defaultTimezone = this.#default("timezone", detectedTz || "UTC");
-      const timezone = await this.#askValidated("timezone", `Timezone [${defaultTimezone}]: `, defaultTimezone);
+      const defaultTimezone = this.#default("timeZone", detectedTz || "UTC");
+      const timeZone = await this.#askValidated("timeZone", `Timezone [${defaultTimezone}]: `, defaultTimezone);
 
       // OpenAI API key
       this.#io.write("\nMacroclaw uses OpenAI's Whisper API to transcribe voice messages.\n");
@@ -106,7 +106,7 @@ export class SetupWizard {
         chatId,
         model,
         workspace,
-        timezone,
+        timeZone,
         openaiApiKey,
         ...(logLevel && { logLevel }),
       });

package/src/system-service.test.ts

@@ -167,19 +167,11 @@ describe("install", () => {
 		expect(() => mgr.install()).toThrow("Settings not found. Run `macroclaw setup` first.");
 	});
 
-	it("runs global install and resolves bun, claude and macroclaw paths", () => {
+	it("runs global install without resolving binary paths on systemd", () => {
 		const tmpHome = `/tmp/macroclaw-test-install-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		mockUserInfo.mockImplementation(() => ({ username: "testuser", homedir: tmpHome, uid: 1000, gid: 1000, shell: "/bin/bash" }));
 		// Mock existsSync to handle linger check
 		mockExistsSync.mockImplementation((path: string) => {
@@ -191,41 +183,42 @@ describe("install", () => {
 		rmSync(tmpHome, { recursive: true });
 
 		expect(mockExecSync).toHaveBeenCalledWith("bun install -g macroclaw", expect.anything());
-		expect(mockExecSync).toHaveBeenCalledWith("which bun", expect.anything());
-		expect(mockExecSync).toHaveBeenCalledWith("which claude", expect.anything());
-		expect(mockExecSync).toHaveBeenCalledWith("bun pm bin -g", expect.anything());
+		// systemd no longer resolves paths — bash -lc handles PATH at runtime
+		expect(mockExecSync).not.toHaveBeenCalledWith("which bun", expect.anything());
+		expect(mockExecSync).not.toHaveBeenCalledWith("which claude", expect.anything());
+		expect(mockExecSync).not.toHaveBeenCalledWith("bun pm bin -g", expect.anything());
 	});
 
-	it("installs launchd service with PATH and OAuth token", () => {
+	it("installs launchd service with bash -lc and OAuth token", () => {
 		const tmpHome = `/tmp/macroclaw-test-launchd-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
 		const plistDir = join(tmpHome, "Library/LaunchAgents");
 		mkdirSync(plistDir, { recursive: true });
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		const mgr = createManager({ platform: "darwin", home: tmpHome });
 		mgr.install("sk-test-token");
 
 		const plistPath = join(plistDir, "com.macroclaw.plist");
 		expect(existsSync(plistPath)).toBe(true);
 		const writtenContent = readFileSync(plistPath, "utf-8");
-		expect(writtenContent).toContain(`<string>${tmpHome}/.bun/bin/bun</string>`);
-		expect(writtenContent).toContain(`<string>${tmpHome}/.bun/bin/macroclaw</string>`);
-		expect(writtenContent).toContain("<string>start</string>");
+		// bash -lc pattern — no hardcoded binary paths
+		expect(writtenContent).toContain("<string>/bin/bash</string>");
+		expect(writtenContent).toContain("<string>-lc</string>");
+		expect(writtenContent).toContain("<string>exec bun macroclaw start</string>");
 		expect(writtenContent).toContain("<key>KeepAlive</key>");
 		expect(writtenContent).toContain(".macroclaw/logs/stdout.log");
-		expect(writtenContent).toContain("<key>PATH</key>");
+		// No PATH/HOME env vars — login shell provides them
+		expect(writtenContent).not.toContain("<key>PATH</key>");
+		expect(writtenContent).not.toContain("<key>HOME</key>");
+		// OAuth token is preserved
 		expect(writtenContent).toContain("<key>CLAUDE_CODE_OAUTH_TOKEN</key>");
 		expect(writtenContent).toContain("<string>sk-test-token</string>");
 		expect(mockExecSync).toHaveBeenCalledWith(expect.stringContaining("launchctl load"), expect.anything());
+		// No path resolution calls
+		expect(mockExecSync).not.toHaveBeenCalledWith("which bun", expect.anything());
+		expect(mockExecSync).not.toHaveBeenCalledWith("which claude", expect.anything());
+		expect(mockExecSync).not.toHaveBeenCalledWith("bun pm bin -g", expect.anything());
 		rmSync(tmpHome, { recursive: true });
 	});
 
@@ -234,19 +227,12 @@ describe("install", () => {
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
 		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		const mgr = createManager({ platform: "darwin", home: tmpHome });
 		mgr.install();
 		const writtenContent = readFileSync(join(tmpHome, "Library/LaunchAgents/com.macroclaw.plist"), "utf-8");
 		expect(writtenContent).not.toContain("CLAUDE_CODE_OAUTH_TOKEN");
+		expect(writtenContent).not.toContain("<key>EnvironmentVariables</key>");
 		rmSync(tmpHome, { recursive: true });
 	});
 
@@ -255,15 +241,10 @@ describe("install", () => {
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
 		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
 		const calls: string[] = [];
 		mockExecSync.mockImplementation((cmd: string) => {
 			calls.push(cmd);
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
 			if (cmd.startsWith("launchctl list ")) return LAUNCHD_RUNNING;
 			return "";
 		});
@@ -281,13 +262,8 @@ describe("install", () => {
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
 		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
 		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
 			if (cmd.startsWith("launchctl list ")) return LAUNCHD_STOPPED;
 			return "";
 		});
@@ -297,19 +273,11 @@ describe("install", () => {
 		rmSync(tmpHome, { recursive: true });
 	});
 
-	it("installs systemd user service and writes unit file directly", () => {
+	it("installs systemd user service with bash -lc and no hardcoded paths", () => {
 		const tmpHome = `/tmp/macroclaw-test-systemd-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		mockUserInfo.mockImplementation(() => ({ username: "testuser", homedir: tmpHome, uid: 1000, gid: 1000, shell: "/bin/bash" }));
 		// Mock existsSync: linger file does not exist (triggers sudo loginctl)
 		mockExistsSync.mockImplementation((path: string) => {
@@ -326,8 +294,11 @@ describe("install", () => {
 		expect(unitContent).toContain("WantedBy=default.target");
 		expect(unitContent).not.toContain("User=");
 		expect(unitContent).not.toContain("Group=");
-		expect(unitContent).toContain(`Environment=HOME=${tmpHome}`);
-		expect(unitContent).toContain(`ExecStart=${tmpHome}/.bun/bin/bun ${tmpHome}/.bun/bin/macroclaw start`);
+		// bash -lc sources login profile for PATH — no hardcoded Environment lines
+		expect(unitContent).not.toContain("Environment=HOME=");
+		expect(unitContent).not.toContain("Environment=PATH=");
+		expect(unitContent).toContain("WorkingDirectory=%h");
+		expect(unitContent).toContain("ExecStart=/bin/bash -lc 'exec bun macroclaw start'");
 
 		// Lingering enabled via sudo
 		expect(mockExecSync).toHaveBeenCalledWith("sudo loginctl enable-linger testuser", expect.anything());
@@ -346,15 +317,7 @@ describe("install", () => {
 		const tmpHome = `/tmp/macroclaw-test-linger-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		mockUserInfo.mockImplementation(() => ({ username: "testuser", homedir: tmpHome, uid: 1000, gid: 1000, shell: "/bin/bash" }));
 		// Linger already enabled
 		mockExistsSync.mockImplementation((path: string) => {
@@ -372,15 +335,7 @@ describe("install", () => {
 		const tmpHome = `/tmp/macroclaw-test-nosudo-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		mockUserInfo.mockImplementation(() => ({ username: "testuser", homedir: tmpHome, uid: 1000, gid: 1000, shell: "/bin/bash" }));
 		mockExistsSync.mockImplementation((path: string) => {
 			if (path === "/var/lib/systemd/linger/testuser") return true;
@@ -393,52 +348,12 @@ describe("install", () => {
 		rmSync(tmpHome, { recursive: true });
 	});
 
-	it("throws when bun path cannot be resolved", () => {
-		const tmpHome = `/tmp/macroclaw-test-nobun-${Date.now()}`;
-		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
-		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
-
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") throw new Error("not found");
-			return "";
-		});
-		const mgr = createManager({ home: tmpHome });
-		expect(() => mgr.install()).toThrow("Could not resolve bun path. Is it installed?");
-		rmSync(tmpHome, { recursive: true });
-	});
-
-	it("throws when macroclaw not found in global bin", () => {
-		const tmpHome = `/tmp/macroclaw-test-nomc-${Date.now()}`;
-		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
-		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		// Note: NOT creating macroclaw binary
-
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.local/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
-		const mgr = createManager({ home: tmpHome });
-		expect(() => mgr.install()).toThrow(`Could not find macroclaw in ${tmpHome}/.bun/bin`);
-		rmSync(tmpHome, { recursive: true });
-	});
-
 	it("macOS install does not use sudo", () => {
 		const tmpHome = `/tmp/macroclaw-test-macos-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
 		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
-		mkdirSync(join(tmpHome, ".bun/bin"), { recursive: true });
-		writeFileSync(join(tmpHome, ".bun/bin/macroclaw"), "");
 
-		mockExecSync.mockImplementation((cmd: string) => {
-			if (cmd === "which bun") return `${tmpHome}/.bun/bin/bun\n`;
-			if (cmd === "which claude") return `${tmpHome}/.bun/bin/claude\n`;
-			if (cmd === "bun pm bin -g") return `${tmpHome}/.bun/bin\n`;
-			return "";
-		});
 		const mgr = createManager({ platform: "darwin", home: tmpHome });
 		mgr.install();
 		for (const call of mockExecSync.mock.calls) {

package/src/system-service.ts

@@ -1,7 +1,7 @@
 import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { userInfo as osUserInfo } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { dirname, resolve } from "node:path";
 import { createLogger } from "./logger";
 
 const log = createLogger("service");
@@ -85,11 +85,6 @@ export class SystemServiceManager {
 		}
 
 		this.#exec("bun install -g macroclaw");
-		const bunPath = this.#resolvePath("bun");
-		const claudePath = this.#resolvePath("claude");
-		const macroclawPath = this.#resolveGlobalBinPath("macroclaw");
-
-		const pathDirs = [...new Set([dirname(bunPath), dirname(claudePath), dirname(macroclawPath)])];
 
 		const logDir = resolve(this.#home, ".macroclaw/logs");
 		mkdirSync(logDir, { recursive: true });
@@ -97,7 +92,7 @@ export class SystemServiceManager {
 			this.#exec(`launchctl unload ${this.serviceFilePath}`);
 		}
 
-		writeFileSync(this.serviceFilePath, this.#generateLaunchdPlist(bunPath, macroclawPath, pathDirs, oauthToken));
+		writeFileSync(this.serviceFilePath, this.#generateLaunchdPlist(oauthToken));
 		log.debug({ filePath: this.serviceFilePath }, "Wrote launchd plist");
 		this.#exec(`launchctl load ${this.serviceFilePath}`);
 	}
@@ -113,11 +108,6 @@ export class SystemServiceManager {
 		}
 
 		this.#exec("bun install -g macroclaw");
-		const bunPath = this.#resolvePath("bun");
-		const claudePath = this.#resolvePath("claude");
-		const macroclawPath = this.#resolveGlobalBinPath("macroclaw");
-
-		const pathDirs = [...new Set([dirname(bunPath), dirname(claudePath), dirname(macroclawPath)])];
 
 		// Enable lingering so user services run without an active login session
 		const username = osUserInfo().username;
@@ -125,7 +115,7 @@ export class SystemServiceManager {
 			this.#sudo(`loginctl enable-linger ${username}`);
 		}
 
-		const unitContent = this.#generateSystemdUnit(bunPath, macroclawPath, pathDirs);
+		const unitContent = this.#generateSystemdUnit();
 		mkdirSync(dirname(this.serviceFilePath), { recursive: true });
 		writeFileSync(this.serviceFilePath, unitContent);
 		log.debug({ filePath: this.serviceFilePath }, "Wrote systemd unit");
@@ -252,23 +242,6 @@ export class SystemServiceManager {
 		return execSync(cmd, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).toString();
 	}
 
-	#resolvePath(binary: string): string {
-		try {
-			return this.#exec(`which ${binary}`).trim();
-		} catch {
-			throw new Error(`Could not resolve ${binary} path. Is it installed?`);
-		}
-	}
-
-	#resolveGlobalBinPath(binary: string): string {
-		const binDir = this.#exec("bun pm bin -g").trim();
-		const binPath = join(binDir, binary);
-		if (!existsSync(binPath)) {
-			throw new Error(`Could not find ${binary} in ${binDir}. Is it installed?`);
-		}
-		return binPath;
-	}
-
 
 	#getInstalledVersion(): string {
 		try {
@@ -298,9 +271,11 @@ export class SystemServiceManager {
 		this.#exec(`sudo ${cmd}`);
 	}
 
-	#generateLaunchdPlist(bunPath: string, macroclawPath: string, pathDirs: string[], oauthToken?: string): string {
+	#generateLaunchdPlist(oauthToken?: string): string {
 		const logDir = resolve(this.#home, ".macroclaw/logs");
-		const tokenEnv = oauthToken ? `\n\t\t<key>CLAUDE_CODE_OAUTH_TOKEN</key>\n\t\t<string>${oauthToken}</string>` : "";
+		const tokenEnvBlock = oauthToken
+			? `\n\t<key>EnvironmentVariables</key>\n\t<dict>\n\t\t<key>CLAUDE_CODE_OAUTH_TOKEN</key>\n\t\t<string>${oauthToken}</string>\n\t</dict>`
+			: "";
 		return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -309,39 +284,30 @@ export class SystemServiceManager {
 	<string>com.macroclaw</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>${bunPath}</string>
-		<string>${macroclawPath}</string>
-		<string>start</string>
+		<string>/bin/bash</string>
+		<string>-lc</string>
+		<string>exec bun macroclaw start</string>
 	</array>
 	<key>KeepAlive</key>
 	<true/>
 	<key>StandardOutPath</key>
 	<string>${logDir}/stdout.log</string>
 	<key>StandardErrorPath</key>
-	<string>${logDir}/stderr.log</string>
-	<key>EnvironmentVariables</key>
-	<dict>
-		<key>HOME</key>
-		<string>${this.#home}</string>
-		<key>PATH</key>
-		<string>${pathDirs.join(":")}</string>${tokenEnv}
-	</dict>
+	<string>${logDir}/stderr.log</string>${tokenEnvBlock}
 </dict>
 </plist>
 `;
 	}
 
-	#generateSystemdUnit(bunPath: string, macroclawPath: string, pathDirs: string[]): string {
+	#generateSystemdUnit(): string {
 		return `[Unit]
 Description=Macroclaw - Telegram-to-Claude-Code bridge
 After=network.target
 
 [Service]
 Type=simple
-Environment=HOME=${this.#home}
-Environment=PATH=${pathDirs.join(":")}
-WorkingDirectory=${this.#home}
-ExecStart=${bunPath} ${macroclawPath} start
+WorkingDirectory=%h
+ExecStart=/bin/bash -lc 'exec bun macroclaw start'
 Restart=on-failure
 RestartSec=5
 

package/workspace-template/.claude/skills/settings/SKILL.md

@@ -1,9 +1,9 @@
 ---
 name: settings
-description: "Read or change macroclaw settings (model, timezone). Use when the user asks about current settings, wants to switch the Claude model, change the timezone, or asks what model/timezone is configured."
+description: "Read or change macroclaw settings (model, timeZone). Use when the user asks about current settings, wants to switch the Claude model, change the timezone, or asks what model/timezone is configured."
 ---
 
-Read or change macroclaw settings. Only `model` and `timezone` can be changed through this skill.
+Read or change macroclaw settings. Only `model` and `timeZone` can be changed through this skill.
 
 ## Settings file
 
@@ -11,7 +11,7 @@ Location: `~/.macroclaw/settings.json`
 
 ## Reading settings
 
-When the user asks about current settings ("what model am I on?", "what's the timezone?"):
+When the user asks about current settings ("what model am I on?", "what's the time zone?"):
 
 1. Read `~/.macroclaw/settings.json`
 2. Report the requested value
@@ -20,7 +20,7 @@ When the user asks about current settings ("what model am I on?", "what's the ti
 
 Allowed changes:
 - **model**: `haiku`, `sonnet`, or `opus`
-- **timezone**: any valid IANA timezone (e.g. `Europe/Prague`, `America/New_York`, `UTC`)
+- **timeZone**: any valid IANA timezone (e.g. `Europe/Prague`, `America/New_York`, `UTC`)
 
 All other settings (botToken, chatId, workspace, etc.) cannot be changed through this skill — tell the user to run `macroclaw setup` instead.