macroclaw 0.35.0 → 0.36.0

package/package.json

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

package/src/cli.test.ts

@@ -133,6 +133,7 @@ function mockService(overrides?: Record<string, unknown>): SystemServiceManager
 		uninstall: mock(() => {}),
 		start: mock(() => ""),
 		stop: mock(() => {}),
+		restart: mock(() => ""),
 		update: mock(() => ({ previousVersion: "0.6.0", currentVersion: "0.7.0" })),
 		isRunning: false,
 		status: mock(() => ({ installed: false, running: false, platform: "systemd" as const })),
@@ -170,6 +171,13 @@ describe("Cli.service", () => {
 		expect(stop).toHaveBeenCalled();
 	});
 
+	it("runs restart action", () => {
+		const restart = mock(() => "tail -f /logs");
+		const cli = new Cli({ systemService: mockService({ restart }) });
+		cli.service("restart");
+		expect(restart).toHaveBeenCalled();
+	});
+
 	it("runs update action — stops and starts when running", () => {
 		const stop = mock(() => {});
 		const start = mock(() => "tail -f /logs");

package/src/cli.ts

@@ -75,6 +75,11 @@ export class Cli {
 				console.log(`Service started. Check logs:\n  ${logCmd}`);
 				break;
 			}
+			case "restart": {
+				const logCmd = this.#serviceManager.restart();
+				console.log(`Service restarted. Check logs:\n  ${logCmd}`);
+				break;
+			}
 			case "status": {
 				const s = this.#serviceManager.status();
 				const lines = [
@@ -173,6 +178,11 @@ const serviceStatusCommand = defineCommand({
 	run: () => { try { defaultCli.service("status"); } catch (err) { handleError(err); } },
 });
 
+const serviceRestartCommand = defineCommand({
+	meta: { name: "restart", description: "Restart the service" },
+	run: () => { try { defaultCli.service("restart"); } catch (err) { handleError(err); } },
+});
+
 const serviceLogsCommand = defineCommand({
 	meta: { name: "logs", description: "Print the command to view service logs" },
 	args: {
@@ -188,6 +198,7 @@ const serviceCommand = defineCommand({
 		uninstall: serviceUninstallCommand,
 		start: serviceStartCommand,
 		stop: serviceStopCommand,
+		restart: serviceRestartCommand,
 		update: serviceUpdateCommand,
 		status: serviceStatusCommand,
 		logs: serviceLogsCommand,

package/src/system-service.test.ts

@@ -641,6 +641,50 @@ describe("stop", () => {
 	});
 });
 
+describe("restart", () => {
+	it("throws when service is not installed", () => {
+		const mgr = createManager({ platform: "darwin", home: "/nonexistent" });
+		expect(() => mgr.restart()).toThrow(
+			"Service not installed. Run `macroclaw service install` first.",
+		);
+	});
+
+	it("stops then starts when running (launchd)", () => {
+		const tmpHome = `/tmp/macroclaw-test-restartld-${Date.now()}`;
+		mkdirSync(join(tmpHome, "Library/LaunchAgents"), { recursive: true });
+		writeFileSync(join(tmpHome, "Library/LaunchAgents/com.macroclaw.plist"), "test");
+
+		let stopped = false;
+		mockExecSync.mockImplementation((cmd: string) => {
+			if (cmd.startsWith("launchctl list ")) return stopped ? LAUNCHD_STOPPED : LAUNCHD_RUNNING;
+			if (cmd.includes("launchctl unload")) { stopped = true; return ""; }
+			return "";
+		});
+		const mgr = createManager({ platform: "darwin", home: tmpHome });
+		mgr.restart();
+		expect(mockExecSync).toHaveBeenCalledWith(expect.stringContaining("launchctl unload"), expect.anything());
+		expect(mockExecSync).toHaveBeenCalledWith(expect.stringContaining("launchctl load"), expect.anything());
+		rmSync(tmpHome, { recursive: true });
+	});
+
+	it("skips stop and starts when not running (systemd)", () => {
+		const tmpHome = `/tmp/macroclaw-test-restartsys-${Date.now()}`;
+		const unitDir = join(tmpHome, ".config/systemd/user");
+		mkdirSync(unitDir, { recursive: true });
+		writeFileSync(join(unitDir, "macroclaw.service"), "test");
+
+		mockExecSync.mockImplementation((cmd: string) => {
+			if (cmd === "systemctl --user is-active macroclaw") throw new Error("inactive");
+			return "";
+		});
+		const mgr = createManager({ platform: "linux", home: tmpHome });
+		mgr.restart();
+		expect(mockExecSync).not.toHaveBeenCalledWith("systemctl --user stop macroclaw", expect.anything());
+		expect(mockExecSync).toHaveBeenCalledWith("systemctl --user start macroclaw", expect.anything());
+		rmSync(tmpHome, { recursive: true });
+	});
+});
+
 describe("update", () => {
 	it("throws when service is not installed", () => {
 		const mgr = createManager({ platform: "darwin", home: "/nonexistent" });

package/src/system-service.ts

@@ -171,6 +171,16 @@ export class SystemServiceManager {
 		return this.#logTailCommand();
 	}
 
+	restart(): string {
+		this.#requireInstalled();
+
+		if (this.isRunning) {
+			this.stop();
+		}
+
+		return this.start();
+	}
+
 	stop(): void {
 		this.#requireInstalled();
 

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

@@ -0,0 +1,54 @@
+---
+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."
+---
+
+Read or change macroclaw settings. Only `model` and `timezone` can be changed through this skill.
+
+## Settings file
+
+Location: `~/.macroclaw/settings.json`
+
+## Reading settings
+
+When the user asks about current settings ("what model am I on?", "what's the timezone?"):
+
+1. Read `~/.macroclaw/settings.json`
+2. Report the requested value
+
+## Changing settings
+
+Allowed changes:
+- **model**: `haiku`, `sonnet`, or `opus`
+- **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.
+
+## Procedure for changing a setting
+
+Changing a setting requires a service restart, which kills the current process. Everything must happen in a single response — the same pattern as self-update.
+
+1. **Read current settings**: Read `~/.macroclaw/settings.json` and note the current value.
+
+2. **Validate**: Check the new value is valid (see allowed values above). If invalid, tell the user and stop.
+
+3. **Write**: Update the value in `~/.macroclaw/settings.json`, preserving all other fields. Write the file with `JSON.stringify(settings, null, 2)` formatting.
+
+4. **Generate LOG_FILE_PATH**: Run `echo "/tmp/macroclaw-restart-$(date -u +%Y-%m-%dT%H-%M-%SZ).log"` and use the output as `<LOG_FILE_PATH>` in the following steps.
+
+5. **Schedule follow-up**: Using the `schedule` skill, create a one-shot event 1 minute from now:
+   - Name: `settings-check`
+   - Prompt: `Check macroclaw restart after settings change. Read ~/.macroclaw/settings.json and confirm <setting>=<new-value>. Read <LOG_FILE_PATH> — if it contains "restarted", the restart succeeded. If the file doesn't exist or is empty, schedule another check in 1 minute. Run macroclaw service status to verify the service is running. Report the result.`
+   - Model: `haiku`
+   - Recurring: `false`
+
+6. **Run the restart**: Execute the restart script bundled with this skill:
+   ```
+   bash ${CLAUDE_SKILL_DIR}/scripts/restart.sh <LOG_FILE_PATH>
+   ```
+
+## Important
+
+- The restart stops the service, which kills all processes including this Claude Code session.
+- Do NOT use a background agent — it gets killed along with the main process.
+- Always run step 6 LAST — everything after it may not execute.

package/workspace-template/.claude/skills/settings/scripts/restart.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ $# -ne 1 ]]; then
+  echo "Usage: $0 <log-file>" >&2
+  exit 1
+fi
+
+LOG_FILE="$1"
+
+case "$(uname -s)" in
+  Linux)
+    systemd-run --user \
+      --unit="macroclaw-restart-$(date -u +%Y%m%dT%H%M%SZ)" \
+      --collect \
+      --no-block \
+      --setenv="PATH=$PATH" \
+      /bin/bash -lc "exec macroclaw service restart > \"$LOG_FILE\" 2>&1"
+    ;;
+  Darwin)
+    nohup setsid /bin/bash -lc "exec macroclaw service restart > \"$LOG_FILE\" 2>&1" >/dev/null 2>&1 &
+    ;;
+  *)
+    echo "Unsupported platform: $(uname -s)" >&2
+    exit 1
+    ;;
+esac