droid-mode 0.0.10 → 0.0.12

package/dist/cli.js

@@ -5,8 +5,58 @@ import { defineCommand, runMain } from "citty";
 import { copy, pathExists, ensureDir } from "fs-extra";
 import { resolve, join, dirname } from "path";
 import { fileURLToPath } from "url";
-import { stat } from "fs/promises";
+import { stat, readFile } from "fs/promises";
 var __dirname = dirname(fileURLToPath(import.meta.url));
+var DROID_MODE_ASCII = `
+  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557     \u2588\u2588\u2588\u2557   \u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
+  \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557    \u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D
+  \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551    \u2588\u2588\u2554\u2588\u2588\u2588\u2588\u2554\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557
+  \u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551    \u2588\u2588\u2551\u255A\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u255D
+  \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551  \u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D    \u2588\u2588\u2551 \u255A\u2550\u255D \u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
+  \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u255D  \u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D     \u255A\u2550\u255D     \u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D`;
+var DIVIDER = "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+var DIVIDER_THIN = "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+async function getPackageVersion() {
+  try {
+    const pkgPath = resolve(__dirname, "..", "package.json");
+    const content = await readFile(pkgPath, "utf-8");
+    const pkg = JSON.parse(content);
+    return pkg.version || "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+function printSuccessScreen(copied, skipped, version) {
+  console.log(`
+${DIVIDER}
+`);
+  console.log(DROID_MODE_ASCII);
+  console.log(`${"".padStart(72)}v${version}
+`);
+  console.log("                        Progressive MCP for AI Agents\n");
+  console.log(DIVIDER);
+  const status = skipped > 0 ? `  \u2713 Updated successfully       ${copied} created  \xB7  ${skipped} skipped (existing)` : `  \u2713 Initialized successfully   ${copied} files created`;
+  console.log(`
+${status}
+`);
+  console.log(DIVIDER_THIN);
+  console.log("\n  QUICK START\n");
+  console.log("  1. Discover MCP servers        dm servers");
+  console.log("  2. Index tools from server     dm index --server <name>");
+  console.log('  3. Search for tools            dm search "query" --server <name>');
+  console.log("  4. Run a workflow              dm run --server <name> --tools a,b --workflow file.js\n");
+  console.log(DIVIDER_THIN);
+  console.log("\n  \u26A1 PRO TIP\n");
+  console.log('  Set "disabled": true for MCP servers in your mcp.json config.');
+  console.log("  Droid Mode accesses them directly \u2014 faster startup, zero token bloat.\n");
+  console.log(DIVIDER_THIN);
+  console.log("\n  RESOURCES\n");
+  console.log("  \u{1F4D6} Docs      https://droidmode.dev");
+  console.log("  \u{1F4E6} NPM       https://npmjs.com/package/droid-mode");
+  console.log("  \u{1F419} GitHub    https://github.com/Gitmaxd/droid-mode\n");
+  console.log(DIVIDER);
+  console.log("");
+}
 var init = defineCommand({
   meta: {
     name: "init",
@@ -65,17 +115,8 @@ var init = defineCommand({
       console.error("\u274C Error during scaffolding:", error);
       process.exit(1);
     }
-    console.log("\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-    console.log("\u2705 Droid Mode initialized successfully!");
-    console.log(`   \u{1F4C1} Files created: ${copied}`);
-    console.log(`   \u23ED\uFE0F  Files skipped: ${skipped}`);
-    console.log("\n\u{1F4D6} Quick Start:");
-    console.log("   dm servers                    # Discover MCP servers");
-    console.log("   dm index --server <name>      # List tools");
-    console.log('   dm search "query" --server <name>');
-    console.log("   dm run --server <name> --tools <a,b> --workflow file.js");
-    console.log('\n\u{1F4A1} Tip: Keep MCP servers "disabled: true" in mcp.json');
-    console.log("   Droid Mode accesses them directly without context bloat!\n");
+    const version = await getPackageVersion();
+    printSuccessScreen(copied, skipped, version);
   }
 });
 var main = defineCommand({
@@ -88,16 +129,13 @@ var main = defineCommand({
     init
   },
   async run() {
-    console.log("\n\u{1F916} Droid Mode - Progressive MCP for AI Agents\n");
-    console.log("Usage:");
-    console.log("  droid-mode init [options]    Initialize Droid Mode in your project");
-    console.log("  droid-mode --help            Show help");
-    console.log("  droid-mode --version         Show version\n");
-    console.log("Quick start:");
-    console.log("  npx droid-mode init\n");
-    console.log("What is Droid Mode?");
-    console.log("  Access MCP tools without loading them into context.");
-    console.log("  Progressive discovery: servers \u2192 tools \u2192 schemas \u2192 execute\n");
+    const version = await getPackageVersion();
+    console.log(`
+\u{1F916} Droid Mode v${version}
+`);
+    console.log("Usage:  npx droid-mode init [--path <dir>]\n");
+    console.log("Scaffold MCP integration for AI agents.");
+    console.log("Learn more: https://droidmode.dev\n");
   }
 });
 runMain(main);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "droid-mode",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Progressive Code-Mode MCP integration for Factory.ai Droid - access MCP tools without context bloat",
   "type": "module",
   "main": "dist/cli.js",

package/templates/skills/droid-mode/lib/hydrate.mjs

@@ -1,6 +1,6 @@
 import path from "node:path";
 import fs from "node:fs";
-import { ensureDir, nowIsoCompact, safeIdentifier, writeJson, getDroidModeDataDir, serverNameToDirName } from "./util.mjs";
+import { ensureDir, nowIsoCompact, safeIdentifier, uniqueSafeToolMap, writeJson, getDroidModeDataDir, serverNameToDirName } from "./util.mjs";
 
 /** @param {string} s */
 function toPascalCase(s) {
@@ -104,11 +104,9 @@ export function hydrateTools(opts) {
     if (t) selected.push(t);
   }
 
-  const toolmap = {};
-  for (const t of selected) {
-    const safe = safeIdentifier(t?.name || "tool");
-    toolmap[safe] = t?.name || safe;
-  }
+  // Build collision-free toolmap using shared function
+  const selectedNames = selected.map(t => t?.name || "tool");
+  const toolmap = uniqueSafeToolMap(selectedNames);
 
   writeJson(path.join(baseOut, "tools.json"), selected);
   writeJson(path.join(baseOut, "toolmap.json"), toolmap);
@@ -117,15 +115,22 @@ export function hydrateTools(opts) {
   const toolmapModule = `// Auto-generated by droid-mode.\nexport default ${JSON.stringify(toolmap, null, 2)};\n`;
   fs.writeFileSync(path.join(baseOut, "toolmap.mjs"), toolmapModule, "utf-8");
 
-  // types.d.ts
+  // types.d.ts - use toolmap keys (already collision-free)
   const typeLines = [
     `// Auto-generated by droid-mode (best-effort).`,
     `// This file exists to improve IDE autocomplete; it is NOT a contract.`,
     ``,
   ];
 
+  // Build reverse map: toolName -> safeName for lookup
+  const nameToSafe = Object.create(null);
+  for (const [safe, name] of Object.entries(toolmap)) {
+    nameToSafe[name] = safe;
+  }
+
   for (const t of selected) {
-    const safe = safeIdentifier(t?.name || "tool");
+    const toolName = t?.name || "tool";
+    const safe = nameToSafe[toolName] || safeIdentifier(toolName);
     const pascal = toPascalCase(safe);
     const inSchema = t?.inputSchema || t?.parameters || null;
     const outSchema = t?.outputSchema || null;

package/templates/skills/droid-mode/lib/run.mjs

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import vm from "node:vm";
-import { nowIsoCompact, sha256Hex, safeIdentifier, ensureDir, getDroidModeDataDir, writeJson, serverNameToDirName } from "./util.mjs";
+import { nowIsoCompact, sha256Hex, uniqueSafeToolMap, ensureDir, getDroidModeDataDir, writeJson, serverNameToDirName } from "./util.mjs";
 
 /**
  * Static, best-effort disallow list for sandboxed workflows.
@@ -100,13 +100,10 @@ export function createToolApi(opts) {
     throw lastError;
   };
 
-  // safe-name wrapper map
+  // Build collision-free toolmap using shared function
+  const toolmap = uniqueSafeToolMap(opts.toolNames ?? []);
   const t = {};
-  const toolmap = {};
-
-  for (const toolName of opts.toolNames) {
-    const safe = safeIdentifier(toolName);
-    toolmap[safe] = toolName;
+  for (const [safe, toolName] of Object.entries(toolmap)) {
     t[safe] = (args) => call(toolName, args);
   }
 

package/templates/skills/droid-mode/lib/util.mjs

@@ -56,6 +56,55 @@ export function safeIdentifier(toolName) {
   return "_" + camel;
 }
 
+/**
+ * Build a collision-free safeName -> toolName map.
+ * All colliding tools get a hash suffix (not just the "losers").
+ * Guarantees deterministic output regardless of input order.
+ * 
+ * @param {string[]} toolNames
+ * @returns {Record<string, string>} safeName -> originalToolName
+ */
+export function uniqueSafeToolMap(toolNames) {
+  const map = Object.create(null);
+  
+  // Phase 1: Group by base identifier, caching base names
+  // Handle undefined/null names with fallback (matches prior behavior)
+  const groups = new Map(); // base -> [{name, base}, ...]
+  for (const rawName of toolNames) {
+    // Matches exact prior semantics: t?.name || "tool"
+    // Only null/undefined/empty-string fall back; whitespace-only IS kept
+    const toolName = rawName || "tool";
+    const base = safeIdentifier(toolName);
+    if (!groups.has(base)) groups.set(base, []);
+    groups.get(base).push({ name: toolName, base });
+  }
+
+  // Phase 2: Assign safe names (sort colliding groups for determinism)
+  for (const [base, tools] of groups) {
+    if (tools.length === 1) {
+      // No collision: use base name directly
+      map[base] = tools[0].name;
+    } else {
+      // Collision: sort by string comparison for determinism
+      // (localeCompare varies by OS/locale; relational operators are consistent)
+      tools.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+      for (const { name: toolName, base: cachedBase } of tools) {
+        const suffix = sha256Hex(toolName).slice(0, 8); // 8 chars = 4B combinations
+        let safe = `${cachedBase}_${suffix}`;
+        // Guarantee uniqueness even on hash collision (extremely rare)
+        let counter = 0;
+        while (map[safe] !== undefined) {
+          counter++;
+          safe = `${cachedBase}_${suffix}_${counter}`;
+        }
+        map[safe] = toolName;
+      }
+    }
+  }
+
+  return map;
+}
+
 /**
  * Lightweight CLI args parser (supports: --k=v, --k v, flags, positional args).
  * Returns { _: string[], flags: Record<string, string|boolean> }.