@infinitedusky/indusk-mcp 1.5.10 → 1.5.12

package/dist/bin/commands/extensions.js

@@ -501,6 +501,34 @@ function printMcpSetup(projectRoot, name) {
         return;
     printMcpInstructions(name, manifest);
 }
+function readExtensionEnv(name) {
+    const cwd = process.cwd();
+    // Try profile-specific env files first, then plain .env
+    const candidates = [
+        join(cwd, ".indusk/extensions", name, ".env.local"),
+        join(cwd, ".indusk/extensions", name, ".env"),
+        join(cwd, ".indusk/disabled", name, ".env.local"),
+        join(cwd, ".indusk/disabled", name, ".env"),
+    ];
+    for (const envPath of candidates) {
+        if (!existsSync(envPath))
+            continue;
+        const vars = {};
+        const content = readFileSync(envPath, "utf-8");
+        for (const line of content.split("\n")) {
+            const trimmed = line.trim();
+            if (!trimmed || trimmed.startsWith("#"))
+                continue;
+            const eqIdx = trimmed.indexOf("=");
+            if (eqIdx > 0) {
+                vars[trimmed.slice(0, eqIdx)] = trimmed.slice(eqIdx + 1);
+            }
+        }
+        if (Object.keys(vars).length > 0)
+            return vars;
+    }
+    return {};
+}
 function printMcpInstructions(name, manifest) {
     const server = manifest.mcp_server;
     if (!server)
@@ -520,17 +548,53 @@ function printMcpInstructions(name, manifest) {
         }
         return;
     }
-    // For servers needing auth, print setup instructions
+    // For servers needing auth, try to read credentials from extension .env
+    if (needsAuth && server.type === "http" && server.url && server.headers) {
+        const envVars = readExtensionEnv(name);
+        if (Object.keys(envVars).length > 0) {
+            // Substitute placeholders in url and headers
+            let url = server.url;
+            for (const [envKey, envVal] of Object.entries(envVars)) {
+                url = url.replaceAll(envKey, envVal);
+            }
+            const headerArgs = [];
+            let allResolved = true;
+            for (const [key, template] of Object.entries(server.headers)) {
+                let resolved = template;
+                for (const [envKey, envVal] of Object.entries(envVars)) {
+                    resolved = resolved.replaceAll(envKey, envVal);
+                }
+                if (resolved === template) {
+                    allResolved = false;
+                    break;
+                }
+                headerArgs.push(`--header "${key}: ${resolved}"`);
+            }
+            if (allResolved) {
+                const cmd = `claude mcp add -t http ${headerArgs.join(" ")} -s project -- ${name} "${url}"`;
+                console.info(`\n  ${name}: adding MCP server with credentials from .env...`);
+                try {
+                    execSync(cmd, { cwd: process.cwd(), timeout: 15000, stdio: ["ignore", "pipe", "pipe"] });
+                    console.info(`  ${name}: MCP server added (restart Claude Code to load)`);
+                    return;
+                }
+                catch {
+                    console.info(`  ${name}: auto-add failed.`);
+                }
+            }
+        }
+    }
+    // Fallback: no .env found or credentials incomplete
+    console.info(`\n  ${name}: no credentials found at .indusk/extensions/${name}/.env`);
+    console.info(`    To set up automatically:`);
+    console.info(`      1. Create .indusk/extensions/${name}/.env with the required credentials`);
+    console.info(`      2. Run 'extensions enable ${name}' again`);
     if (server.setup_instructions?.length) {
-        console.info(`\n  ${name} MCP setup:`);
+        console.info(`    Or set up manually:`);
         for (const instruction of server.setup_instructions) {
-            console.info(`    ${instruction}`);
+            console.info(`      ${instruction}`);
         }
     }
