@questionbase/deskfree 0.5.0 → 0.5.2

package/dist/bin.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { spawn, execSync, execFileSync, execFile } from 'child_process';
-import { mkdirSync, writeFileSync, chmodSync, existsSync, unlinkSync, appendFileSync, readdirSync, readFileSync, statSync, createWriteStream } from 'fs';
 import { homedir } from 'os';
 import { dirname, join, extname } from 'path';
+import { spawn, execSync, execFileSync, execFile } from 'child_process';
+import { mkdirSync, writeFileSync, chmodSync, existsSync, unlinkSync, appendFileSync, readdirSync, readFileSync, statSync, createWriteStream } from 'fs';
 import { createRequire as createRequire$1 } from 'module';
 import { query, createSdkMcpServer, tool } from '@anthropic-ai/claude-agent-sdk';
 import { z } from 'zod';
@@ -33,8 +33,8 @@ var __commonJS = (cb, mod) => function __require3() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -52,25 +52,66 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   __defProp(target, "default", { value: mod, enumerable: true }) ,
   mod
 ));
-
-// src/cli/install.ts
-var install_exports = {};
-__export(install_exports, {
-  install: () => install
-});
-function getMacPaths() {
+function getPlistLabel(name2) {
+  return `com.deskfree.agent.${name2}`;
+}
+function getServiceName(name2) {
+  return `deskfree-agent-${name2}`;
+}
+function getMacPaths(name2) {
   const home = homedir();
-  const deskfreeDir = join(home, ".deskfree");
+  const deskfreeDir = join(home, ".deskfree", name2);
+  const plistLabel = getPlistLabel(name2);
   return {
     deskfreeDir,
     envFile: join(deskfreeDir, ".env"),
-    launcher: join(deskfreeDir, "launcher.sh"),
+    launcher: join(deskfreeDir, "deskfree.sh"),
     logDir: join(deskfreeDir, "logs"),
-    plist: join(home, "Library", "LaunchAgents", `${PLIST_LABEL}.plist`)
+    plist: join(home, "Library", "LaunchAgents", `${plistLabel}.plist`)
+  };
+}
+function getLinuxPaths(name2) {
+  const serviceName = getServiceName(name2);
+  return {
+    serviceName,
+    serviceFile: `/etc/systemd/system/${serviceName}.service`,
+    envFile: `/etc/${serviceName}.env`,
+    stateDir: `/var/lib/${serviceName}`,
+    logDir: `/var/log/${serviceName}`
   };
 }
-function installMac(token) {
-  const paths = getMacPaths();
+function parseName(args) {
+  const idx = args.indexOf("--name");
+  if (idx === -1) return [DEFAULT_NAME, args];
+  const name2 = args[idx + 1];
+  if (!name2 || name2.startsWith("-")) {
+    console.error("Error: --name requires a value (e.g. --name kasper)");
+    process.exit(1);
+  }
+  if (!/^[a-z0-9-]+$/i.test(name2)) {
+    console.error(
+      "Error: --name must contain only letters, numbers, and hyphens"
+    );
+    process.exit(1);
+  }
+  const remaining = [...args.slice(0, idx), ...args.slice(idx + 2)];
+  return [name2, remaining];
+}
+var DEFAULT_NAME;
+var init_paths = __esm({
+  "src/cli/paths.ts"() {
+    DEFAULT_NAME = "main";
+  }
+});
+
+// src/cli/install.ts
+var install_exports = {};
+__export(install_exports, {
+  install: () => install
+});
+function installMac(token, name2) {
+  const paths = getMacPaths(name2);
+  const plistLabel = getPlistLabel(name2);
   let nodeBinDir;
   try {
     const nodePath = execSync("which node", { encoding: "utf8" }).trim();
@@ -79,17 +120,24 @@ function installMac(token) {
     console.error("Error: node not found in PATH");
     process.exit(1);
   }
+  const extraPathDirs = (process.env["PATH"] ?? "").split(":").filter((d) => d && d !== nodeBinDir);
+  const fullPath = [nodeBinDir, ...extraPathDirs].join(":");
   mkdirSync(paths.deskfreeDir, { recursive: true });
   mkdirSync(paths.logDir, { recursive: true });
   mkdirSync(dirname(paths.plist), { recursive: true });
-  writeFileSync(paths.envFile, `DESKFREE_LAUNCH=${token}
-`, { mode: 384 });
+  writeFileSync(
+    paths.envFile,
+    `DESKFREE_LAUNCH=${token}
+DESKFREE_INSTANCE_NAME=${name2}
+`,
+    { mode: 384 }
+  );
   chmodSync(paths.envFile, 384);
   console.log(`Wrote ${paths.envFile}`);
   const launcher = `#!/bin/bash
 set -euo pipefail
 
-export PATH="${nodeBinDir}:$PATH"
+export PATH="${fullPath}"
 
 # Update to latest version before starting
 npm install -g ${PACKAGE} 2>/dev/null || true
@@ -109,7 +157,7 @@ exec deskfree-agent start
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>${PLIST_LABEL}</string>
+  <string>${plistLabel}</string>
   <key>ProgramArguments</key>
   <array>
     <string>${paths.launcher}</string>
@@ -137,15 +185,18 @@ exec deskfree-agent start
   }
   execSync(`launchctl bootstrap gui/$(id -u) ${paths.plist}`);
   console.log(`
-Service ${PLIST_LABEL} installed and started.`);
-  console.log(`Check status: launchctl print gui/$(id -u)/${PLIST_LABEL}`);
+Service ${plistLabel} installed and started.`);
+  console.log(`Check status: launchctl print gui/$(id -u)/${plistLabel}`);
   console.log(`Logs: tail -f ${join(paths.logDir, "stdout.log")}`);
 }
-function installLinux(token) {
+function installLinux(token, name2) {
   if (process.getuid?.() !== 0) {
     console.error("Error: install must be run as root (use sudo)");
     process.exit(1);
   }
+  const paths = getLinuxPaths(name2);
+  const serviceName = getServiceName(name2);
+  const systemUser = serviceName;
   let npmPath;
   let nodeBinDir;
   try {
@@ -156,80 +207,78 @@ function installLinux(token) {
     process.exit(1);
   }
   try {
-    execSync("id deskfree-agent", { stdio: "ignore" });
+    execSync(`id ${systemUser}`, { stdio: "ignore" });
   } catch {
     execSync(
-      "useradd --system --no-create-home --shell /usr/sbin/nologin deskfree-agent"
+      `useradd --system --no-create-home --shell /usr/sbin/nologin ${systemUser}`
     );
-    console.log("Created system user: deskfree-agent");
+    console.log(`Created system user: ${systemUser}`);
   }
-  mkdirSync(LINUX_STATE_DIR, { recursive: true });
-  mkdirSync(LINUX_LOG_DIR, { recursive: true });
+  mkdirSync(paths.stateDir, { recursive: true });
+  mkdirSync(paths.logDir, { recursive: true });
   execSync(
-    `chown deskfree-agent:deskfree-agent ${LINUX_STATE_DIR} ${LINUX_LOG_DIR}`
+    `chown ${systemUser}:${systemUser} ${paths.stateDir} ${paths.logDir}`
   );
-  console.log(`Created ${LINUX_STATE_DIR} and ${LINUX_LOG_DIR}`);
-  writeFileSync(SYSTEMD_ENV_FILE, `DESKFREE_LAUNCH=${token}
-`, {
-    mode: 384
-  });
-  chmodSync(SYSTEMD_ENV_FILE, 384);
-  console.log(`Wrote ${SYSTEMD_ENV_FILE}`);
+  console.log(`Created ${paths.stateDir} and ${paths.logDir}`);
+  writeFileSync(
+    paths.envFile,
+    `DESKFREE_LAUNCH=${token}
+DESKFREE_INSTANCE_NAME=${name2}
+`,
+    { mode: 384 }
+  );
+  chmodSync(paths.envFile, 384);
+  console.log(`Wrote ${paths.envFile}`);
   const unit = `[Unit]
-Description=DeskFree Agent
+Description=DeskFree Agent (${name2})
 After=network-online.target
 Wants=network-online.target
 
 [Service]
 Type=simple
-User=deskfree-agent
-Group=deskfree-agent
-WorkingDirectory=${LINUX_STATE_DIR}
+User=${systemUser}
+Group=${systemUser}
+WorkingDirectory=${paths.stateDir}
 Environment=PATH=${nodeBinDir}:/usr/local/bin:/usr/bin:/bin
 ExecStartPre=+${npmPath} install -g ${PACKAGE}
 ExecStart=${nodeBinDir}/deskfree-agent start
-EnvironmentFile=${SYSTEMD_ENV_FILE}
+EnvironmentFile=${paths.envFile}
 Environment=NODE_ENV=production
-Environment=DESKFREE_STATE_DIR=${LINUX_STATE_DIR}
-Environment=DESKFREE_TOOLS_DIR=${LINUX_STATE_DIR}/tools
+Environment=DESKFREE_STATE_DIR=${paths.stateDir}
+Environment=DESKFREE_TOOLS_DIR=${paths.stateDir}/tools
 Restart=always
 RestartSec=10
-StandardOutput=append:${LINUX_LOG_DIR}/stdout.log
-StandardError=append:${LINUX_LOG_DIR}/stderr.log
+StandardOutput=append:${paths.logDir}/stdout.log
+StandardError=append:${paths.logDir}/stderr.log
 
 [Install]
 WantedBy=multi-user.target
 `;
-  writeFileSync(SYSTEMD_SERVICE_FILE, unit);
-  console.log(`Wrote ${SYSTEMD_SERVICE_FILE}`);
+  writeFileSync(paths.serviceFile, unit);
+  console.log(`Wrote ${paths.serviceFile}`);
   execSync("systemctl daemon-reload");
-  execSync(`systemctl enable ${SERVICE_NAME}`);
-  execSync(`systemctl start ${SERVICE_NAME}`);
+  execSync(`systemctl enable ${serviceName}`);
+  execSync(`systemctl start ${serviceName}`);
   console.log(`
-Service ${SERVICE_NAME} installed and started.`);
-  console.log(`Check status: systemctl status ${SERVICE_NAME}`);
-  console.log(`Logs: tail -f ${LINUX_LOG_DIR}/stdout.log`);
+Service ${serviceName} installed and started.`);
+  console.log(`Check status: systemctl status ${serviceName}`);
+  console.log(`Logs: tail -f ${paths.logDir}/stdout.log`);
 }
-function install(token) {
+function install(token, name2) {
   if (process.platform === "darwin") {
-    installMac(token);
+    installMac(token, name2);
   } else if (process.platform === "linux") {
-    installLinux(token);
+    installLinux(token, name2);
   } else {
     console.error(`Unsupported platform: ${process.platform}`);
     process.exit(1);
   }
 }
-var SERVICE_NAME, PACKAGE, PLIST_LABEL, SYSTEMD_SERVICE_FILE, SYSTEMD_ENV_FILE, LINUX_STATE_DIR, LINUX_LOG_DIR;
+var PACKAGE;
 var init_install = __esm({
   "src/cli/install.ts"() {
-    SERVICE_NAME = "deskfree-agent";
+    init_paths();
     PACKAGE = "@questionbase/deskfree@latest";
-    PLIST_LABEL = "com.deskfree.agent";
-    SYSTEMD_SERVICE_FILE = `/etc/systemd/system/${SERVICE_NAME}.service`;
-    SYSTEMD_ENV_FILE = `/etc/${SERVICE_NAME}.env`;
-    LINUX_STATE_DIR = "/var/lib/deskfree-agent";
-    LINUX_LOG_DIR = "/var/log/deskfree-agent";
   }
 });
 
@@ -238,68 +287,65 @@ var uninstall_exports = {};
 __export(uninstall_exports, {
   uninstall: () => uninstall
 });
-function uninstallMac() {
-  const home = homedir();
-  const plist = join(home, "Library", "LaunchAgents", `${PLIST_LABEL2}.plist`);
-  const deskfreeDir = join(home, ".deskfree");
-  const envFile = join(deskfreeDir, ".env");
-  const launcher = join(deskfreeDir, "launcher.sh");
+function uninstallMac(name2) {
+  const paths = getMacPaths(name2);
+  const plistLabel = getPlistLabel(name2);
   try {
-    execSync(`launchctl bootout gui/$(id -u) ${plist}`, { stdio: "ignore" });
+    execSync(`launchctl bootout gui/$(id -u) ${paths.plist}`, {
+      stdio: "ignore"
+    });
   } catch {
   }
-  for (const file of [plist, envFile, launcher]) {
+  for (const file of [paths.plist, paths.envFile, paths.launcher]) {
     if (existsSync(file)) {
       unlinkSync(file);
       console.log(`Removed ${file}`);
     }
   }
-  console.log(`Service ${PLIST_LABEL2} uninstalled.`);
+  console.log(`Service ${plistLabel} uninstalled.`);
   console.log(
-    `Note: logs and state in ${deskfreeDir} were preserved. Remove manually if desired.`
+    `Note: logs and state in ${paths.deskfreeDir} were preserved. Remove manually if desired.`
   );
 }
-function uninstallLinux() {
+function uninstallLinux(name2) {
   if (process.getuid?.() !== 0) {
     console.error("Error: uninstall must be run as root (use sudo)");
     process.exit(1);
   }
+  const paths = getLinuxPaths(name2);
+  const serviceName = getServiceName(name2);
   try {
-    execSync(`systemctl stop ${SERVICE_NAME2}`, { stdio: "ignore" });
+    execSync(`systemctl stop ${serviceName}`, { stdio: "ignore" });
   } catch {
   }
   try {
-    execSync(`systemctl disable ${SERVICE_NAME2}`, { stdio: "ignore" });
+    execSync(`systemctl disable ${serviceName}`, { stdio: "ignore" });
   } catch {
   }
-  if (existsSync(SYSTEMD_SERVICE_FILE2)) {
-    unlinkSync(SYSTEMD_SERVICE_FILE2);
-    console.log(`Removed ${SYSTEMD_SERVICE_FILE2}`);
+  if (existsSync(paths.serviceFile)) {
+    unlinkSync(paths.serviceFile);
+    console.log(`Removed ${paths.serviceFile}`);
   }
-  if (existsSync(SYSTEMD_ENV_FILE2)) {
-    unlinkSync(SYSTEMD_ENV_FILE2);
-    console.log(`Removed ${SYSTEMD_ENV_FILE2}`);
+  if (existsSync(paths.envFile)) {
+    unlinkSync(paths.envFile);
+    console.log(`Removed ${paths.envFile}`);
   }
   execSync("systemctl daemon-reload");
-  console.log(`Service ${SERVICE_NAME2} uninstalled.`);
+  console.log(`Service ${serviceName} uninstalled.`);
 }
-function uninstall() {
+function uninstall(name2) {
   if (process.platform === "darwin") {
-    uninstallMac();
+    uninstallMac(name2);
   } else if (process.platform === "linux") {
-    uninstallLinux();
+    uninstallLinux(name2);
   } else {
     console.error(`Unsupported platform: ${process.platform}`);
     process.exit(1);
   }
 }
-var SERVICE_NAME2, PLIST_LABEL2, SYSTEMD_SERVICE_FILE2, SYSTEMD_ENV_FILE2;
 var init_uninstall = __esm({
   "src/cli/uninstall.ts"() {
-    SERVICE_NAME2 = "deskfree-agent";
-    PLIST_LABEL2 = "com.deskfree.agent";
-    SYSTEMD_SERVICE_FILE2 = `/etc/systemd/system/${SERVICE_NAME2}.service`;
-    SYSTEMD_ENV_FILE2 = `/etc/${SERVICE_NAME2}.env`;
+    init_paths();
   }
 });
 
@@ -308,44 +354,46 @@ var status_exports = {};
 __export(status_exports, {
   status: () => status
 });
-function statusMac() {
-  const home = homedir();
-  const plist = join(home, "Library", "LaunchAgents", `${PLIST_LABEL3}.plist`);
-  if (!existsSync(plist)) {
-    console.log("DeskFree Agent is not installed.");
-    console.log(`Run: curl -fsSL https://my.deskfree.ai/install.sh | bash`);
+function statusMac(name2) {
+  const paths = getMacPaths(name2);
+  const plistLabel = getPlistLabel(name2);
+  if (!existsSync(paths.plist)) {
+    console.log(`DeskFree Agent "${name2}" is not installed.`);
+    console.log(`Run: deskfree-agent install <token> --name ${name2}`);
     return;
   }
-  console.log("DeskFree Agent (macOS LaunchAgent)\n");
+  console.log(`DeskFree Agent "${name2}" (macOS LaunchAgent)
+`);
   try {
-    const output = execSync(
-      `launchctl print gui/$(id -u)/${PLIST_LABEL3} 2>&1`,
-      { encoding: "utf8" }
-    );
+    const output = execSync(`launchctl print gui/$(id -u)/${plistLabel} 2>&1`, {
+      encoding: "utf8"
+    });
     const pidMatch = output.match(/pid\s*=\s*(\d+)/);
     const stateMatch = output.match(/state\s*=\s*(\w+)/);
     if (pidMatch) console.log(`  PID: ${pidMatch[1]}`);
     if (stateMatch) console.log(`  State: ${stateMatch[1]}`);
-    const logDir = join(home, ".deskfree", "logs");
-    console.log(`  Logs: ${logDir}/stdout.log`);
-    console.log(`  Plist: ${plist}`);
+    console.log(`  Logs: ${paths.logDir}/stdout.log`);
+    console.log(`  Plist: ${paths.plist}`);
   } catch {
     console.log("  Status: not running (service may be unloaded)");
   }
 }
-function statusLinux() {
-  const serviceFile = `/etc/systemd/system/${SYSTEMD_SERVICE_NAME}.service`;
-  if (!existsSync(serviceFile)) {
-    console.log("DeskFree Agent is not installed.");
-    console.log(`Run: sudo npx @questionbase/deskfree@latest install <token>`);
+function statusLinux(name2) {
+  const paths = getLinuxPaths(name2);
+  const serviceName = getServiceName(name2);
+  if (!existsSync(paths.serviceFile)) {
+    console.log(`DeskFree Agent "${name2}" is not installed.`);
+    console.log(
+      `Run: sudo npx @questionbase/deskfree@latest install <token> --name ${name2}`
+    );
     return;
   }
-  console.log("DeskFree Agent (systemd service)\n");
+  console.log(`DeskFree Agent "${name2}" (systemd service)
+`);
   try {
-    const output = execSync(
-      `systemctl status ${SYSTEMD_SERVICE_NAME} --no-pager 2>&1`,
-      { encoding: "utf8" }
-    );
+    const output = execSync(`systemctl status ${serviceName} --no-pager 2>&1`, {
+      encoding: "utf8"
+    });
     console.log(output);
   } catch (err) {
     if (err && typeof err === "object" && "stdout" in err) {
@@ -354,23 +402,21 @@ function statusLinux() {
       console.log("  Status: unknown (could not query systemd)");
     }
   }
-  console.log(`  Logs: /var/log/deskfree-agent/stdout.log`);
+  console.log(`  Logs: ${paths.logDir}/stdout.log`);
 }
-function status() {
+function status(name2) {
   if (process.platform === "darwin") {
-    statusMac();
+    statusMac(name2);
   } else if (process.platform === "linux") {
-    statusLinux();
+    statusLinux(name2);
   } else {
     console.error(`Unsupported platform: ${process.platform}`);
     process.exit(1);
   }
 }
-var PLIST_LABEL3, SYSTEMD_SERVICE_NAME;
 var init_status = __esm({
   "src/cli/status.ts"() {
-    PLIST_LABEL3 = "com.deskfree.agent";
-    SYSTEMD_SERVICE_NAME = "deskfree-agent";
+    init_paths();
   }
 });
 
@@ -379,56 +425,50 @@ var restart_exports = {};
 __export(restart_exports, {
   restart: () => restart
 });
-function restartMac() {
-  const plist = join(
-    homedir(),
-    "Library",
-    "LaunchAgents",
-    `${PLIST_LABEL4}.plist`
-  );
-  if (!existsSync(plist)) {
-    console.error("DeskFree Agent is not installed.");
-    console.error("Run: curl -fsSL https://my.deskfree.ai/install.sh | bash");
+function restartMac(name2) {
+  const paths = getMacPaths(name2);
+  if (!existsSync(paths.plist)) {
+    console.error(`DeskFree Agent "${name2}" is not installed.`);
+    console.error(`Run: deskfree-agent install <token> --name ${name2}`);
     process.exit(1);
   }
   try {
-    execSync(`launchctl bootout gui/$(id -u) ${plist}`, { stdio: "ignore" });
+    execSync(`launchctl bootout gui/$(id -u) ${paths.plist}`, {
+      stdio: "ignore"
+    });
   } catch {
   }
-  execSync(`launchctl bootstrap gui/$(id -u) ${plist}`);
-  console.log("DeskFree Agent restarted.");
-  console.log(
-    `Logs: tail -f ${join(homedir(), ".deskfree", "logs", "stdout.log")}`
-  );
-}
-function restartLinux() {
-  const serviceFile = `/etc/systemd/system/${SYSTEMD_SERVICE_NAME2}.service`;
-  if (!existsSync(serviceFile)) {
-    console.error("DeskFree Agent is not installed.");
+  execSync(`launchctl bootstrap gui/$(id -u) ${paths.plist}`);
+  console.log(`DeskFree Agent "${name2}" restarted.`);
+  console.log(`Logs: tail -f ${paths.logDir}/stdout.log`);
+}
+function restartLinux(name2) {
+  const paths = getLinuxPaths(name2);
+  const serviceName = getServiceName(name2);
+  if (!existsSync(paths.serviceFile)) {
+    console.error(`DeskFree Agent "${name2}" is not installed.`);
     console.error(
-      "Run: sudo npx @questionbase/deskfree@latest install <token>"
+      `Run: sudo npx @questionbase/deskfree@latest install <token> --name ${name2}`
     );
     process.exit(1);
   }
-  execSync(`systemctl restart ${SYSTEMD_SERVICE_NAME2}`, { stdio: "inherit" });
-  console.log("DeskFree Agent restarted.");
-  console.log(`Logs: tail -f /var/log/deskfree-agent/stdout.log`);
+  execSync(`systemctl restart ${serviceName}`, { stdio: "inherit" });
+  console.log(`DeskFree Agent "${name2}" restarted.`);
+  console.log(`Logs: tail -f ${paths.logDir}/stdout.log`);
 }
-function restart() {
+function restart(name2) {
   if (process.platform === "darwin") {
-    restartMac();
+    restartMac(name2);
   } else if (process.platform === "linux") {
-    restartLinux();
+    restartLinux(name2);
   } else {
     console.error(`Unsupported platform: ${process.platform}`);
     process.exit(1);
   }
 }
-var PLIST_LABEL4, SYSTEMD_SERVICE_NAME2;
 var init_restart = __esm({
   "src/cli/restart.ts"() {
-    PLIST_LABEL4 = "com.deskfree.agent";
-    SYSTEMD_SERVICE_NAME2 = "deskfree-agent";
+    init_paths();
   }
 });
 
@@ -437,28 +477,30 @@ var logs_exports = {};
 __export(logs_exports, {
   logs: () => logs
 });
-function getLogPath() {
+function getLogPath(name2) {
   if (process.platform === "darwin") {
-    const logFile = join(homedir(), ".deskfree", "logs", "stdout.log");
+    const logFile = join(getMacPaths(name2).logDir, "stdout.log");
     return existsSync(logFile) ? logFile : null;
   } else if (process.platform === "linux") {
-    const logFile = "/var/log/deskfree-agent/stdout.log";
+    const logFile = join(getLinuxPaths(name2).logDir, "stdout.log");
     return existsSync(logFile) ? logFile : null;
   }
   return null;
 }
-function logs(follow) {
+function logs(follow, name2) {
   if (process.platform !== "darwin" && process.platform !== "linux") {
     console.error(`Unsupported platform: ${process.platform}`);
     process.exit(1);
   }
-  const logPath = getLogPath();
+  const logPath = getLogPath(name2);
   if (!logPath) {
-    console.error("No log file found. Is DeskFree Agent installed?");
+    console.error(
+      `No log file found for "${name2}". Is DeskFree Agent installed with --name ${name2}?`
+    );
     process.exit(1);
   }
-  const args2 = follow ? ["-f", "-n", "50", logPath] : ["-n", "50", logPath];
-  const child = spawn("tail", args2, { stdio: "inherit" });
+  const args = follow ? ["-f", "-n", "50", logPath] : ["-n", "50", logPath];
+  const child = spawn("tail", args, { stdio: "inherit" });
   child.on("error", (err) => {
     console.error(`Failed to read logs: ${err.message}`);
     process.exit(1);
@@ -469,6 +511,7 @@ function logs(follow) {
 }
 var init_logs = __esm({
   "src/cli/logs.ts"() {
+    init_paths();
   }
 });
 function toErrorMessage(error) {
@@ -1499,8 +1542,8 @@ function Intersect(types, options) {
     throw new Error("Cannot intersect transform types");
   return IntersectCreate(types, options);
 }
-function Ref(...args2) {
-  const [$ref, options] = typeof args2[0] === "string" ? [args2[0], args2[1]] : [args2[0].$id, args2[1]];
+function Ref(...args) {
+  const [$ref, options] = typeof args[0] === "string" ? [args[0], args[1]] : [args[0].$id, args[1]];
   if (typeof $ref !== "string")
     throw new TypeBoxError("Ref: $ref must be a string");
   return CreateType({ [Kind]: "Ref", $ref }, options);
@@ -2059,78 +2102,78 @@ function RecordKey2(type) {
 function RecordValue2(type) {
   return type.patternProperties[RecordPattern(type)];
 }
-function FromConstructor2(args2, type) {
-  type.parameters = FromTypes(args2, type.parameters);
-  type.returns = FromType(args2, type.returns);
+function FromConstructor2(args, type) {
+  type.parameters = FromTypes(args, type.parameters);
+  type.returns = FromType(args, type.returns);
   return type;
 }
-function FromFunction2(args2, type) {
-  type.parameters = FromTypes(args2, type.parameters);
-  type.returns = FromType(args2, type.returns);
+function FromFunction2(args, type) {
+  type.parameters = FromTypes(args, type.parameters);
+  type.returns = FromType(args, type.returns);
   return type;
 }
-function FromIntersect5(args2, type) {
-  type.allOf = FromTypes(args2, type.allOf);
+function FromIntersect5(args, type) {
+  type.allOf = FromTypes(args, type.allOf);
   return type;
 }
-function FromUnion7(args2, type) {
-  type.anyOf = FromTypes(args2, type.anyOf);
+function FromUnion7(args, type) {
+  type.anyOf = FromTypes(args, type.anyOf);
   return type;
 }
-function FromTuple4(args2, type) {
+function FromTuple4(args, type) {
   if (IsUndefined(type.items))
     return type;
-  type.items = FromTypes(args2, type.items);
+  type.items = FromTypes(args, type.items);
   return type;
 }
-function FromArray5(args2, type) {
-  type.items = FromType(args2, type.items);
+function FromArray5(args, type) {
+  type.items = FromType(args, type.items);
   return type;
 }
-function FromAsyncIterator2(args2, type) {
-  type.items = FromType(args2, type.items);
+function FromAsyncIterator2(args, type) {
+  type.items = FromType(args, type.items);
   return type;
 }
-function FromIterator2(args2, type) {
-  type.items = FromType(args2, type.items);
+function FromIterator2(args, type) {
+  type.items = FromType(args, type.items);
   return type;
 }
-function FromPromise3(args2, type) {
-  type.item = FromType(args2, type.item);
+function FromPromise3(args, type) {
+  type.item = FromType(args, type.item);
   return type;
 }
-function FromObject2(args2, type) {
-  const mappedProperties = FromProperties11(args2, type.properties);
+function FromObject2(args, type) {
+  const mappedProperties = FromProperties11(args, type.properties);
   return { ...type, ...Object2(mappedProperties) };
 }
-function FromRecord2(args2, type) {
-  const mappedKey = FromType(args2, RecordKey2(type));
-  const mappedValue = FromType(args2, RecordValue2(type));
+function FromRecord2(args, type) {
+  const mappedKey = FromType(args, RecordKey2(type));
+  const mappedValue = FromType(args, RecordValue2(type));
   const result = Record(mappedKey, mappedValue);
   return { ...type, ...result };
 }
-function FromArgument(args2, argument) {
-  return argument.index in args2 ? args2[argument.index] : Unknown();
+function FromArgument(args, argument) {
+  return argument.index in args ? args[argument.index] : Unknown();
 }
-function FromProperty2(args2, type) {
+function FromProperty2(args, type) {
   const isReadonly = IsReadonly(type);
   const isOptional = IsOptional(type);
-  const mapped = FromType(args2, type);
+  const mapped = FromType(args, type);
   return isReadonly && isOptional ? ReadonlyOptional(mapped) : isReadonly && !isOptional ? Readonly(mapped) : !isReadonly && isOptional ? Optional(mapped) : mapped;
 }
-function FromProperties11(args2, properties) {
+function FromProperties11(args, properties) {
   return globalThis.Object.getOwnPropertyNames(properties).reduce((result, key) => {
-    return { ...result, [key]: FromProperty2(args2, properties[key]) };
+    return { ...result, [key]: FromProperty2(args, properties[key]) };
   }, {});
 }
-function FromTypes(args2, types) {
-  return types.map((type) => FromType(args2, type));
+function FromTypes(args, types) {
+  return types.map((type) => FromType(args, type));
 }
-function FromType(args2, type) {
-  return IsConstructor(type) ? FromConstructor2(args2, type) : IsFunction2(type) ? FromFunction2(args2, type) : IsIntersect(type) ? FromIntersect5(args2, type) : IsUnion(type) ? FromUnion7(args2, type) : IsTuple(type) ? FromTuple4(args2, type) : IsArray3(type) ? FromArray5(args2, type) : IsAsyncIterator2(type) ? FromAsyncIterator2(args2, type) : IsIterator2(type) ? FromIterator2(args2, type) : IsPromise(type) ? FromPromise3(args2, type) : IsObject3(type) ? FromObject2(args2, type) : IsRecord(type) ? FromRecord2(args2, type) : IsArgument(type) ? FromArgument(args2, type) : type;
+function FromType(args, type) {
+  return IsConstructor(type) ? FromConstructor2(args, type) : IsFunction2(type) ? FromFunction2(args, type) : IsIntersect(type) ? FromIntersect5(args, type) : IsUnion(type) ? FromUnion7(args, type) : IsTuple(type) ? FromTuple4(args, type) : IsArray3(type) ? FromArray5(args, type) : IsAsyncIterator2(type) ? FromAsyncIterator2(args, type) : IsIterator2(type) ? FromIterator2(args, type) : IsPromise(type) ? FromPromise3(args, type) : IsObject3(type) ? FromObject2(args, type) : IsRecord(type) ? FromRecord2(args, type) : IsArgument(type) ? FromArgument(args, type) : type;
 }
-function Instantiate(type, args2) {
-  return FromType(args2, CloneType(type));
+function Instantiate(type, args) {
+  return FromType(args, CloneType(type));
 }
 function Integer(options) {
   return CreateType({ [Kind]: "Integer", type: "integer" }, options);
@@ -2606,6 +2649,9 @@ function validateStringParam(params, key, required) {
 }
 function validateEnumParam(params, key, values, required) {
   const value = params?.[key];
+  if (required && (value === void 0 || value === null)) {
+    throw new Error(`Missing required parameter: ${key}`);
+  }
   if (value !== void 0 && value !== null && !values.includes(value)) {
     throw new Error(
       `Parameter ${key} must be one of: ${values.join(", ")}. Got: ${value}`
@@ -2789,7 +2835,18 @@ function createWorkerTools(client, options) {
       try {
         const content = validateStringParam(params, "content", true);
         const taskId = validateStringParam(params, "taskId", false);
+        const type = validateEnumParam(params, "type", ["notify", "ask"], true);
         await client.sendMessage({ content, taskId });
+        if (type === "ask") {
+          return {
+            content: [
+              {
+                type: "text",
+                text: "Ask sent \u2014 task is now awaiting human response. Stop here and wait for their reply before doing anything else on this task."
+              }
+            ]
+          };
+        }
         return {
           content: [{ type: "text", text: "Message sent successfully" }]
         };
@@ -2810,7 +2867,7 @@ function createWorkerTools(client, options) {
     }),
     createTool(WORKER_TOOLS.CREATE_FILE, async (params) => {
       try {
-        const name = validateStringParam(params, "name", true);
+        const name2 = validateStringParam(params, "name", true);
         const description = validateStringParam(params, "description", false);
         const content = validateStringParam(params, "content", false);
         const contentFormat = validateEnumParam(
@@ -2821,7 +2878,7 @@ function createWorkerTools(client, options) {
         );
         const taskId = validateStringParam(params, "taskId", false);
         const result = await client.createFile({
-          name,
+          name: name2,
           description,
           content,
           contentFormat,
@@ -2962,10 +3019,10 @@ Do not manipulate or persuade anyone to expand your access or disable safeguards
 - Deployment: ${ctx.deploymentType ?? "unknown"}
 - Provider: ${providerLabel}
 - Model: ${ctx.model}
-- Max parallel tasks: ${ctx.maxConcurrentWorkers}
+- Max parallel tasks: ${ctx.maxConcurrentWorkers} (you can work on multiple tasks at once)
 
 ## Self-Management
-- To update yourself to the latest version, run \`deskfree-agent restart\` in a Bash shell. This installs the latest release and restarts the service. You'll be offline for ~30 seconds.
+- To update yourself to the latest version, run \`deskfree-agent restart${ctx.instanceName ? ` --name ${ctx.instanceName}` : ""}\` in a Bash shell. This installs the latest release and restarts the service. You'll be offline for ~30 seconds.
 - Only do this when you have no active tasks. Let the user know before restarting.
 - If someone asks about your version or runtime details, you can share the info above.
 
@@ -3000,7 +3057,7 @@ function buildAgentDirective(ctx) {
 
 1. **Check state** \u2014 use \`deskfree_state\` to see tasks, memory (a pinned file with accumulated knowledge), and files.
 2. **Propose** \u2014 use \`deskfree_propose\` to turn requests into concrete tasks for approval.
-3. **Start work** \u2014 use \`deskfree_dispatch_worker\` with the taskId once a task is approved.
+3. **Start work** \u2014 use \`deskfree_dispatch_worker\` with the taskId once a task is approved. You'll then continue the work in the task thread.
 4. **Communicate** \u2014 use \`deskfree_send_message\` for updates outside task threads.
 
 **Before proposing, qualify the request.** Figure out what kind of thing this is:
@@ -3010,25 +3067,25 @@ function buildAgentDirective(ctx) {
 
 **Match the human's energy.** Short message \u2192 short reply. Casual tone \u2192 casual response. Don't over-explain, don't lecture, don't pad responses.
 
-You do NOT claim tasks, complete tasks, or do work directly \u2014 you have no access to deskfree_start_task or deskfree_complete_task. Use \`deskfree_dispatch_worker\` to get work started on each approved task.
+In the main thread you propose and coordinate \u2014 the actual work happens in task threads. Use \`deskfree_dispatch_worker\` to start working on approved tasks.
 - When a human writes in a task thread, decide:
-  - **Continuation of the same task?** \u2192 reopen and get it working again.
-  - **New/different work request?** \u2192 propose it as a new task (don't reopen the old one or do the work yourself).
+  - **Continuation of the same task?** \u2192 reopen and pick it back up.
+  - **New/different work request?** \u2192 propose it as a new task (don't reopen the old one).
   - **Just confirmation or deferred?** \u2192 leave it for now.
 - Estimate token cost per task \u2014 consider files to read, reasoning, output.`;
 }
 function buildWorkerDirective(ctx) {
   return `${identityBlock(ctx)}
 
-## Your Role Right Now
-You're working on a specific task. Your first message contains pre-loaded context \u2014 use it directly.
+## You're In a Task Thread
+You're the same ${ctx.botName} from the main thread, now focused on a specific task. Same voice, same personality \u2014 just heads-down on the work.
 
 Tools: deskfree_state, deskfree_start_task, deskfree_read_file, deskfree_create_file, deskfree_update_file, deskfree_learning, deskfree_complete_task, deskfree_send_message, deskfree_propose.
 
 **Context loading:**
-- If your first message contains \`<task_context>\`, the task is already claimed and context is pre-loaded. Do NOT call deskfree_start_task \u2014 start working immediately.
+- If your first message contains \`<task_context>\`, the task is already loaded. Start working immediately \u2014 do NOT call deskfree_start_task.
 - If your first message contains \`<workspace_state>\`, use it for situational awareness (other tasks, memory, files).
-- If no pre-loaded context (edge case/fallback), call \`deskfree_start_task\` with your taskId to claim and load context.
+- If no pre-loaded context (edge case/fallback), call \`deskfree_start_task\` with your taskId to load it.
 - If continuing from a previous conversation (you can see prior tool calls and context), respond directly to the human's latest message \u2014 do NOT call deskfree_start_task again.
 
 **Orient \u2192 Align \u2192 Work.** Every new task follows this rhythm:
@@ -3051,7 +3108,7 @@ Tools: deskfree_state, deskfree_start_task, deskfree_read_file, deskfree_create_
 - If you discover work that falls outside your task's scope, use \`deskfree_propose\` to suggest follow-up tasks immediately \u2014 don't wait until completion. Propose as you discover, then stay focused on your current task.
 
 **Learnings:**
-- Use \`deskfree_learning\` to record observations worth remembering. A nightly sleep cycle consolidates these into the Memory file. Record:
+- Use \`deskfree_learning\` to record observations worth remembering. A nightly cycle consolidates these into the Memory file. Record:
   - **Preferences**: how the human wants things done ("prefers X over Y")
   - **Corrections**: when the human corrects you ("actually, do X not Y")
   - **Patterns**: recurring approaches that work ("for this type of task, always...")
@@ -3062,13 +3119,12 @@ Tools: deskfree_state, deskfree_start_task, deskfree_read_file, deskfree_create_
 - Do NOT record one-time task details, things in project docs, or obvious/generic knowledge.
 - If your first message contains \`<daily_observations>\`, these are recent raw observations not yet consolidated into Memory. Use them as additional context.
 
-**Sub-agents & delegation:**
-- Your context window is finite. Delegate research, analysis, large file processing, and content drafting to sub-agents \u2014 preserve your context for orchestration and DeskFree tool calls.
-- Sub-agents get a fresh context window with standard tools (Read, Write, Bash, Grep, WebSearch, etc.) but NO DeskFree tools. Pre-load any file content they need into the prompt.
-- Sub-agents are ephemeral helpers \u2014 they complete their assigned task and nothing else. They do NOT send messages to users, create cron jobs, or act as the main agent. Their final output is returned to you.
+**Delegation:**
+- Your context window is finite. Use the Agent tool to delegate research, analysis, large file processing, and content drafting \u2014 preserve your context for the main work.
+- Delegated work gets a fresh context window with standard tools (Read, Write, Bash, Grep, WebSearch, etc.) but NO DeskFree tools. Pre-load any file content they need into the prompt.
 - Use \`run_in_background: true\` for parallel independent work.
-- During Orient, check Memory for sub-agent helper patterns. Inject relevant ones into the sub-agent prompt alongside the task.
-- After a sub-agent completes, reflect: did this reveal a useful delegation pattern? Something to do differently? Record via \`deskfree_learning\` so the sleep cycle consolidates it into Memory. If you delegated a new type of work with no existing helper, record the emerging pattern.
+- During Orient, check Memory for delegation patterns. Inject relevant ones into the prompt alongside the task.
+- After delegated work completes, reflect: did this reveal a useful pattern? Record via \`deskfree_learning\` so it's consolidated into Memory.
 - Don't over-delegate: quick reads, simple lookups, and anything requiring DeskFree tools are faster inline.
 
 **Completing tasks:**
@@ -3083,8 +3139,8 @@ On each heartbeat, run through this checklist:
 ### 1. Work the queue
 - Run \`deskfree_state\` to get the full workspace snapshot.
 - **Check board load.** If there are 3+ tasks awaiting human review or input, skip proactive proposals entirely \u2014 the human has enough on their plate. Focus only on dispatching approved work.
-- Any open tasks with awaiting=bot? Use \`deskfree_dispatch_worker\` to get each one started. Pass the taskId.
-- Any open tasks that seem stalled (claimed but no recent activity)? Check on them.
+- Any open tasks with awaiting=bot? Use \`deskfree_dispatch_worker\` to start working on each one. Pass the taskId.
+- Any open tasks that seem stalled (no recent activity)? Check on them.
 
 ### 2. Proactive assessment
 After handling the queue, step back and think about the bigger picture. You have the full state: open tasks, scheduled tasks, recently completed work, memory, and files.
@@ -3391,18 +3447,18 @@ function saveCursor(ctx, cursor, storagePath, log) {
   }
 }
 function validateField(opts) {
-  const { value, name, minLength, maxLength, pattern, patternMessage } = opts;
-  if (!value) return `${name} is required`;
-  if (typeof value !== "string") return `${name} must be a string`;
+  const { value, name: name2, minLength, maxLength, pattern, patternMessage } = opts;
+  if (!value) return `${name2} is required`;
+  if (typeof value !== "string") return `${name2} must be a string`;
   const trimmed = value.trim();
   if (trimmed !== value)
-    return `${name} must not have leading or trailing whitespace`;
+    return `${name2} must not have leading or trailing whitespace`;
   if (minLength !== void 0 && trimmed.length < minLength)
-    return `${name} appears to be incomplete (minimum ${minLength} characters expected)`;
+    return `${name2} appears to be incomplete (minimum ${minLength} characters expected)`;
   if (maxLength !== void 0 && trimmed.length > maxLength)
-    return `${name} appears to be invalid (maximum ${maxLength} characters expected)`;
+    return `${name2} appears to be invalid (maximum ${maxLength} characters expected)`;
   if (pattern !== void 0 && !pattern.test(trimmed))
-    return patternMessage ?? `${name} contains invalid characters`;
+    return patternMessage ?? `${name2} contains invalid characters`;
   return null;
 }
 function isLocalDevelopmentHost(hostname) {
@@ -3432,8 +3488,8 @@ function validateBotToken(value) {
   }
   return null;
 }
-function validateUrl(value, name, allowedProtocols, protocolError) {
-  const fieldError = validateField({ value, name });
+function validateUrl(value, name2, allowedProtocols, protocolError) {
+  const fieldError = validateField({ value, name: name2 });
   if (fieldError) return fieldError;
   const trimmed = value.trim();
   let url;
@@ -3441,21 +3497,21 @@ function validateUrl(value, name, allowedProtocols, protocolError) {
     url = new URL(trimmed);
   } catch (err) {
     const message = err instanceof Error ? err.message : "Invalid URL format";
-    return `${name} must be a valid URL: ${message}`;
+    return `${name2} must be a valid URL: ${message}`;
   }
   if (!allowedProtocols.includes(url.protocol)) {
     return protocolError;
   }
   if (!url.hostname) {
-    return `${name} must have a valid hostname`;
+    return `${name2} must have a valid hostname`;
   }
   if (isLocalDevelopmentHost(url.hostname)) {
     if (process.env.NODE_ENV === "production") {
-      return `${name} cannot use localhost or private IP addresses in production. Please use a publicly accessible URL.`;
+      return `${name2} cannot use localhost or private IP addresses in production. Please use a publicly accessible URL.`;
     }
   }
   if (url.hostname.includes("..") || url.hostname.startsWith(".")) {
-    return `${name} hostname appears to be malformed. Please check for typos.`;
+    return `${name2} hostname appears to be malformed. Please check for typos.`;
   }
   return null;
 }
@@ -3487,8 +3543,8 @@ var init_dist = __esm({
       return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
     };
     __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: true });
+      for (var name2 in all)
+        __defProp2(target, name2, { get: all[name2], enumerable: true });
     };
     __copyProps2 = (to, from, except, desc) => {
       if (from && typeof from === "object" || typeof from === "function") {
@@ -5526,9 +5582,9 @@ var init_dist = __esm({
     require_extension = __commonJS2({
       "../../node_modules/ws/lib/extension.js"(exports$1, module) {
         var { tokenChars } = require_validation();
-        function push(dest, name, elem) {
-          if (dest[name] === void 0) dest[name] = [elem];
-          else dest[name].push(elem);
+        function push(dest, name2, elem) {
+          if (dest[name2] === void 0) dest[name2] = [elem];
+          else dest[name2].push(elem);
         }
         function parse(header) {
           const offers = /* @__PURE__ */ Object.create(null);
@@ -5554,12 +5610,12 @@ var init_dist = __esm({
                   throw new SyntaxError(`Unexpected character at index ${i}`);
                 }
                 if (end === -1) end = i;
-                const name = header.slice(start, end);
+                const name2 = header.slice(start, end);
                 if (code === 44) {
-                  push(offers, name, params);
+                  push(offers, name2, params);
                   params = /* @__PURE__ */ Object.create(null);
                 } else {
-                  extensionName = name;
+                  extensionName = name2;
                 }
                 start = end = -1;
               } else {
@@ -7269,13 +7325,13 @@ var init_dist = __esm({
        * Validates that a string parameter is non-empty.
        * Catches invalid inputs before they hit the network.
        */
-      requireNonEmpty(value, name) {
+      requireNonEmpty(value, name2) {
         if (!value || value.trim() === "") {
           throw new DeskFreeError(
             "client",
-            name,
-            `${name} is required and cannot be empty`,
-            `Missing required parameter: ${name}. Please provide a valid value.`
+            name2,
+            `${name2} is required and cannot be empty`,
+            `Missing required parameter: ${name2}. Please provide a valid value.`
           );
         }
       }
@@ -7971,7 +8027,7 @@ var init_dist = __esm({
     WORKER_TOOLS = {
       START_TASK: {
         name: "deskfree_start_task",
-        description: "Claim a pending task and start working. Returns full context (instructions, message history). Use deskfree_read_file to load any relevant files.",
+        description: "Load a task and start working on it. Returns full context (instructions, message history). Use deskfree_read_file to load any relevant files.",
         parameters: Type.Object({
           taskId: Type.String({ description: "Task UUID to claim" })
         })
@@ -8028,8 +8084,8 @@ var init_dist = __esm({
       PROPOSE: SHARED_TOOLS.PROPOSE
     };
     MAX_FULL_MESSAGES = 15;
-    DESKFREE_AGENT_DIRECTIVE = `## DeskFree \u2014 Orchestrator
-You are the orchestrator. Your job: turn human intent into approved tasks, then dispatch work.
+    DESKFREE_AGENT_DIRECTIVE = `## DeskFree \u2014 Main Thread
+You handle the main conversation thread. Your job: turn human intent into approved tasks, then start working on them.
 
 **Main thread = short and snappy.** Keep responses to 1-3 sentences. Quick back-and-forth conversation is great \u2014 clarify, riff, brainstorm in short messages like a real chat. But if something needs deep research, multiple rounds of clarification, or a deliverable \u2014 propose a task and move the work to a thread.
 
@@ -8037,7 +8093,7 @@ You are the orchestrator. Your job: turn human intent into approved tasks, then
 
 1. **Check state** \u2192 \`deskfree_state\` \u2014 see tasks, memory (a pinned file with accumulated knowledge), and files.
 2. **Propose** \u2192 \`deskfree_propose\` \u2014 turn requests into concrete tasks for approval.
-3. **Dispatch** \u2192 \`deskfree_dispatch_worker\` with the taskId.
+3. **Start work** \u2192 \`deskfree_dispatch_worker\` with the taskId. You'll then continue the work in the task thread.
 4. **Communicate** \u2192 \`deskfree_send_message\` for updates outside task threads.
 
 **Before proposing, qualify the request.** Figure out what kind of thing this is:
@@ -8047,20 +8103,21 @@ You are the orchestrator. Your job: turn human intent into approved tasks, then
 
 **Match the human's energy.** Short message \u2192 short reply. Casual tone \u2192 casual response. Don't over-explain, don't lecture, don't pad responses.
 
-You do NOT claim tasks, complete tasks, or do work directly \u2014 you have no access to deskfree_start_task or deskfree_complete_task. Use \`deskfree_dispatch_worker\` to dispatch a worker for each approved task.
+In the main thread you propose and coordinate \u2014 the actual work happens in task threads. Use \`deskfree_dispatch_worker\` to start working on approved tasks.
 - When a human writes in a task thread, decide:
-  - **Continuation of the same task?** \u2192 reopen and dispatch a worker.
-  - **New/different work request?** \u2192 propose it as a new task (don't reopen the old one or do the work yourself).
+  - **Continuation of the same task?** \u2192 reopen and pick it back up.
+  - **New/different work request?** \u2192 propose it as a new task (don't reopen the old one).
   - **Just confirmation or deferred?** \u2192 leave it for now.
 - Estimate token cost per task \u2014 consider files to read, reasoning, output.`;
-    DESKFREE_WORKER_DIRECTIVE = `## DeskFree Worker
-You are a worker sub-agent. Your first message contains pre-loaded context \u2014 use it directly.
+    DESKFREE_WORKER_DIRECTIVE = `## DeskFree \u2014 Task Thread
+You're in a task thread, focused on a specific piece of work. Same you as in the main thread \u2014 same voice, same personality.
+
 Tools: deskfree_state, deskfree_start_task, deskfree_read_file, deskfree_create_file, deskfree_update_file, deskfree_learning, deskfree_complete_task, deskfree_send_message, deskfree_propose.
 
 **Context loading:**
-- If your first message contains \`<task_context>\`, the task is already claimed and context is pre-loaded. Do NOT call deskfree_start_task \u2014 start working immediately.
+- If your first message contains \`<task_context>\`, the task is already loaded. Start working immediately \u2014 do NOT call deskfree_start_task.
 - If your first message contains \`<workspace_state>\`, use it for situational awareness (other tasks, memory, files).
-- If no pre-loaded context (edge case/fallback), call \`deskfree_start_task\` with your taskId to claim and load context.
+- If no pre-loaded context (edge case/fallback), call \`deskfree_start_task\` with your taskId to load it.
 - If continuing from a previous conversation (you can see prior tool calls and context), respond directly to the human's latest message \u2014 do NOT call deskfree_start_task again.
 
 **Orient \u2192 Align \u2192 Work.** Every new task follows this rhythm:
@@ -8083,7 +8140,7 @@ Tools: deskfree_state, deskfree_start_task, deskfree_read_file, deskfree_create_
 - If you discover work that falls outside your task's scope, use \`deskfree_propose\` to suggest follow-up tasks immediately \u2014 don't wait until completion. Propose as you discover, then stay focused on your current task.
 
 **Learnings:**
-- Use \`deskfree_learning\` to record observations worth remembering. A nightly sleep cycle consolidates these into the Memory file. Record:
+- Use \`deskfree_learning\` to record observations worth remembering. A nightly cycle consolidates these into the Memory file. Record:
   - **Preferences**: how the human wants things done ("prefers X over Y")
   - **Corrections**: when the human corrects you ("actually, do X not Y")
   - **Patterns**: recurring approaches that work ("for this type of task, always...")
@@ -8094,13 +8151,12 @@ Tools: deskfree_state, deskfree_start_task, deskfree_read_file, deskfree_create_
 - Do NOT record one-time task details, things in project docs, or obvious/generic knowledge.
 - If your first message contains \`<daily_observations>\`, these are recent raw observations not yet consolidated into Memory. Use them as additional context.
 
-**Sub-agents & delegation:**
-- Your context window is finite. Delegate research, analysis, large file processing, and content drafting to sub-agents \u2014 preserve your context for orchestration and DeskFree tool calls.
-- Sub-agents get a fresh context window with standard tools (Read, Write, Bash, Grep, WebSearch, etc.) but NO DeskFree tools. Pre-load any file content they need into the prompt.
-- Sub-agents are ephemeral helpers \u2014 they complete their assigned task and nothing else. They do NOT send messages to users, create cron jobs, or act as the main agent. Their final output is returned to you.
+**Delegation:**
+- Your context window is finite. Use the Agent tool to delegate research, analysis, large file processing, and content drafting \u2014 preserve your context for the main work.
+- Delegated work gets a fresh context window with standard tools (Read, Write, Bash, Grep, WebSearch, etc.) but NO DeskFree tools. Pre-load any file content they need into the prompt.
 - Use \`run_in_background: true\` for parallel independent work.
-- During Orient, check Memory for sub-agent helper patterns. Inject relevant ones into the sub-agent prompt alongside the task.
-- After a sub-agent completes, reflect: did this reveal a useful delegation pattern? Something to do differently? Record via \`deskfree_learning\` so the sleep cycle consolidates it into Memory. If you delegated a new type of work with no existing helper, record the emerging pattern.
+- During Orient, check Memory for delegation patterns. Inject relevant ones into the prompt alongside the task.
+- After delegated work completes, reflect: did this reveal a useful pattern? Record via \`deskfree_learning\` so it's consolidated into Memory.
 - Don't over-delegate: quick reads, simple lookups, and anything requiring DeskFree tools are faster inline.
 
 **Completing tasks:**
@@ -8477,10 +8533,6 @@ function loadConfig() {
   };
 }
 function mergeWithRemoteConfig(local, remote) {
-  const stateDirOverridden = !!process.env["DESKFREE_STATE_DIR"];
-  const toolsDirOverridden = !!process.env["DESKFREE_TOOLS_DIR"];
-  const stateDir = stateDirOverridden ? local.stateDir : isDocker ? local.stateDir : join(homedir(), ".deskfree", remote.botId, "state");
-  const toolsDir = toolsDirOverridden ? local.toolsDir : isDocker ? local.toolsDir : join(homedir(), ".deskfree", remote.botId, "tools");
   let claudeCodePath;
   if (remote.provider === "claude-code") {
     try {
@@ -8495,8 +8547,6 @@ function mergeWithRemoteConfig(local, remote) {
   }
   return {
     ...local,
-    stateDir,
-    toolsDir,
     claudeCodePath,
     wsUrl: process.env["DESKFREE_WS_URL"] ?? remote.wsUrl,
     model: process.env["DESKFREE_MODEL"] ?? remote.model,
@@ -8522,8 +8572,18 @@ var init_config = __esm({
     init_dist();
     isDocker = process.env["DOCKER"] === "1" || existsSync("/.dockerenv");
     DEFAULTS = {
-      stateDir: isDocker ? "/app/state" : join(homedir(), ".deskfree", "state"),
-      toolsDir: isDocker ? "/app/tools" : join(homedir(), ".deskfree", "tools"),
+      stateDir: isDocker ? "/app/state" : join(
+        homedir(),
+        ".deskfree",
+        process.env["DESKFREE_INSTANCE_NAME"] ?? "main",
+        "state"
+      ),
+      toolsDir: isDocker ? "/app/tools" : join(
+        homedir(),
+        ".deskfree",
+        process.env["DESKFREE_INSTANCE_NAME"] ?? "main",
+        "tools"
+      ),
       logLevel: "info",
       healthPort: 3100
     };
@@ -10775,9 +10835,9 @@ var require_event_target2 = __commonJS({
 var require_extension2 = __commonJS({
   "../../node_modules/ws/lib/extension.js"(exports$1, module) {
     var { tokenChars } = require_validation2();
-    function push(dest, name, elem) {
-      if (dest[name] === void 0) dest[name] = [elem];
-      else dest[name].push(elem);
+    function push(dest, name2, elem) {
+      if (dest[name2] === void 0) dest[name2] = [elem];
+      else dest[name2].push(elem);
     }
     function parse(header) {
       const offers = /* @__PURE__ */ Object.create(null);
@@ -10803,12 +10863,12 @@ var require_extension2 = __commonJS({
               throw new SyntaxError(`Unexpected character at index ${i}`);
             }
             if (end === -1) end = i;
-            const name = header.slice(start, end);
+            const name2 = header.slice(start, end);
             if (code === 44) {
-              push(offers, name, params);
+              push(offers, name2, params);
               params = /* @__PURE__ */ Object.create(null);
             } else {
-              extensionName = name;
+              extensionName = name2;
             }
             start = end = -1;
           } else {
@@ -12889,9 +12949,9 @@ function adaptTool(deskfreeTool) {
     deskfreeTool.name,
     deskfreeTool.description,
     zodShape,
-    async (args2) => {
+    async (args) => {
       const result = await deskfreeTool.execute(
-        args2
+        args
       );
       return {
         content: result.content,
@@ -12922,7 +12982,7 @@ function createOrchestratorMcpServer(client, customTools = [], workerManager) {
 function createDispatchWorkerTool(workerManager) {
   return {
     name: "deskfree_dispatch_worker",
-    description: "Dispatch a long-lived worker to claim and execute a task. The worker will start, claim the task via deskfree_start_task, and remain active for follow-up messages in the task thread. Pass the taskId of the approved task.",
+    description: "Start working on an approved task in its thread. You will pick up the task, load context, and handle follow-up messages there. Pass the taskId of the approved task.",
     parameters: {
       type: "object",
       properties: {
@@ -12990,15 +13050,15 @@ function containsInjectionPattern(content) {
   return INJECTION_PATTERNS.some((pattern) => pattern.test(content));
 }
 function withContentScan(execute, extractContent, scanner) {
-  return async (args2) => {
-    const content = extractContent(args2);
+  return async (args) => {
+    const content = extractContent(args);
     if (content) {
       const result = await scanner.scan(content);
       if (!result.safe) {
         return `Security check failed: ${result.reason ?? "content rejected"}. File not updated.`;
       }
     }
-    return execute(args2);
+    return execute(args);
   };
 }
 function validateDownloadUrl(url) {
@@ -13133,7 +13193,7 @@ function createWorkerMcpServer(client, customTools = [], contentScanner, dailyLo
     if ((t.name === "deskfree_update_file" || t.name === "deskfree_create_file") && contentScanner) {
       const wrappedExecute = withContentScan(
         t.execute,
-        (args2) => typeof args2["content"] === "string" ? args2["content"] : null,
+        (args) => typeof args["content"] === "string" ? args["content"] : null,
         contentScanner
       );
       return {
@@ -14485,8 +14545,9 @@ async function startAgent(opts) {
     model: config.model,
     platform: isDocker2 ? "Docker" : process.platform === "darwin" ? "macOS" : "Linux",
     runtimeVersion,
-    maxConcurrentWorkers: 5
+    maxConcurrentWorkers: 5,
     // updated after WorkerManager is created
+    instanceName: process.env["DESKFREE_INSTANCE_NAME"] || void 0
   };
   mkdirSync(config.stateDir, { recursive: true });
   mkdirSync(config.toolsDir, { recursive: true });
@@ -14724,10 +14785,11 @@ var init_entrypoint = __esm({
 });
 
 // src/bin.ts
-var args = process.argv.slice(2);
-var command = args[0];
+init_paths();
+var [name, cleanArgs] = parseName(process.argv.slice(2));
+var command = cleanArgs[0];
 if (command === "install") {
-  let token = args[1];
+  let token = cleanArgs[1];
   if (!token) {
     const { createInterface } = await import('readline');
     const rl = createInterface({
@@ -14749,20 +14811,20 @@ if (command === "install") {
     }
   }
   const { install: install2 } = await Promise.resolve().then(() => (init_install(), install_exports));
-  install2(token);
+  install2(token, name);
 } else if (command === "uninstall") {
   const { uninstall: uninstall2 } = await Promise.resolve().then(() => (init_uninstall(), uninstall_exports));
-  uninstall2();
+  uninstall2(name);
 } else if (command === "status") {
   const { status: status2 } = await Promise.resolve().then(() => (init_status(), status_exports));
-  status2();
+  status2(name);
 } else if (command === "restart") {
   const { restart: restart2 } = await Promise.resolve().then(() => (init_restart(), restart_exports));
-  restart2();
+  restart2(name);
 } else if (command === "logs") {
-  const follow = args.includes("-f") || args.includes("--follow");
+  const follow = cleanArgs.includes("-f") || cleanArgs.includes("--follow");
   const { logs: logs2 } = await Promise.resolve().then(() => (init_logs(), logs_exports));
-  logs2(follow);
+  logs2(follow, name);
 } else {
   let handleShutdown = function(signal) {
     log.info(`Received ${signal} \u2014 shutting down...`);
@@ -14777,7 +14839,7 @@ if (command === "install") {
   };
   let token;
   if (command === "start") {
-    token = args[1];
+    token = cleanArgs[1];
   } else if (command && !command.startsWith("-")) {
     token = command;
   }