@rubytech/create-maxy-code 0.1.74 → 0.1.79

package/dist/__tests__/plugin-install.test.js

@@ -7,7 +7,7 @@ import assert from "node:assert/strict";
 import { parsePluginList, computeInstallActions, computeConfigureActions, parseExternalPlugins, } from "../lib/plugin-install.js";
 test("parsePluginList extracts name@marketplace tuples", () => {
     const stdout = `
-  ❯ tasks@maxy-platform
+  ❯ work@maxy-platform
     Version: 0.1.0
     Scope: local
 
@@ -16,7 +16,7 @@ test("parsePluginList extracts name@marketplace tuples", () => {
 `;
     const out = parsePluginList(stdout);
     assert.deepEqual(out, [
-        { name: "tasks", marketplace: "maxy-platform" },
+        { name: "work", marketplace: "maxy-platform" },
         { name: "telegram", marketplace: "claude-plugins-official" },
     ]);
 });

package/dist/lib/plugin-install.js

@@ -4,7 +4,7 @@
 // branches unit-testable without stubbing every shell invocation.
 /**
  * `claude plugin list` prints rows like:
- *   ❯ tasks@maxy-platform
+ *   ❯ work@maxy-platform
  *     Version: 0.1.0
  *     Scope: local
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy-code",
-  "version": "0.1.74",
+  "version": "0.1.79",
   "description": "Install Maxy — AI for Productive People",
   "bin": {
     "create-maxy-code": "./dist/index.js"

package/payload/platform/config/brand.json

@@ -47,7 +47,7 @@
   },
 
   "plugins": {
-    "core": ["admin", "memory", "docs", "cloudflare", "anthropic", "workflows", "tasks", "scheduling", "email", "contacts", "projects"],
+    "core": ["admin", "memory", "docs", "cloudflare", "anthropic", "workflows", "work", "scheduling", "email", "contacts", "projects"],
     "defaultEnabled": ["business-assistant", "sales"],
     "available": ["telegram", "waitlist", "deep-research", "whatsapp", "replicate", "linkedin-import"],
     "excluded": []

package/payload/platform/lib/graph-write/dist/index.js

@@ -222,7 +222,7 @@ async function writeNodeWithEdges(params) {
                 .filter((m) => m !== null);
             if (matched.length === 0) {
                 process.stderr.write(`[graph-write] reject reason=missing-provenance labels=${labelCsv} agent=${agentLabel}\n`);
-                throw new Error(`missing-provenance: write to ${labelCsv} requires an inbound :PRODUCED edge from a :Task, :Conversation, or :Message (createdBy.agent='${agentLabel}'). Either pass producedByTaskId on the write (autonomous workflows: call task-create at the start of the flow and thread the returned taskId), or rely on the MCP wrapper's CONVERSATION_NODE_ID env-stamp injection (direct admin asks).`);
+                throw new Error(`missing-provenance: write to ${labelCsv} requires an inbound :PRODUCED edge from a :Task, :Conversation, or :Message (createdBy.agent='${agentLabel}'). Either pass producedByTaskId on the write (autonomous workflows: call work-create at the start of the flow and thread the returned taskId), or rely on the MCP wrapper's CONVERSATION_NODE_ID env-stamp injection (direct admin asks).`);
             }
             provenanceSourceId = matched[0].rel.targetNodeId;
             provenanceSourceLabel = matched[0].sourceLabel;

package/payload/platform/lib/graph-write/src/index.ts

@@ -300,7 +300,7 @@ export async function writeNodeWithEdges(
           `[graph-write] reject reason=missing-provenance labels=${labelCsv} agent=${agentLabel}\n`
         );
         throw new Error(
-          `missing-provenance: write to ${labelCsv} requires an inbound :PRODUCED edge from a :Task, :Conversation, or :Message (createdBy.agent='${agentLabel}'). Either pass producedByTaskId on the write (autonomous workflows: call task-create at the start of the flow and thread the returned taskId), or rely on the MCP wrapper's CONVERSATION_NODE_ID env-stamp injection (direct admin asks).`
+          `missing-provenance: write to ${labelCsv} requires an inbound :PRODUCED edge from a :Task, :Conversation, or :Message (createdBy.agent='${agentLabel}'). Either pass producedByTaskId on the write (autonomous workflows: call work-create at the start of the flow and thread the returned taskId), or rely on the MCP wrapper's CONVERSATION_NODE_ID env-stamp injection (direct admin asks).`
         );
       }
       provenanceSourceId = matched[0].rel.targetNodeId;

package/payload/platform/package.json

@@ -13,7 +13,7 @@
     "build:telegram": "tsc -p plugins/telegram/mcp/tsconfig.json",
     "build:admin": "tsc -p plugins/admin/mcp/tsconfig.json",
     "build:cloudflare": "tsc -p plugins/cloudflare/mcp/tsconfig.json",
-    "build:tasks": "tsc -p plugins/tasks/mcp/tsconfig.json",
+    "build:work": "tsc -p plugins/work/mcp/tsconfig.json",
     "build:email": "tsc -p plugins/email/mcp/tsconfig.json",
     "build:outlook": "tsc -p plugins/outlook/mcp/tsconfig.json",
     "build:workflows": "tsc -p plugins/workflows/mcp/tsconfig.json",

package/payload/platform/plugins/.claude-plugin/marketplace.json

@@ -1,14 +1,114 @@
 {
-  "name": "maxy-premium",
+  "name": "maxy-platform",
   "owner": {
     "name": "Rubytech LLC"
   },
   "plugins": [
+    {
+      "name": "admin",
+      "source": "./admin",
+      "version": "0.1.0"
+    },
+    {
+      "name": "business-assistant",
+      "source": "./business-assistant",
+      "version": "0.1.0"
+    },
+    {
+      "name": "cloudflare",
+      "source": "./cloudflare",
+      "version": "0.1.0"
+    },
+    {
+      "name": "contacts",
+      "source": "./contacts",
+      "version": "0.1.0"
+    },
+    {
+      "name": "deep-research",
+      "source": "./deep-research",
+      "version": "0.1.0"
+    },
+    {
+      "name": "docs",
+      "source": "./docs",
+      "version": "0.1.0"
+    },
+    {
+      "name": "email",
+      "source": "./email",
+      "version": "0.1.0"
+    },
+    {
+      "name": "linkedin-import",
+      "source": "./linkedin-import",
+      "version": "0.1.0"
+    },
+    {
+      "name": "memory",
+      "source": "./memory",
+      "version": "0.1.0"
+    },
+    {
+      "name": "outlook",
+      "source": "./outlook",
+      "version": "0.1.0"
+    },
+    {
+      "name": "projects",
+      "source": "./projects",
+      "version": "0.1.0"
+    },
+    {
+      "name": "replicate",
+      "source": "./replicate",
+      "version": "0.1.0"
+    },
+    {
+      "name": "sales",
+      "source": "./sales",
+      "version": "0.1.0"
+    },
+    {
+      "name": "scheduling",
+      "source": "./scheduling",
+      "version": "0.1.0"
+    },
+    {
+      "name": "tasks",
+      "source": "./tasks",
+      "version": "0.1.0"
+    },
     {
       "name": "teaching",
       "source": "./teaching",
       "version": "0.1.0"
     },
+    {
+      "name": "telegram",
+      "source": "./telegram",
+      "version": "0.1.0"
+    },
+    {
+      "name": "waitlist",
+      "source": "./waitlist",
+      "version": "0.1.0"
+    },
+    {
+      "name": "whatsapp",
+      "source": "./whatsapp",
+      "version": "0.1.0"
+    },
+    {
+      "name": "work",
+      "source": "./work",
+      "version": "0.1.0"
+    },
+    {
+      "name": "workflows",
+      "source": "./workflows",
+      "version": "0.1.0"
+    },
     {
       "name": "writer-craft",
       "source": "./writer-craft",

package/payload/platform/plugins/admin/mcp/dist/index.js

@@ -25,17 +25,42 @@ const server = new McpServer({
     version: "0.1.0",
 });
 const PLATFORM_ROOT = process.env.PLATFORM_ROOT ?? resolve(import.meta.dirname, "../../../..");
-const ACCOUNT_ID = process.env.ACCOUNT_ID;
-if (!ACCOUNT_ID) {
-    throw new Error("ACCOUNT_ID environment variable is required");
+// Plugin-system boot tolerance — see Task 202.
+// Module-init must never throw; plugin-system spawn enumerates tools/list
+// before any per-account env is set. Per-call refusal preserves account
+// isolation in metadata-only mode.
+const ACCOUNT_ID = process.env.ACCOUNT_ID ?? null;
+process.stderr.write(`[admin] boot accountId=${ACCOUNT_ID ?? "null"}\n`);
+function refuseNoAccount(toolName) {
+    process.stderr.write(`[admin] tool=${toolName} refuse reason=no-account-context\n`);
+    return {
+        content: [
+            {
+                type: "text",
+                text: `${toolName} cannot execute: this MCP instance was launched without ACCOUNT_ID (plugin-system metadata-only mode). Per-account admin tools require ACCOUNT_ID at spawn.`,
+            },
+        ],
+        isError: true,
+    };
 }
 // Task 142 — `PLATFORM_PORT` is the internal loopback port, stamped on
 // the claude-session-manager systemd unit and forwarded to this MCP
 // process via the per-spawn `maxy-mcp-*.json` env block written by
 // `pty-spawner.writePerSpawnMcpConfig`. `MAXY_BRAND_PORT` is the brand's
 // public UI port, used only for display-surface `.local` URLs.
-const PLATFORM_PORT = String(requirePortEnv("PLATFORM_PORT", { tag: "admin:module-init" }));
-const MAXY_BRAND_PORT = String(requirePortEnv("MAXY_BRAND_PORT", { tag: "admin:module-init" }));
+// Ports are best-effort at boot: plugin-system metadata-only spawn has no
+// port env, so we capture the loud-fail message instead of crashing. Real
+// per-account spawns supply both; any handler reaching the port-using code
+// paths is gated upstream by the accountId refusal.
+let PLATFORM_PORT = "";
+let MAXY_BRAND_PORT = "";
+try {
+    PLATFORM_PORT = String(requirePortEnv("PLATFORM_PORT", { tag: "admin:module-init" }));
+    MAXY_BRAND_PORT = String(requirePortEnv("MAXY_BRAND_PORT", { tag: "admin:module-init" }));
+}
+catch (err) {
+    process.stderr.write(`[admin] boot port-env unavailable — ${err.message}\n`);
+}
 // Brand-aware config — reads configDir, productName, and commercialMode from
 // brand.json stamped at install time. commercialMode gates the
 // entitlement verifier: false (default) preserves personal-mode installs;
@@ -114,6 +139,9 @@ async function currentEntitlement() {
 const REMOTE_PASSWORD_FILE = resolve(CONFIG_DIR, ".remote-password");
 // Resolve account directory
 function getAccountDir() {
+    if (!ACCOUNT_ID) {
+        throw new Error("getAccountDir() called without ACCOUNT_ID — handler guard missing");
+    }
     const dir = resolve(PLATFORM_ROOT, "..", "data/accounts", ACCOUNT_ID);
     if (!existsSync(dir)) {
         throw new Error(`Account directory not found: ${dir}`);
@@ -220,6 +248,8 @@ function checkPort(port, timeoutMs = 1000) {
     });
 }
 eagerTool(server, "system-status", "Check health of all Maxy platform services: Neo4j, Ollama, Cloudflare tunnel, crontab (Maxy cron entries), VNC, Chrome (CDP), specialist agents, and deployed brand identity.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("system-status");
     const checks = {};
     try {
         // NEO4J_URI must be explicit. The outer try/catch surfaces the
@@ -407,6 +437,8 @@ eagerTool(server, "system-status", "Check health of all Maxy platform services:
     return { content: [{ type: "text", text: formatted }] };
 });
 eagerTool(server, "public-hostname", "Resolve this account's canonical public hostname. Reads cloudflared ingress + alias-domains.json — the same files the platform server trusts to route. Returns a single deterministic answer; use this immediately after publish-site to construct the full URL.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("public-hostname");
     const TAG = "[admin:public-hostname]";
     try {
         const result = resolvePublicHostname(CONFIG_DIR);
@@ -437,6 +469,8 @@ eagerTool(server, "public-hostname", "Resolve this account's canonical public ho
     }
 });
 eagerTool(server, "remote-auth-status", "Check whether the remote access password is configured. When not configured, emits a device-bound URL affordance (maxy-device-url fenced block) pointing at the password setup page — this URL opens on the device's own screen when the operator clicks it. The agent never constructs the password file path or runs shell commands — this tool is the single authority.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("remote-auth-status");
     const TAG = "[remote-auth-status]";
     // Task 142: `.local` URL is a display surface — read the brand's
     // public port. The loopback fetch reads PLATFORM_PORT (internal).
@@ -476,6 +510,8 @@ eagerTool(server, "remote-auth-status", "Check whether the remote access passwor
     }
 });
 eagerTool(server, "brand-settings", "Read the brand/styling configuration (name, tagline, colours, fonts, plugin sets). Reads from config/brand.json (stamped by the bundler at install time).", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("brand-settings");
     try {
         const brandPath = resolve(PLATFORM_ROOT, "config", "brand.json");
         if (!existsSync(brandPath)) {
@@ -492,6 +528,8 @@ eagerTool(server, "brand-settings", "Read the brand/styling configuration (name,
     }
 });
 eagerTool(server, "account-manage", "Read the account configuration (tier, domains, settings).", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("account-manage");
     try {
         const config = await readAccountConfig();
         return {
@@ -509,6 +547,8 @@ eagerTool(server, "account-update", "Update a user-configurable setting in accou
     field: z.enum(["outputStyle", "thinkingView", "effort", "adminModel", "publicModel", "defaultAgent"]),
     value: z.string(),
 }, async ({ field, value }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("account-update");
     const VALID = {
         outputStyle: ["default", "explanatory"],
         thinkingView: ["default", "expanded", "collapsed"],
@@ -588,6 +628,8 @@ server.tool("plugin-toggle-enabled", "Enable or disable a plugin in this account
     pluginName: z.string().describe("Plugin slug (lowercase a-z0-9-)."),
     action: z.enum(["enable", "disable"]).describe("enable adds to enabledPlugins; disable removes."),
 }, async ({ pluginName, action }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("plugin-toggle-enabled");
     const TAG = "[admin:plugin-toggle-enabled]";
     if (!VALID_PLUGIN_NAME.test(pluginName)) {
         return { content: [{ type: "text", text: `${TAG} Invalid plugin name "${pluginName}". Must match ${VALID_PLUGIN_NAME}.` }], isError: true };
@@ -632,6 +674,8 @@ eagerTool(server, "admin-add", "Add a new admin user to this account. Creates a
     name: z.string().describe("Display name for the new admin (stored on the AdminUser node in Neo4j)."),
     pin: z.string().optional().describe("Optional PIN (minimum 4 digits). If omitted, a unique 4-digit PIN is generated."),
 }, async ({ name, pin: rawPin }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("admin-add");
     const TAG = "[admin]";
     if (!name.trim()) {
         return { content: [{ type: "text", text: `${TAG} Name is required.` }], isError: true };
@@ -818,6 +862,8 @@ eagerTool(server, "admin-add", "Add a new admin user to this account. Creates a
 eagerTool(server, "admin-remove", "Remove an admin from this account. Removes them from the account's admins list (account.json) and deletes the ADMIN_OF relationship in Neo4j. Does NOT remove the device-level user entry (they may admin other accounts). Cannot remove the last admin on the account.", {
     userId: z.string().describe("The userId of the admin to remove (use admin-list to find userIds)"),
 }, async ({ userId }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("admin-remove");
     const TAG = "[admin]";
     const callerUserId = process.env.USER_ID;
     // Read account.json and validate
@@ -892,6 +938,8 @@ eagerTool(server, "admin-remove", "Remove an admin from this account. Removes th
     };
 });
 eagerTool(server, "admin-list", "List all admins for this account with their names and roles.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("admin-list");
     const TAG = "[admin]";
     let admins;
     try {
@@ -937,6 +985,8 @@ eagerTool(server, "admin-update-pin", "Update an existing admin user's PIN. Defa
     userId: z.string().optional().describe("The userId of the admin whose PIN to update. Defaults to the caller (the admin invoking this tool)."),
     newPin: z.string().describe("The new PIN. Minimum 4 digits, no upper bound."),
 }, async ({ userId: targetUserId, newPin }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("admin-update-pin");
     const TAG = "[admin-update-pin]";
     const callerUserId = process.env.USER_ID;
     const userId = targetUserId ?? callerUserId;
@@ -994,6 +1044,8 @@ server.tool("agent-image", "Upload, update, or remove an agent's image. action=s
     filePath: z.string().optional().describe("Absolute path to the image file (required for action=set)"),
     imageShape: z.enum(["circle", "rounded"]).optional().describe("Image shape: circle for avatars, rounded for logos (required for action=set)"),
 }, async ({ agentSlug, action, filePath, imageShape }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("agent-image");
     const VALID_IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg"];
     try {
         const accountDir = getAccountDir();
@@ -1104,6 +1156,8 @@ server.tool("agent-image", "Upload, update, or remove an agent's image. action=s
 server.tool("agent-config-read", "Read the full config.json for a specific public agent by slug. Returns the complete configuration including slug, displayName, model, plugins, status, liveMemory, and any other fields.", {
     slug: z.string().describe("Agent slug (directory name under agents/)"),
 }, async ({ slug }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("agent-config-read");
     const TAG = "[admin:agent-config-read]";
     // Path traversal guard
     if (slug.includes("/") || slug.includes("\\") || slug.includes("..")) {
@@ -1138,6 +1192,8 @@ server.tool("agent-config-read", "Read the full config.json for a specific publi
     }
 });
 server.tool("agent-list", "List all public (non-admin) agents with their full configuration: slug, displayName, model, plugins, status, liveMemory, and whether each is the account's default agent.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("agent-list");
     const TAG = "[admin:agent-list]";
     try {
         const accountDir = getAccountDir();
@@ -1202,6 +1258,8 @@ eagerTool(server, "logs-read", "Read recent logs. Stream logs (type=agent-stream
     sessionKey: z.string().optional(),
     conversationId: z.string().optional(),
 }, async ({ type, lines = 50, sessionKey, conversationId }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("logs-read");
     try {
         const LOG_DIR = resolve(getAccountDir(), "logs");
         // sessionKey is the single identifier on disk.
@@ -1418,6 +1476,8 @@ eagerTool(server, "store-skill", "Save an operator-authored skill on disk as par
         content: z.string().describe("Reference file body content."),
     })).default([]).describe("Optional reference files written under skills/<skillName>/references/."),
 }, async ({ pluginName, skillName, description, publicEmbed, body, references }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("store-skill");
     const KEBAB_RE = /^[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?$/;
     const REF_RE = /^[a-z0-9-]+\.md$/;
     if (!KEBAB_RE.test(pluginName)) {
@@ -1531,6 +1591,8 @@ eagerTool(server, "plugin-read", "Read a plugin definition (PLUGIN.md) or one of
     pluginName: z.string().describe("Name of the plugin directory (e.g. 'sales', 'business-assistant')"),
     file: z.string().optional().describe("Specific file to read (e.g. 'references/pricing.md'). Defaults to PLUGIN.md."),
 }, async ({ pluginName, file }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("plugin-read");
     try {
         const resolvedFile = file ?? "PLUGIN.md";
         const pluginPath = resolve(PLATFORM_ROOT, "plugins", pluginName, resolvedFile);
@@ -1614,6 +1676,8 @@ eagerTool(server, "plugin-read", "Read a plugin definition (PLUGIN.md) or one of
 server.tool("skill-find", "Find which plugin owns a skill by name. Walks plugins/*/skills/<skillName>/SKILL.md and returns the owning plugin (unique), every candidate (ambiguous), or not-found. For the common resolve-and-read case, prefer `skill-load skillName=<name>` — it returns the SKILL.md body in the same call.", {
     skillName: z.string().regex(/^[a-z0-9][a-z0-9-]*$/, "skillName must be lowercase kebab-case (a-z, 0-9, -)"),
 }, async ({ skillName }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("skill-find");
     const start = Date.now();
     const result = findSkillOwners(PLATFORM_ROOT, skillName);
     const ms = Date.now() - start;
@@ -1657,6 +1721,8 @@ server.tool("skill-find", "Find which plugin owns a skill by name. Walks plugins
 eagerTool(server, "skill-load", "Load a plugin skill's SKILL.md body by skill name. One call: resolves the owning plugin and reads the body, with brand placeholders substituted. Returns the SKILL.md body when exactly one plugin owns the skill, a candidate list when multiple plugins own it (ambiguous), or an error when no plugin owns it.", {
     skillName: z.string().regex(/^[a-z0-9][a-z0-9-]*$/, "skillName must be lowercase kebab-case (a-z, 0-9, -)"),
 }, async ({ skillName }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("skill-load");
     const start = Date.now();
     try {
         const outcome = await loadSkill(PLATFORM_ROOT, skillName);
@@ -1693,7 +1759,7 @@ eagerTool(server, "skill-load", "Load a plugin skill's SKILL.md body by skill na
         if (requiredInputs) {
             const slotLabels = requiredInputs.map(s => s.join(" | ")).join(", ");
             const marker = JSON.stringify(requiredInputs);
-            const notice = `<!-- skill-input-contract requiredInputs=${marker} -->\nREQUIRED INPUTS: ${slotLabels}\nIf the operator has not supplied each of these inputs, your next tool call MUST be AskUserQuestion. Do not use memory-search, conversation-search, graph-read, or task-get to guess the missing input.\n<!-- /skill-input-contract -->\n\n`;
+            const notice = `<!-- skill-input-contract requiredInputs=${marker} -->\nREQUIRED INPUTS: ${slotLabels}\nIf the operator has not supplied each of these inputs, your next tool call MUST be AskUserQuestion. Do not use memory-search, conversation-search, graph-read, or work-get to guess the missing input.\n<!-- /skill-input-contract -->\n\n`;
             bodyOut = notice + content;
         }
         const ms = Date.now() - start;
@@ -1721,14 +1787,24 @@ eagerTool(server, "skill-load", "Load a plugin skill's SKILL.md body by skill na
 // already carry the rows; no new conversations write to it.
 eagerTool(server, "session-reset", "Reset the current session. Compacts conversation history to memory, clears the visible conversation, " +
     "and starts a fresh session with a new greeting. Call when the user asks to start a new session, " +
-    "clear the conversation, or start fresh.", {}, async () => ({ content: [{ type: "text", text: "reset" }] }));
+    "clear the conversation, or start fresh.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("session-reset");
+    return { content: [{ type: "text", text: "reset" }] };
+});
 eagerTool(server, "session-resume", "Resume a previous session. Loads the selected session's message history into the chat timeline " +
     "and routes new messages to that conversation. Call after the user selects a session from the " +
-    "session-list results. Pass the conversationId from the selected session.", { conversationId: z.string().uuid().describe("The conversationId of the session to resume") }, async () => ({ content: [{ type: "text", text: "resumed" }] }));
+    "session-list results. Pass the conversationId from the selected session.", { conversationId: z.string().uuid().describe("The conversationId of the session to resume") }, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("session-resume");
+    return { content: [{ type: "text", text: "resumed" }] };
+});
 server.tool("remote-auth-set-password", "Set the remote access password. Hashes with scrypt and writes to the platform's brand-specific config directory with mode 0600. " +
     "Validates strength (8+ chars, digit, special character, no spaces anywhere). " +
     "Protects the admin interface when exposed over the tunnel — has no effect on the public endpoint or the tunnel itself. " +
     "Set before `setup-tunnel.sh` — the script's post-restart verification curls the admin hostname and fails if remote-auth is not configured.", { password: z.string() }, async ({ password }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("remote-auth-set-password");
     // Validate strength — same rules as the web server's validatePasswordStrength
     const checks = [
         { label: "at least 8 characters", met: password.length >= 8 },
@@ -1777,6 +1853,8 @@ eagerTool(server, "qr-generate", "Generate a QR code from text or a URL. Returns
         .describe("File path to save the PNG. If omitted, returns a data URI."),
     width: z.number().optional().describe("Width in pixels (default 300)"),
 }, async ({ data, outputPath, width }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("qr-generate");
     try {
         const options = { width: width ?? 300, margin: 2 };
         if (outputPath) {
@@ -1831,6 +1909,8 @@ eagerTool(server, "wifi", "Manage WiFi connections on this device. Actions: " +
     ssid: z.string().optional().describe("Network name — required for connect and forget actions"),
     password: z.string().optional().describe("Network password — required for connect action (WPA/WPA2/WPA3 PSK)"),
 }, async ({ action, ssid, password }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("wifi");
     /** Parse nmcli terse output into rows of colon-separated fields.
      *  nmcli -t escapes literal colons in values as \: — split on
      *  unescaped colons only, then unescape the fields. */
@@ -2084,6 +2164,8 @@ eagerTool(server, "wifi", "Manage WiFi connections on this device. Actions: " +
 server.tool("premium-list", "List available premium plugins and their delivery status. Returns structured data " +
     "for each premium plugin in the staging area: name, type (standalone/bundle), description, " +
     "purchase status, and delivery status (per sub-plugin for bundles).", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("premium-list");
     try {
         if (!existsSync(STAGING_ROOT)) {
             return {
@@ -2158,6 +2240,8 @@ server.tool("premium-deliver", "Deliver a purchased premium plugin. Copies plugi
     "status and available templates.", {
     pluginName: z.string().describe("Name of the premium plugin to deliver (e.g. 'real-agent', 'teaching')"),
 }, async ({ pluginName }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("premium-deliver");
     const TAG = "[premium-deliver]";
     // --- Validate plugin name ---
     if (!pluginName || !VALID_PLUGIN_NAME.test(pluginName)) {
@@ -2404,6 +2488,8 @@ eagerTool(server, "file-attach", "Attach a file from the account directory for d
     "and size on screen.", {
     filePath: z.string().describe("Absolute path to the file to attach"),
 }, async ({ filePath }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("file-attach");
     const TAG = "[file-attach]";
     if (!filePath || !filePath.trim()) {
         return {
@@ -2572,6 +2658,13 @@ async function persistApprovalToolCall(opts) {
         console.error(`[approval] ToolCall skipped (no conversationId): tool=${opts.toolName} state=${opts.approvalState}`);
         return;
     }
+    if (!ACCOUNT_ID) {
+        // Boot-tolerance refusal handlers gate every caller, so reaching here is
+        // a guard regression rather than a steady-state condition. Throw loud so
+        // the missing handler-level guard is identified, not silently default to
+        // empty-string accountId (which would mint orphan ToolCall nodes).
+        throw new Error(`[approval] persistApprovalToolCall reached without ACCOUNT_ID — handler guard missing for tool=${opts.toolName}`);
+    }
     const session = getSession();
     try {
         const optionalFields = [
@@ -2642,6 +2735,9 @@ async function dispatchApprovedAction(plugin, tool, args, timeoutMs = 30_000) {
             env[k] = v;
     }
     env.PLATFORM_ROOT = PLATFORM_ROOT;
+    if (!ACCOUNT_ID) {
+        throw new Error("dispatchApprovedAction called without ACCOUNT_ID — handler guard missing");
+    }
     env.ACCOUNT_ID = ACCOUNT_ID;
     const transport = new StdioClientTransport({
         command: process.execPath,
@@ -2690,6 +2786,8 @@ async function dispatchApprovedAction(plugin, tool, args, timeoutMs = 30_000) {
 eagerTool(server, "action-pending", "List actions that are queued for human approval. Returns each pending action's ID, " +
     "tool name, input summary, and when it was queued. Use this to review what the agent " +
     "wanted to do before approving or rejecting.", {}, async () => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("action-pending");
     const actions = readPendingActions();
     if (actions.length === 0) {
         return {
@@ -2710,6 +2808,8 @@ eagerTool(server, "action-approve", "Approve a pending action and execute it imm
     actionId: z.string().describe("The action ID to approve (from action-pending)"),
     conversationId: z.string().optional().describe("Current conversation ID for audit trail linking"),
 }, async ({ actionId, conversationId }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("action-approve");
     const action = readPendingAction(actionId);
     if (!action) {
         return {
@@ -2780,6 +2880,8 @@ eagerTool(server, "action-reject", "Reject a pending action. The action is not e
     reason: z.string().optional().describe("Optional reason for rejection"),
     conversationId: z.string().optional().describe("Current conversation ID for audit trail linking"),
 }, async ({ actionId, reason, conversationId }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("action-reject");
     const action = readPendingAction(actionId);
     if (!action) {
         return {
@@ -2822,6 +2924,8 @@ eagerTool(server, "action-edit", "Edit a pending action's input and then execute
     editedInput: z.string().describe("The modified tool input as a JSON string"),
     conversationId: z.string().optional().describe("Current conversation ID for audit trail linking"),
 }, async ({ actionId, editedInput, conversationId }) => {
+    if (!ACCOUNT_ID)
+        return refuseNoAccount("action-edit");
     const action = readPendingAction(actionId);
     if (!action) {
         return {