-    else if (server.type === "http" && server.url) {
-        console.info(`\n  ${name} MCP setup:`);
-        console.info(`    claude mcp add -t http -- ${name} ${server.url}`);
-    }
     console.info("");
 }
 function installSkill(projectRoot, name) {

package/dist/bin/commands/init.js

@@ -176,65 +176,73 @@ export async function init(projectRoot, options = {}) {
         console.info(`  ${existsSync(biomePath) ? "overwrite" : "create"}: biome.json`);
     }
     // 7. Scaffold OpenTelemetry instrumentation
-    console.info("\n[OpenTelemetry]");
-    const otelTemplates = ["instrumentation.ts", "filtering-exporter.ts", "logger.ts"];
-    const isNextJs = existsSync(join(projectRoot, "next.config.js")) ||
-        existsSync(join(projectRoot, "next.config.ts")) ||
-        existsSync(join(projectRoot, "next.config.mjs"));
-    const isPython = existsSync(join(projectRoot, "requirements.txt")) ||
-        existsSync(join(projectRoot, "pyproject.toml"));
-    if (isPython) {
-        const pyTemplate = "instrumentation.py";
-        const targetFile = join(projectRoot, pyTemplate);
-        if (existsSync(targetFile) && !force) {
-            console.info(`  skip: ${pyTemplate} (already exists)`);
-        }
-        else {
-            cpSync(join(packageRoot, "templates", pyTemplate), targetFile);
-            console.info(`  create: ${pyTemplate}`);
-            console.info("  install: pip install opentelemetry-distro opentelemetry-instrumentation opentelemetry-exporter-otlp");
-            console.info("  run: opentelemetry-instrument python your_app.py");
-        }
+    // Skip if this is the indusk-mcp package itself (has templates/ directory with instrumentation.ts)
+    const isInduskMcp = existsSync(join(projectRoot, "templates/instrumentation.ts"));
+    if (isInduskMcp) {
+        console.info("\n[OpenTelemetry]");
+        console.info("  skip: this is the indusk-mcp package (templates are source, not scaffolded)");
     }
     else {
-        // Node.js or Next.js — copy TypeScript templates
-        const targetDir = isNextJs ? projectRoot : join(projectRoot, "src");
-        const srcDir = existsSync(join(projectRoot, "src")) ? join(projectRoot, "src") : projectRoot;
-        for (const template of otelTemplates) {
-            const targetFile = join(srcDir, template);
+        console.info("\n[OpenTelemetry]");
+        const otelTemplates = ["instrumentation.ts", "filtering-exporter.ts", "logger.ts"];
+        const isNextJs = existsSync(join(projectRoot, "next.config.js")) ||
+            existsSync(join(projectRoot, "next.config.ts")) ||
+            existsSync(join(projectRoot, "next.config.mjs"));
+        const isPython = existsSync(join(projectRoot, "requirements.txt")) ||
+            existsSync(join(projectRoot, "pyproject.toml"));
+        if (isPython) {
+            const pyTemplate = "instrumentation.py";
+            const targetFile = join(projectRoot, pyTemplate);
             if (existsSync(targetFile) && !force) {
-                console.info(`  skip: ${template} (already exists)`);
-                continue;
+                console.info(`  skip: ${pyTemplate} (already exists)`);
+            }
+            else {
+                cpSync(join(packageRoot, "templates", pyTemplate), targetFile);
+                console.info(`  create: ${pyTemplate}`);
+                console.info("  install: pip install opentelemetry-distro opentelemetry-instrumentation opentelemetry-exporter-otlp");
+                console.info("  run: opentelemetry-instrument python your_app.py");
             }
-            cpSync(join(packageRoot, "templates", template), targetFile);
-            console.info(`  create: ${template}`);
-        }
-        // Set service name in instrumentation.ts
-        const instrPath = join(srcDir, "instrumentation.ts");
-        if (existsSync(instrPath)) {
-            const content = readFileSync(instrPath, "utf-8");
-            writeFileSync(instrPath, content.replace('"unknown-service"', `"${projectName}"`));
-        }
-        // Print instructions
-        const packages = [
-            "@opentelemetry/sdk-node",
-            "@opentelemetry/auto-instrumentations-node",
-            "@opentelemetry/exporter-trace-otlp-http",
-            "@opentelemetry/sdk-trace-base",
-            "@opentelemetry/resources",
-            "@opentelemetry/semantic-conventions",
-            "@opentelemetry/core",
-            "pino",
-            "pino-opentelemetry-transport",
-        ];
-        console.info(`  install: pnpm add ${packages.join(" ")}`);
-        if (isNextJs) {
-            console.info("  wire: Next.js instrumentation hook (instrumentation.ts in app root)");
         }
         else {
-            console.info("  wire: node -r ./src/instrumentation.ts src/index.ts");
+            // Node.js or Next.js — copy TypeScript templates
+            const targetDir = isNextJs ? projectRoot : join(projectRoot, "src");
+            const srcDir = existsSync(join(projectRoot, "src")) ? join(projectRoot, "src") : projectRoot;
+            for (const template of otelTemplates) {
+                const targetFile = join(srcDir, template);
+                if (existsSync(targetFile) && !force) {
+                    console.info(`  skip: ${template} (already exists)`);
+                    continue;
+                }
+                cpSync(join(packageRoot, "templates", template), targetFile);
+                console.info(`  create: ${template}`);
+            }
+            // Set service name in instrumentation.ts
+            const instrPath = join(srcDir, "instrumentation.ts");
+            if (existsSync(instrPath)) {
+                const content = readFileSync(instrPath, "utf-8");
+                writeFileSync(instrPath, content.replace('"unknown-service"', `"${projectName}"`));
+            }
+            // Print instructions
+            const packages = [
+                "@opentelemetry/sdk-node",
+                "@opentelemetry/auto-instrumentations-node",
+                "@opentelemetry/exporter-trace-otlp-http",
+                "@opentelemetry/sdk-trace-base",
+                "@opentelemetry/resources",
+                "@opentelemetry/semantic-conventions",
+                "@opentelemetry/core",
+                "pino",
+                "pino-opentelemetry-transport",
+            ];
+            console.info(`  install: pnpm add ${packages.join(" ")}`);
+            if (isNextJs) {
+                console.info("  wire: Next.js instrumentation hook (instrumentation.ts in app root)");
+            }
+            else {
+                console.info("  wire: node -r ./src/instrumentation.ts src/index.ts");
+            }
         }
-    }
+    } // end isInduskMcp else
     // 8. Install gate enforcement hooks
     console.info("\n[Hooks]");
     const hooksSource = join(packageRoot, "hooks");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@infinitedusky/indusk-mcp",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"description": "InDusk development system — skills, MCP tools, and CLI for structured AI-assisted development",
 	"type": "module",
 	"files": [

package/templates/instrumentation.ts

@@ -23,7 +23,7 @@ import {
 	BatchSpanProcessor,
 	SimpleSpanProcessor,
 } from "@opentelemetry/sdk-trace-base";
-import { Resource } from "@opentelemetry/resources";
+import { resourceFromAttributes } from "@opentelemetry/resources";
 import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
 import { FilteringExporter } from "./filtering-exporter";
 
@@ -40,7 +40,7 @@ function createSpanProcessor() {
 }
 
 const sdk = new NodeSDK({
-	resource: new Resource({
+	resource: resourceFromAttributes({
 		[ATTR_SERVICE_NAME]:
 			process.env.OTEL_SERVICE_NAME ?? "unknown-service",
 	}),