@geminixiang/mikan 1.0.0-beta.37 → 1.0.0-beta.38

package/CHANGELOG.md

@@ -9,6 +9,12 @@ any release.
 
 ## [Unreleased]
 
+## [1.0.0-beta.38]
+
+### Fixed
+
+- Align the conversation-skill symlink guard with what the host actually reads: symlinked entries are skipped per skill — with the skipped paths named in the host log and surfaced to the agent in its prompt — instead of one symlink anywhere disqualifying the whole tree, and symlinks inside vendored `node_modules` or dot directories (which the loader never reads) no longer disqualify anything. Offices whose skills vanished because a skill vendored npm dependencies (`.bin` symlinks) get them back.
+
 ## [1.0.0-beta.37]
 
 ### Fixed

package/dist/agent.d.ts

@@ -13,7 +13,6 @@ export declare function buildPromptPayload(message: ConversationMessage, workspa
     userMessage: string;
     imageAttachments: ImageContent[];
 }>;
-export declare function isSafePromptSkillTree(dir: string, conversationDir: string): boolean;
 export declare function resolveTriggerAttribution(message: Pick<ConversationMessage, "id" | "text" | "userName">): string | undefined;
 /**
  * Instructions that vary per turn (event-trigger mode, response attribution).

package/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAiB,cAAc,EAAE,MAAM,YAAY,CAAC;AAIrF,OAAO,EAAY,KAAK,YAAY,EAAc,MAAM,uBAAuB,CAAC;AA6BhF,OAAO,KAAK,EAEV,mBAAmB,EAKpB,MAAM,cAAc,CAAC;AAiBtB,OAAO,EAKL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AAiC5B,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CAER;AAcD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CA2BR;AAgGD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,kBAAkB,EAChC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GACxD,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,YAAY,EAAE,CAAC;CAClC,CAAC,CAcD;AA0HD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CA0BnF;AA8CD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC,GAC7D,MAAM,GAAG,SAAS,CAOpB;AAoMD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,EACvB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,YAAY,EAAE,MAAM,GACnB,MAAM,CAkBR;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAYR;AA00CD;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CAqYxF"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAiB,cAAc,EAAE,MAAM,YAAY,CAAC;AAIrF,OAAO,EAAY,KAAK,YAAY,EAAc,MAAM,uBAAuB,CAAC;AA6BhF,OAAO,KAAK,EAEV,mBAAmB,EAKpB,MAAM,cAAc,CAAC;AAiBtB,OAAO,EAKL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AAiC5B,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CAER;AAcD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,kBAAkB,GAC9B,MAAM,CA2BR;AAgGD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,kBAAkB,EAChC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GACxD,OAAO,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,YAAY,EAAE,CAAC;CAClC,CAAC,CAcD;AA8KD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC,GAC7D,MAAM,GAAG,SAAS,CAOpB;AAyMD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,EACvB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,YAAY,EAAE,MAAM,GACnB,MAAM,CAkBR;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAYR;AA80CD;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CAsYxF"}

package/dist/agent.js

@@ -8,7 +8,7 @@ import { runSubagent } from "./harness/subagent-runner.js";
 import { loadSubagentProfiles } from "./harness/subagent-profiles.js";
 import { mergeSubagentProgress, parseSubagentProgressSnapshot, renderSubagentDashboard, settleSubagentProgress, } from "./subagent-progress.js";
 import { createHash } from "crypto";
-import { existsSync, lstatSync, readdirSync } from "fs";
+import { existsSync, lstatSync } from "fs";
 import { chmod, mkdtemp, mkdir, readFile, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
 import { basename, isAbsolute, join, posix, relative, resolve, sep } from "path";
@@ -242,54 +242,28 @@ function loadMikanSkills(address, conversationDir, workspacePath, projection) {
     }
     // Load conversation-specific skills (override workspace skills on collision).
     // Host prompt construction must never follow an agent-created symlink out of
-    // the conversation office.
+    // the conversation office, so this load rejects symlinks per entry — on
+    // exactly the paths it reads. Vendored node_modules and dot directories are
+    // never read and never disqualify anything.
     const conversationSkillsDir = projection.promptSources.conversationSkillsDir;
-    if (isSafePromptSkillTree(conversationSkillsDir, projection.promptSources.conversationDir)) {
-        for (const skill of loadSkillsFromDir({ dir: conversationSkillsDir, source: "channel" })
-            .skills) {
-            skill.filePath = translatePath(skill.filePath);
-            skill.baseDir = translatePath(skill.baseDir);
-            skillMap.set(skill.name, skill);
-        }
-    }
-    else if (existsSync(conversationSkillsDir)) {
-        log.logWarning("Ignoring unsafe conversation skill tree", conversationSkillsDir);
-    }
-    return Array.from(skillMap.values());
-}
-export function isSafePromptSkillTree(dir, conversationDir) {
-    if (!existsSync(dir))
-        return true;
-    if (dir !== conversationDir && !dir.startsWith(`${conversationDir}${sep}`))
-        return false;
-    const stack = [dir];
-    while (stack.length > 0) {
-        const current = stack.pop();
-        let stats;
-        try {
-            stats = lstatSync(current);
-        }
-        catch {
-            return false;
-        }
-        if (stats.isSymbolicLink())
-            return false;
-        if (!stats.isDirectory())
+    const conversationSkills = loadSkillsFromDir({
+        dir: conversationSkillsDir,
+        source: "channel",
+        rejectSymlinks: true,
+    });
+    const skippedSkillLinks = [];
+    for (const diagnostic of conversationSkills.diagnostics) {
+        if (diagnostic.code !== "symlink")
             continue;
-        let entries;
-        try {
-            entries = readdirSync(current, { withFileTypes: true });
-        }
-        catch {
-            return false;
-        }
-        for (const entry of entries) {
-            if (entry.isSymbolicLink())
-                return false;
-            stack.push(join(current, entry.name));
-        }
+        log.logWarning("Skipping conversation skill entry (symlink)", diagnostic.path);
+        skippedSkillLinks.push(translatePath(diagnostic.path));
+    }
+    for (const skill of conversationSkills.skills) {
+        skill.filePath = translatePath(skill.filePath);
+        skill.baseDir = translatePath(skill.baseDir);
+        skillMap.set(skill.name, skill);
     }
-    return true;
+    return { skills: Array.from(skillMap.values()), skippedSkillLinks };
 }
 function buildRuntimePaths(runtimeWorkspaceRoot, address) {
     const workspaceRoot = runtimeWorkspaceRoot.replace(/\/+$/, "") || "/";
@@ -344,7 +318,7 @@ export function resolveTriggerAttribution(message) {
         return `@${message.userName}`;
     return undefined;
 }
-function buildSystemPrompt(workspacePath, address, conversationKind, currentUserId, memory, sandboxConfig, platform, skills, projection) {
+function buildSystemPrompt(workspacePath, address, conversationKind, currentUserId, memory, sandboxConfig, platform, skills, projection, skippedSkillLinks = []) {
     const { workspaceRoot, conversationPath, scratchPath } = buildRuntimePaths(workspacePath, address);
     const sandboxType = sandboxConfig.type;
     const isContainerLike = sandboxType === "container" || sandboxType === "image";
@@ -450,7 +424,9 @@ Scripts are in: {baseDir}/
 \`name\` and \`description\` are required. Use \`{baseDir}\` as placeholder for the skill's directory path.
 
 ### Available Skills
-${skills.length > 0 ? formatSkillsForPrompt(skills) : "(no skills installed yet)"}
+${skills.length > 0 ? formatSkillsForPrompt(skills) : "(no skills installed yet)"}${skippedSkillLinks.length > 0
+        ? `\n\nNote: these skill entries were skipped because they are symlinks, which the host never follows when reading this conversation's skills: ${skippedSkillLinks.join(", ")}. Replace each with a real file or directory (for example \`cp -rL\`) to load it.`
+        : ""}
 
 ## Events
 Use the \`event\` tool to schedule immediate, one-shot, or periodic follow-ups. It writes to the host-side mikan control plane and fills routing fields for the current conversation automatically.
@@ -1109,9 +1085,10 @@ async function prepareRunContext(params) {
     reloadSessionMessages(session, conversationId);
     const projection = resolveWorkspaceProjection(join(conversationDir, ".."), message.address);
     const memory = await getMemory(projection);
-    const skills = mergeExtensionSkills(loadMikanSkills(message.address, conversationDir, pathContext.runtimeWorkspaceRoot, projection), params.extensionSkills ?? []);
+    const conversationSkillLoad = loadMikanSkills(message.address, conversationDir, pathContext.runtimeWorkspaceRoot, projection);
+    const skills = mergeExtensionSkills(conversationSkillLoad.skills, params.extensionSkills ?? []);
     const triggerAttribution = resolveTriggerAttribution(message);
-    const systemPrompt = buildSystemPrompt(pathContext.runtimeWorkspaceRoot, message.address, message.conversationKind, message.userId, memory, executor.getSandboxConfig(), platform, skills, projection);
+    const systemPrompt = buildSystemPrompt(pathContext.runtimeWorkspaceRoot, message.address, message.conversationKind, message.userId, memory, executor.getSandboxConfig(), platform, skills, projection, conversationSkillLoad.skippedSkillLinks);
     session.agent.state.systemPrompt = systemPrompt;
     // Cache diagnosis: a byte-stable system prompt is the precondition for
     // provider prompt caching. If this hash changes between turns of one
@@ -1545,7 +1522,7 @@ export async function createRunner(options) {
     });
     // Initial system prompt (will be updated each run with fresh memory/channels/users/skills)
     const memory = await getMemory(projection);
-    const skills = loadMikanSkills(options.address, conversationDir, pathContext.runtimeWorkspaceRoot, projection);
+    const { skills, skippedSkillLinks } = loadMikanSkills(options.address, conversationDir, pathContext.runtimeWorkspaceRoot, projection);
     const emptyPlatform = {
         name: "chat",
         formattingGuide: "",
@@ -1553,7 +1530,7 @@ export async function createRunner(options) {
         users: [],
         trustModel: "membership",
     };
-    const systemPrompt = buildSystemPrompt(pathContext.runtimeWorkspaceRoot, options.address, "shared", undefined, memory, sandboxConfig, emptyPlatform, skills, projection);
+    const systemPrompt = buildSystemPrompt(pathContext.runtimeWorkspaceRoot, options.address, "shared", undefined, memory, sandboxConfig, emptyPlatform, skills, projection, skippedSkillLinks);
     // Create session manager and settings manager. Top-level/private sessions
     // use the conversation's current pointer; scoped sessions use fixed files.
     // Platform-specific scope behavior is resolved before runner creation.