@rubytech/create-maxy-code 0.1.499 → 0.1.501

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

@@ -5,7 +5,7 @@ import { z } from "zod";
 import { readFile, writeFile } from "node:fs/promises";
 import { resolve, join } from "node:path";
 import { execFile, execFileSync } from "node:child_process";
-import { appendFileSync, cpSync, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { appendFileSync, cpSync, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { writeAdminEntry, removeAdminFromAccount, logUsersAudit, formatAuditRowIds } from "../../../../lib/admins-write/dist/index.js";
 import { setAccessPassword as setAccessPasswordHash, clearAccessPassword as clearAccessPasswordHash, accessPasswordCollides } from "../../../../lib/admin-access-password/dist/index.js";
 import { resolveCredentialTarget } from "./credential-identity.js";
@@ -20,6 +20,7 @@ import { homedir, hostname as osHostname } from "node:os";
 import QRCode from "qrcode";
 import { getSession, closeDriver } from "./lib/neo4j.js";
 import { findSkillOwners, searchSkills, computePluginReadHint, loadSkill, parseRequiredInputs, adminAuthoringSkillBlock, skillSlugFromReadArgs, AUTHORING_DISPATCH_HINT } from "./skill-resolution.js";
+import { storeSkillToAccount } from "./store-skill-core.js";
 import { resolvePublicHostname } from "./lib/public-hostname.js";
 import { resolveAdminHostname } from "./lib/admin-hostname.js";
 import { publishSite } from "./tools/publish-site.js";
@@ -1808,15 +1809,16 @@ eagerTool(server, "cpu-triage-read", "Read a cpu-triage run started by cpu-triag
     }
     return { content: [{ type: "text", text: JSON.stringify(out, null, 2) }] };
 });
-// operator-authored skills are written to disk as a plugin so the
-// existing plugin-manifest loader picks them up (parsePluginFrontmatter +
-// assemblePublicPluginContent + loadEmbeddedPlugins all read from
-// <PLATFORM_ROOT>/plugins/<dir>/). Canonical = <accountDir>/plugins/<plugin>
-// survives installer rmSync (data/ excluded); the mirror under
-// <PLATFORM_ROOT>/plugins/<plugin> is rehydrated at admin session start by
-// autoDeliverUserPlugins. The agent supplies pluginName/skillName/body —
-// path is computed by this tool from ACCOUNT_ID. Symmetric write counterpart
-// to plugin-read.
+// Task 1962 — operator-authored skills are written as a plugin under the
+// per-account root <accountDir>/plugins/<plugin>/ ONLY. That copy survives the
+// installer wipe (data/ is excluded) and is loaded directly by the spawn
+// manifest (computeActivePlugins) and the admin skill resolvers, which walk the
+// account root. Nothing is written to the immutable PLATFORM_ROOT/plugins tree
+// (chattr +i) and there is no platform mirror. The write+resolve core lives in
+// store-skill-core.ts and fails closed if the written skill does not resolve,
+// so success is never reported for a skill that cannot load. The agent supplies
+// pluginName/skillName/body — the path is computed from ACCOUNT_ID. Symmetric
+// write counterpart to plugin-read.
 eagerTool(server, "store-skill", "Save an operator-authored skill on disk as part of an admin-managed plugin. " +
     "The skill becomes immediately discoverable by the admin agent (and the public agent if publicEmbed=true). " +
     "Path is computed internally from the active account; the agent supplies content + names only. " +
@@ -1850,97 +1852,31 @@ eagerTool(server, "store-skill", "Save an operator-authored skill on disk as par
         }
     }
     const accountDir = getAccountDir();
