macroclaw 0.40.0 → 0.41.0

package/package.json

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

package/src/system-service.test.ts

@@ -7,7 +7,7 @@ const { existsSync: realExistsSync, mkdirSync, readFileSync, rmSync, writeFileSy
 const existsSync = realExistsSync;
 
 // Mock child_process and os — safe since no other tests depend on real execSync or userInfo
-const mockExecSync = mock((_cmd: string, _opts?: object) => "");
+const mockExecSync = mock((cmd: string, _opts?: object): string => cmd === "bun pm bin -g" ? "/home/testuser/.bun/bin\n" : "");
 const mockUserInfo = mock(() => ({ username: "testuser", homedir: "/home/testuser", uid: 1000, gid: 1000, shell: "/bin/bash" }));
 const mockExistsSync = mock((path: string) => realExistsSync(path));
 
@@ -43,7 +43,7 @@ beforeEach(() => {
 	mockExecSync.mockClear();
 	mockUserInfo.mockClear();
 	mockExistsSync.mockClear();
-	mockExecSync.mockImplementation((_cmd: string, _opts?: object) => "");
+	mockExecSync.mockImplementation((cmd: string, _opts?: object): string => cmd === "bun pm bin -g" ? "/home/testuser/.bun/bin\n" : "");
 	mockUserInfo.mockImplementation(() => ({ username: "testuser", homedir: "/home/testuser", uid: 1000, gid: 1000, shell: "/bin/bash" }));
 	mockExistsSync.mockImplementation((path: string) => realExistsSync(path));
 });
@@ -167,7 +167,7 @@ describe("install", () => {
 		expect(() => mgr.install()).toThrow("Settings not found. Run `macroclaw setup` first.");
 	});
 
-	it("runs global install without resolving binary paths on systemd", () => {
+	it("runs global install and resolves bun global bin for systemd", () => {
 		const tmpHome = `/tmp/macroclaw-test-install-${Date.now()}`;
 		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
 		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
@@ -178,15 +178,41 @@ describe("install", () => {
 			if (path === "/var/lib/systemd/linger/testuser") return true; // already lingering
 			return realExistsSync(path);
 		});
+		mockExecSync.mockImplementation((cmd: string) => {
+			if (cmd === "bun pm bin -g") return "/home/testuser/.bun/bin\n";
+			return "";
+		});
 		const mgr = createManager({ home: tmpHome });
 		mgr.install();
 		rmSync(tmpHome, { recursive: true });
 
 		expect(mockExecSync).toHaveBeenCalledWith("bun install -g macroclaw", 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());
+		expect(mockExecSync).toHaveBeenCalledWith("bun pm bin -g", expect.anything());
+		expect(mockExecSync).not.toHaveBeenCalledWith("which macroclaw", expect.anything());
+	});
+
+	it("surfaces bun global bin resolution failures for systemd", () => {
+		const tmpHome = `/tmp/macroclaw-test-install-missing-path-${Date.now()}`;
+		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
+		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
+
+		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;
+			return realExistsSync(path);
+		});
+		mockExecSync.mockImplementation((cmd: string) => {
+			if (cmd === "bun pm bin -g") throw new Error("not found");
+			return "";
+		});
+
+		const mgr = createManager({ home: tmpHome });
+		expect(() => mgr.install()).toThrow(
+			"not found",
+		);
+		expect(existsSync(join(tmpHome, ".config/systemd/user/macroclaw.service"))).toBe(false);
+		expect(mockExecSync).not.toHaveBeenCalledWith("systemctl --user daemon-reload", expect.anything());
+		rmSync(tmpHome, { recursive: true });
 	});
 
 	it("installs launchd service with bash -lc and OAuth token", () => {
@@ -205,20 +231,56 @@ describe("install", () => {
 		// 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("<string>exec macroclaw start</string>");
 		expect(writtenContent).toContain("<key>KeepAlive</key>");
 		expect(writtenContent).toContain(".macroclaw/logs/stdout.log");
-		// No PATH/HOME env vars — login shell provides them
-		expect(writtenContent).not.toContain("<key>PATH</key>");
+		expect(writtenContent).toContain("<key>EnvironmentVariables</key>");
+		expect(writtenContent).toContain("<key>PATH</key>");
+		expect(writtenContent).toContain("<string>/home/testuser/.bun/bin</string>");
 		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());
+		expect(mockExecSync).not.toHaveBeenCalledWith("which macroclaw", expect.anything());
+		rmSync(tmpHome, { recursive: true });
+	});
+
+	it("surfaces bun global bin resolution failures for launchd", () => {
+		const tmpHome = `/tmp/macroclaw-test-launchd-missing-path-${Date.now()}`;
+		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
+		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
+		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
+
+		mockExecSync.mockImplementation((cmd: string) => {
+			if (cmd === "bun pm bin -g") throw new Error("not found");
+			return "";
+		});
+
+		const mgr = createManager({ platform: "darwin", home: tmpHome });
+		expect(() => mgr.install("sk-test-token")).toThrow(
+			"not found",
+		);
+		expect(existsSync(join(tmpHome, "Library/LaunchAgents/com.macroclaw.plist"))).toBe(false);
+		expect(mockExecSync).not.toHaveBeenCalledWith(expect.stringContaining("launchctl load"), expect.anything());
+		rmSync(tmpHome, { recursive: true });
+	});
+
+	it("surfaces bun global bin permission failures for launchd", () => {
+		const tmpHome = `/tmp/macroclaw-test-launchd-missing-bin-dir-${Date.now()}`;
+		mkdirSync(join(tmpHome, ".macroclaw"), { recursive: true });
+		writeFileSync(join(tmpHome, ".macroclaw/settings.json"), "{}");
+		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
+
+		mockExecSync.mockImplementation((cmd: string) => {
+			if (cmd === "bun pm bin -g") throw new Error("permission denied");
+			return "";
+		});
+
+		const mgr = createManager({ platform: "darwin", home: tmpHome });
+		expect(() => mgr.install("sk-test-token")).toThrow(
+			"permission denied",
+		);
 		rmSync(tmpHome, { recursive: true });
 	});
 
@@ -231,8 +293,10 @@ describe("install", () => {
 		const mgr = createManager({ platform: "darwin", home: tmpHome });
 		mgr.install();
 		const writtenContent = readFileSync(join(tmpHome, "Library/LaunchAgents/com.macroclaw.plist"), "utf-8");
+		expect(writtenContent).toContain("<key>EnvironmentVariables</key>");
+		expect(writtenContent).toContain("<key>PATH</key>");
+		expect(writtenContent).toContain("<string>/home/testuser/.bun/bin</string>");
 		expect(writtenContent).not.toContain("CLAUDE_CODE_OAUTH_TOKEN");
-		expect(writtenContent).not.toContain("<key>EnvironmentVariables</key>");
 		rmSync(tmpHome, { recursive: true });
 	});
 
@@ -294,11 +358,11 @@ describe("install", () => {
 		expect(unitContent).toContain("WantedBy=default.target");
 		expect(unitContent).not.toContain("User=");
 		expect(unitContent).not.toContain("Group=");
-		// bash -lc sources login profile for PATH — no hardcoded Environment lines
+		// systemd seeds PATH with Bun's global bin; login shell can extend it via profile files
 		expect(unitContent).not.toContain("Environment=HOME=");
-		expect(unitContent).not.toContain("Environment=PATH=");
+		expect(unitContent).toContain("Environment=PATH=/home/testuser/.bun/bin");
 		expect(unitContent).toContain("WorkingDirectory=%h");
-		expect(unitContent).toContain("ExecStart=/bin/bash -lc 'exec bun macroclaw start'");
+		expect(unitContent).toContain("ExecStart=/bin/bash -lc 'exec macroclaw start'");
 
 		// Lingering enabled via sudo
 		expect(mockExecSync).toHaveBeenCalledWith("sudo loginctl enable-linger testuser", expect.anything());

package/src/system-service.ts

@@ -85,6 +85,7 @@ export class SystemServiceManager {
 		}
 
 		this.#exec("bun install -g macroclaw");
+		const bunGlobalBin = this.#getBunGlobalBinDir();
 
 		const logDir = resolve(this.#home, ".macroclaw/logs");
 		mkdirSync(logDir, { recursive: true });
@@ -92,7 +93,7 @@ export class SystemServiceManager {
 			this.#exec(`launchctl unload ${this.serviceFilePath}`);
 		}
 
-		writeFileSync(this.serviceFilePath, this.#generateLaunchdPlist(oauthToken));
+		writeFileSync(this.serviceFilePath, this.#generateLaunchdPlist(bunGlobalBin, oauthToken));
 		log.debug({ filePath: this.serviceFilePath }, "Wrote launchd plist");
 		this.#exec(`launchctl load ${this.serviceFilePath}`);
 	}
@@ -108,6 +109,7 @@ export class SystemServiceManager {
 		}
 
 		this.#exec("bun install -g macroclaw");
+		const bunGlobalBin = this.#getBunGlobalBinDir();
 
 		// Enable lingering so user services run without an active login session
 		const username = osUserInfo().username;
@@ -115,7 +117,7 @@ export class SystemServiceManager {
 			this.#sudo(`loginctl enable-linger ${username}`);
 		}
 
-		const unitContent = this.#generateSystemdUnit();
+		const unitContent = this.#generateSystemdUnit(bunGlobalBin);
 		mkdirSync(dirname(this.serviceFilePath), { recursive: true });
 		writeFileSync(this.serviceFilePath, unitContent);
 		log.debug({ filePath: this.serviceFilePath }, "Wrote systemd unit");
@@ -242,6 +244,9 @@ export class SystemServiceManager {
 		return execSync(cmd, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).toString();
 	}
 
+	#getBunGlobalBinDir(): string {
+		return this.#exec("bun pm bin -g").trim();
+	}
 
 	#getInstalledVersion(): string {
 		try {
@@ -271,11 +276,13 @@ export class SystemServiceManager {
 		this.#exec(`sudo ${cmd}`);
 	}
 
-	#generateLaunchdPlist(oauthToken?: string): string {
+	#generateLaunchdPlist(bunGlobalBin: string, oauthToken?: string): string {
 		const logDir = resolve(this.#home, ".macroclaw/logs");
-		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>`
-			: "";
+		const envVars = [`\n\t<key>PATH</key>\n\t\t<string>${bunGlobalBin}</string>`];
+		if (oauthToken) {
+			envVars.push(`\n\t<key>CLAUDE_CODE_OAUTH_TOKEN</key>\n\t\t<string>${oauthToken}</string>`);
+		}
+		const envBlock = `\n\t<key>EnvironmentVariables</key>\n\t<dict>${envVars.join("")}\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">
@@ -286,20 +293,20 @@ export class SystemServiceManager {
 	<array>
 		<string>/bin/bash</string>
 		<string>-lc</string>
-		<string>exec bun macroclaw start</string>
+		<string>exec macroclaw start</string>
 	</array>
 	<key>KeepAlive</key>
 	<true/>
 	<key>StandardOutPath</key>
 	<string>${logDir}/stdout.log</string>
 	<key>StandardErrorPath</key>
-	<string>${logDir}/stderr.log</string>${tokenEnvBlock}
+	<string>${logDir}/stderr.log</string>${envBlock}
 </dict>
 </plist>
 `;
 	}
 
-	#generateSystemdUnit(): string {
+	#generateSystemdUnit(bunGlobalBin: string): string {
 		return `[Unit]
 Description=Macroclaw - Telegram-to-Claude-Code bridge
 After=network.target
@@ -307,7 +314,8 @@ After=network.target
 [Service]
 Type=simple
 WorkingDirectory=%h
-ExecStart=/bin/bash -lc 'exec bun macroclaw start'
+Environment=PATH=${bunGlobalBin}
+ExecStart=/bin/bash -lc 'exec macroclaw start'
 Restart=on-failure
 RestartSec=5