macroclaw 0.38.0 → 0.39.0

package/package.json

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

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