-    const canonicalPluginDir = resolve(accountDir, "plugins", pluginName);
-    const mirrorPluginDir = resolve(PLATFORM_ROOT, "plugins", pluginName);
-    const canonicalPluginMd = resolve(canonicalPluginDir, "PLUGIN.md");
-    const mirrorPluginMd = resolve(mirrorPluginDir, "PLUGIN.md");
-    // Collision: mirror dir exists from a shipped plugin (no canonical mirror).
-    // Refuse rather than silently shadow.
-    if (existsSync(mirrorPluginMd) && !existsSync(canonicalPluginMd)) {
-        console.error(`[store-skill] ERROR pluginName=${pluginName} skillName=${skillName} reason=collision-with-shipped path=${mirrorPluginDir}`);
-        return { content: [{ type: "text", text: `pluginName "${pluginName}" collides with a shipped plugin. Choose a different pluginName.` }], isError: true };
-    }
-    const skillDir = resolve(canonicalPluginDir, "skills", skillName);
-    const action = existsSync(resolve(skillDir, "SKILL.md")) ? "overwrite" : "create";
-    try {
-        mkdirSync(canonicalPluginDir, { recursive: true });
-        // Compose PLUGIN.md only on first write. embed=["admin","public"] +
-        // optional=false matches assemblePublicPluginContent / loadEmbeddedPlugins
-        // expectations. metadata is single-line JSON (parsePluginFrontmatter at
-        // plugin-manifest.ts:67 expects single-line) — multi-line silently falls
-        // back to platform={}.
-        if (!existsSync(canonicalPluginMd)) {
-            const pluginMd = `---
-name: ${pluginName}
-description: "Operator-authored plugin"
-tools: []
-hidden: []
-requires: []
-metadata: {"platform":{"embed":["admin","public"],"optional":false}}
----
-
-# ${pluginName}
-
-Operator-authored plugin. Skills under \`skills/\` were created via the admin skill-builder.
-`;
-            writeFileSync(canonicalPluginMd, pluginMd);
-        }
-        // Reset skill dir before write so removed reference files don't linger.
-        if (existsSync(skillDir)) {
-            rmSync(skillDir, { recursive: true, force: true });
-        }
-        mkdirSync(skillDir, { recursive: true });
-        // Normalise description — strip newlines and tabs to keep YAML
-        // frontmatter on a single line. parsePluginFrontmatter uses a
-        // single-line regex; an embedded newline (or `\n---\n`) would
-        // otherwise corrupt the frontmatter parse and silently drop body
-        // content from the agent prompt.
-        const singleLineDescription = description.replace(/[\r\n\t]+/g, " ").trim();
-        const escapedDescription = singleLineDescription.replace(/"/g, '\\"');
-        const skillMd = `---
-name: ${skillName}
-description: "${escapedDescription}"
-publicEmbed: ${publicEmbed}
----
-
-${body}
-`;
-        writeFileSync(resolve(skillDir, "SKILL.md"), skillMd);
-        let refCount = 0;
-        if (references.length > 0) {
-            const refsDir = resolve(skillDir, "references");
-            mkdirSync(refsDir, { recursive: true });
-            for (const ref of references) {
-                writeFileSync(resolve(refsDir, ref.filename), ref.content);
-                refCount++;
-            }
-        }
-        // Write the `.user-mirror` marker to CANONICAL first — cpSync will
-        // carry it into the platform-side mirror as part of the same recursive
-        // copy. This eliminates the post-cpSync writeFileSync race: if cpSync
-        // succeeds, the marker is already in target; if cpSync fails partway,
-        // canonical's marker is intact and the next autoDeliverUserPlugins
-        // call retries the copy. autoDeliverUserPlugins relies on the marker
-        // arriving with the source tree — never writes its own marker.
-        writeFileSync(resolve(canonicalPluginDir, ".user-mirror"), `pluginName=${pluginName}\nsource=${canonicalPluginDir}\n`);
-        // Mirror to <PLATFORM_ROOT>/plugins/<pluginName>/ so the change is
-        // visible to the loader without a session restart.
-        mkdirSync(mirrorPluginDir, { recursive: true });
-        cpSync(canonicalPluginDir, mirrorPluginDir, { recursive: true, force: true });
-        const bodyBytes = Buffer.byteLength(body, "utf-8");
-        console.log(`[store-skill] write pluginName=${pluginName} skillName=${skillName} publicEmbed=${publicEmbed} path=${canonicalPluginDir} bodyBytes=${bodyBytes} referenceCount=${refCount} action=${action}`);
-        return {
-            content: [{
-                    type: "text",
-                    text: `Skill "${skillName}" saved to plugin "${pluginName}" (${action}). publicEmbed=${publicEmbed}, references=${refCount}. Active immediately for the admin agent${publicEmbed ? "; surfaces in the public agent on next session start" : ""}.`,
-                }],
-        };
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(`[store-skill] ERROR pluginName=${pluginName} skillName=${skillName} reason=${msg.slice(0, 120)} path=${canonicalPluginDir}`);
-        return { content: [{ type: "text", text: `Failed to write skill: ${msg}` }], isError: true };
-    }
+    const result = await storeSkillToAccount({
+        accountDir,
+        platformRoot: PLATFORM_ROOT,
+        pluginName,
+        skillName,
+        description,
+        publicEmbed,
+        body,
+        references,
+    });
+    if (!result.ok) {
+        const isCollision = result.reason === "collision-with-shipped";
+        console.error(`[store-skill] op=store-skill root=account path=${result.canonicalPluginDir} resolved=false reason=${result.reason} pluginName=${pluginName} skillName=${skillName} detail=${result.detail.slice(0, 120)}`);
+        const text = isCollision
+            ? `pluginName "${pluginName}" collides with a shipped plugin. Choose a different pluginName.`
+            : `Skill "${skillName}" was written to "${pluginName}" but did not register: ${result.detail}. Not activating.`;
+        return { content: [{ type: "text", text }], isError: true };
+    }
+    console.log(`[store-skill] op=store-skill root=account path=${result.canonicalPluginDir} resolved=true pluginName=${pluginName} skillName=${skillName} publicEmbed=${publicEmbed} bodyBytes=${result.bodyBytes} referenceCount=${result.refCount} action=${result.action}`);
+    return {
+        content: [{
+                type: "text",
+                text: `Skill "${skillName}" saved to plugin "${pluginName}" (${result.action}). publicEmbed=${publicEmbed}, references=${result.refCount}. Active immediately for the admin agent${publicEmbed ? "; surfaces in the public agent on next session start" : ""}.`,
+            }],
+    };
 });
 eagerTool(server, "plugin-read", "Read a plugin definition (PLUGIN.md) or one of its reference files.", {
     pluginName: z.string().describe("Name of the plugin directory (e.g. 'sales', 'business-assistant')"),
@@ -1960,14 +1896,23 @@ eagerTool(server, "plugin-read", "Read a plugin definition (PLUGIN.md) or one of
             console.log(`[admin-skill-gate] role=admin skill=${authoringSlug} decision=block reason=content-producer-owned`);
             return { content: [{ type: "text", text: AUTHORING_DISPATCH_HINT }], isError: true };
         }
-        const pluginPath = resolve(PLATFORM_ROOT, "plugins", pluginName, resolvedFile);
+        // Task 1962 — operator-authored plugins live under the account root, not
+        // the platform tree. Prefer the platform copy; fall back to the account
+        // root so an operator plugin's PLUGIN.md / SKILL.md / references resolve.
+        const accountPluginsDir = resolve(getAccountDir(), "plugins");
+        const platformPath = resolve(PLATFORM_ROOT, "plugins", pluginName, resolvedFile);
+        const accountPath = resolve(accountPluginsDir, pluginName, resolvedFile);
+        const pluginPath = existsSync(platformPath) ? platformPath : accountPath;
+        const pluginRootDir = existsSync(platformPath)
+            ? resolve(PLATFORM_ROOT, "plugins", pluginName)
+            : resolve(accountPluginsDir, pluginName);
         if (!existsSync(pluginPath)) {
             // when the agent's pluginName/file combination misses
             // a skill that DOES live under `plugins/*/skills/<slug>/SKILL.md`,
             // surface the corrected pluginName AND the canonical file path so
             // the next call is deterministic. Both wrong-`file` and wrong-`pluginName`
             // shapes feed through `computePluginReadHint`.
-            const hint = computePluginReadHint(PLATFORM_ROOT, pluginName, resolvedFile);
+            const hint = computePluginReadHint(PLATFORM_ROOT, pluginName, resolvedFile, accountPluginsDir);
             const hintText = hint ? ` Did you mean pluginName="${hint.pluginName}", file="${hint.file}"?` : "";
             console.log(`[plugin-read] ${pluginName}/${resolvedFile} not-found hint=${hint ? hint.pluginName : "none"}`);
             return {
@@ -1984,7 +1929,7 @@ eagerTool(server, "plugin-read", "Read a plugin definition (PLUGIN.md) or one of
         // Append file inventory on default calls (PLUGIN.md) so agents can discover
         // skill and reference paths without guessing
         if (resolvedFile === "PLUGIN.md") {
-            const pluginRoot = resolve(PLATFORM_ROOT, "plugins", pluginName);
+            const pluginRoot = pluginRootDir;
             const skills = [];
             const references = [];
             const scanDir = (base, prefix, target) => {
@@ -2044,7 +1989,7 @@ lifelineTool(server, "skill-find", "Find which plugin owns a skill by name. Walk
     if (!ACCOUNT_ID)
         return refuseNoAccount("skill-find");
     const start = Date.now();
-    const result = findSkillOwners(PLATFORM_ROOT, skillName);
+    const result = findSkillOwners(PLATFORM_ROOT, skillName, resolve(getAccountDir(), "plugins"));
     const ms = Date.now() - start;
     console.log(`[skill-find] skillName=${skillName} result=${result.status} candidates=${result.candidates.length} ms=${ms}`);
     if (result.status === "unique") {
@@ -2085,7 +2030,7 @@ eagerTool(server, "skill-search", "Find skills by free-text intent when you do n
     if (!ACCOUNT_ID)
         return refuseNoAccount("skill-search");
     const start = Date.now();
-    const hits = searchSkills(PLATFORM_ROOT, query);
+    const hits = searchSkills(PLATFORM_ROOT, query, 5, resolve(getAccountDir(), "plugins"));
     const ms = Date.now() - start;
     const top = hits.length > 0 ? `${hits[0].pluginName}:${hits[0].skillName}` : "none";
     console.log(`[skill-search] query=${JSON.stringify(query)} hits=${hits.length} top=${top} ms=${ms}`);
@@ -2134,7 +2079,7 @@ eagerTool(server, "skill-load", "Load a plugin skill's SKILL.md body by skill na
     }
     const start = Date.now();
     try {
-        const outcome = await loadSkill(PLATFORM_ROOT, skillName);
+        const outcome = await loadSkill(PLATFORM_ROOT, skillName, resolve(getAccountDir(), "plugins"));
         if (outcome.status === "ambiguous") {
             const ms = Date.now() - start;
             console.log(`[skill-load] skillName=${skillName} result=ambiguous pluginName=none file=none bodyBytes=0 ms=${ms}`);