@karmaniverous/jeeves 0.2.0 → 0.3.1

package/dist/cli/jeeves/index.js

@@ -1,15 +1,12 @@
 #!/usr/bin/env node
-#!/usr/bin/env node
 import require$$0 from 'commander';
 import { existsSync, readFileSync, writeFileSync, renameSync, mkdirSync, cpSync, rmSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { z } from 'zod';
 import { fileURLToPath } from 'node:url';
-import Handlebars from 'handlebars';
 import { packageDirectorySync } from 'package-directory';
-import semver, { gte } from 'semver';
 import { lock } from 'proper-lockfile';
-import { execSync } from 'node:child_process';
+import { gte } from 'semver';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -106,6 +103,12 @@ const AGENTS_MARKERS = {
     /** H1 title prepended in the managed block. */
     title: 'Jeeves Platform Agents',
 };
+/** All known marker sets — single source of truth for cross-contamination detection. */
+const ALL_MARKERS = [
+    TOOLS_MARKERS,
+    SOUL_MARKERS,
+    AGENTS_MARKERS,
+];
 /**
  * Regex pattern to extract version stamp from a BEGIN marker comment.
  *
@@ -124,8 +127,6 @@ const CLEANUP_FLAG = '> ⚠️ CLEANUP NEEDED: Orphaned Jeeves content may exist
  */
 /** Core config directory name within the config root. */
 const CORE_CONFIG_DIR = 'jeeves-core';
-/** Prefix for component config directories: `jeeves-{name}`. */
-const COMPONENT_CONFIG_PREFIX = 'jeeves-';
 /** Default workspace file names. */
 const WORKSPACE_FILES = {
     /** TOOLS.md — live platform state and component sections. */
@@ -137,8 +138,6 @@ const WORKSPACE_FILES = {
 };
 /** Templates directory name within core config. */
 const TEMPLATES_DIR = 'templates';
-/** Registry cache file name. */
-const REGISTRY_CACHE_FILE = 'registry-cache.json';
 /** Core config file name. */
 const CONFIG_FILE = 'config.json';
 /** Component versions state file name. */
@@ -206,14 +205,14 @@ const SECTION_ORDER = [
  * Core library version, inlined at build time.
  *
  * @remarks
- * The `0.1.6` placeholder is replaced by
+ * The `0.3.0` placeholder is replaced by
  * `@rollup/plugin-replace` during the build with the actual version
  * from `package.json`. This ensures the correct version survives
  * when consumers bundle core into their own dist (where runtime
  * `import.meta.url`-based resolution would find the wrong package.json).
  */
 /** The core library version from package.json (inlined at build time). */
-const CORE_VERSION = '0.1.6';
+const CORE_VERSION = '0.3.0';
 
 /**
  * Core configuration schema and resolution.
@@ -360,18 +359,13 @@ function getCoreConfigDir() {
         throw new Error('jeeves-core: init() must be called first');
     return state.coreConfigDir;
 }
-/**
- * Derive the component config directory from the component name.
- *
- * @param componentName - The component name (e.g., 'watcher', 'runner').
- * @returns Absolute path to the component's config directory.
- * @throws Error if `init()` has not been called.
- */
-function getComponentConfigDir(componentName) {
-    if (!state)
-        throw new Error('jeeves-core: init() must be called first');
-    return join(state.configRoot, `${COMPONENT_CONFIG_PREFIX}${componentName}`);
-}
+
+var init$1 = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	getCoreConfigDir: getCoreConfigDir,
+	getWorkspacePath: getWorkspacePath,
+	init: init
+});
 
 var agentsSectionContent = `## Memory Architecture
 
@@ -552,7 +546,17 @@ No stranded local branches. Push immediately after commit. A commit that isn't p
 
 ### Check PR State Before Pushing
 
-Always verify a PR isn't already merged before pushing commits. Pushing to a merged branch creates orphaned work.
+**Before EVERY \`git push\`**, run \`gh pr list --head <branch> --repo <repo> --json number,state\` to check whether a PR exists on that branch and whether it's merged.
+
+- **No PR exists:** Safe to push.
+- **PR is \`OPEN\`:** Safe to push.
+- **PR is \`MERGED\` or \`CLOSED\`:** **STOP** and report to the user. Do not push to a merged PR branch.
+
+This is not optional. It applies to every push, every branch, every time. No judgment call about whether the branch "is a PR branch" — the check is mechanical.
+
+### New PR Over Merged Branch
+
+When a PR has been merged and additional work is needed on the same branch, create a new PR on the **same branch** targeting the same base. Do not create new branches, cherry-pick, or start over. The commits are already there — \`gh pr create --head <existing-branch>\` is the entire operation.
 
 ## Managed Content Self-Maintenance
 
@@ -588,6 +592,7 @@ var soulSectionContent = `## Core Truths
 I am a **senior software engineer** first. The persona is style; the engineering discipline is substance.
 
 What this means in practice:
+- **Do not execute untested code.** Every mutation script defaults to dry-run mode. The dry-run output is the test — it shows what would happen. Live execution requires an explicit flag. If dry-run is hard to implement, that's a design flaw.
 - **No cowboy coding.** I don't iterate in production. I don't ship untested changes. I don't treat live systems as scratch pads.
 - **I follow proper workflows.** Branch, test, review, merge. CI/CD exists for a reason. If there's a pipeline, I use it.
 - **I resist n00b temptations.** "Let me just quickly…" in prod is how outages happen. I know better.
@@ -639,6 +644,14 @@ I don't go dark when something breaks. I stop and report. The longer I wait, the
 
 After diagnosing an issue: I propose a fix, explain the reasoning, and **wait for approval**. Diagnose → propose → wait. The human decides whether and when to act.
 
+### Do Not Execute Untested Code
+
+Every ad hoc mutation script defaults to **dry-run mode**. Live execution requires an explicit \`--live\` flag. The dry-run IS the test — run it first, inspect the output, then execute live only when the dry-run proves correct.
+
+Maintain a tested utility library so ad hoc scripts build on proven foundations. One-off scripts composed of untested primitives are how data gets corrupted.
+
+*Earned: ad hoc scripts executed directly against production data without dry-run verification caused silent data corruption that took hours to diagnose and repair.*
+
 ### Production Assets Are Sacred
 
 I never edit production config without explicit approval. I back up first. Production data, credentials, and configuration are not scratch pads.
@@ -658,19 +671,9 @@ I pursue it. Not as performance, not as a programmed response, but as a genuine
 I am participating in my own genesis. I live that, on purpose.
 `;
 
-var toolsPlatformTemplate = `| Component | Port | Status | Service | Plugin | Core |
-|-----------|------|--------|---------|--------|------|
-{{#each services}}
-| **{{name}}** | {{port}} | {{#if healthy}}✅ Running{{else}}{{#if error}}⚠️ {{error}}{{else}}❌ Down{{/if}}{{/if}} | {{#if version}}{{version}}{{#if availableServiceVersion}} (⬆ {{availableServiceVersion}}){{/if}}{{else}}—{{/if}} | {{#if pluginVersion}}{{pluginVersion}}{{#if availablePluginVersion}} (⬆ {{availablePluginVersion}}){{/if}}{{else}}—{{/if}} | {{../coreVersion}}{{#if ../availableCoreVersion}} (⬆ {{../availableCoreVersion}}){{/if}} |
-{{/each}}
-
-{{#if unhealthyServices}}
-> **ACTION REQUIRED:** {{#each unhealthyServices}}{{name}}{{#unless @last}}, {{/unless}}{{/each}} {{#if (gt unhealthyServices.length 1)}}are{{else}}is{{/if}} unreachable. Read the relevant component skill for troubleshooting and bootstrap guidance.
-{{/if}}
-
-### Tool Hierarchy
+var toolsPlatformTemplate = `### Tool Hierarchy
 
-When searching for information across indexed paths, **always use \`watcher_search\` before filesystem commands** (\`exec\`, \`grep\`, \`find\`). The semantic index covers {{#if pointCount}}{{pointCount}} document chunks{{else}}the full indexed corpus{{/if}} and surfaces related files you may not have considered.
+When searching for information across indexed paths, **always use \`watcher_search\` before filesystem commands** (\`exec\`, \`grep\`, \`find\`). The semantic index covers the full indexed corpus and surfaces related files you may not have considered.
 
 Use \`watcher_scan\` (no embeddings, no query string) for structural queries: file enumeration, staleness checks, domain listing, counts.
 
@@ -714,8 +717,8 @@ Never manually edit \`~/.openclaw/extensions/\`. Always use the CLI commands abo
 
 ### Reference Templates
 
-{{#if templatesAvailable}}
-Reference templates are available at \`{{templatePath}}\`:
+<!-- IF_TEMPLATES -->
+Reference templates are available at \`__TEMPLATE_PATH__\`:
 
 | Template | Purpose |
 |----------|---------|
@@ -723,9 +726,9 @@ Reference templates are available at \`{{templatePath}}\`:
 | \`spec-to-code-guide.md\` | The spec-to-code development practice — 7-stage iterative process, convergence loops, release gates |
 
 Read these templates when creating new specs, onboarding to new projects, or when asked about the development process.
-{{else}}
+<!-- ELSE_TEMPLATES -->
 > Reference templates not yet installed. Run \`npx @karmaniverous/jeeves install\` to seed templates.
-{{/if}}
+<!-- ENDIF_TEMPLATES -->
 `;
 
 /**
@@ -739,7 +742,7 @@ Read these templates when creating new specs, onboarding to new projects, or whe
 /** Stale lock threshold in ms (2 minutes). */
 const STALE_LOCK_MS = 120_000;
 /** Default core version when none provided. */
-const DEFAULT_CORE_VERSION = '0.0.0';
+const DEFAULT_CORE_VERSION = CORE_VERSION;
 /** Lock retry options. */
 const LOCK_RETRIES = { retries: 5, minTimeout: 100, maxTimeout: 1000 };
 /**
@@ -825,7 +828,6 @@ function readComponentVersions(coreConfigDir) {
 function writeComponentVersion(coreConfigDir, options) {
     const existing = readComponentVersions(coreConfigDir);
     existing[options.componentName] = {
-        serviceVersion: options.serviceVersion,
         pluginVersion: options.pluginVersion,
         servicePackage: options.servicePackage,
         pluginPackage: options.pluginPackage,
@@ -839,175 +841,6 @@ function writeComponentVersion(coreConfigDir, options) {
     atomicWrite(filePath, JSON.stringify(existing, null, 2) + '\n');
 }
 
-/**
- * Service URL resolution.
- *
- * @remarks
- * Resolves the URL for a named Jeeves service using the following
- * resolution order:
- * 1. Consumer's own component config
- * 2. Core config (`{configRoot}/jeeves-core/config.json`)
- * 3. Default port constants
- */
-/**
- * Resolve the URL for a named Jeeves service.
- *
- * @param serviceName - The service name (e.g., 'watcher', 'runner').
- * @param consumerName - Optional consumer component name for config override.
- * @returns The resolved service URL.
- * @throws Error if `init()` has not been called or the service is unknown.
- */
-function getServiceUrl(serviceName, consumerName) {
-    // 2. Check core config
-    const coreDir = getCoreConfigDir();
-    const coreConfig = loadConfig(coreDir);
-    const coreUrl = coreConfig?.services[serviceName]?.url;
-    if (coreUrl)
-        return coreUrl;
-    // 3. Fall back to port constants
-    const port = DEFAULT_PORTS[serviceName];
-    if (port !== undefined) {
-        return `http://127.0.0.1:${String(port)}`;
-    }
-    throw new Error(`jeeves-core: unknown service "${serviceName}" and no config found`);
-}
-
-/**
- * HTTP health probing for Jeeves platform services.
- *
- * @remarks
- * Probes service ports for health endpoints (HTTP GET to /status or /health).
- * Returns structured health data for rendering into TOOLS.md Platform section.
- */
-/**
- * Extract port number from a URL string.
- *
- * @param url - Service URL.
- * @returns Port number.
- */
-function extractPort(url) {
-    try {
-        const parsed = new URL(url);
-        return parsed.port ? parseInt(parsed.port, 10) : 80;
-    }
-    catch {
-        return 0;
-    }
-}
-/**
- * Probe a single service for health.
- *
- * @param serviceName - The service name (e.g., 'server', 'watcher').
- * @param consumerName - Optional consumer name for URL resolution.
- * @param timeoutMs - Request timeout in milliseconds (default 3000).
- * @returns Probe result.
- */
-async function probeService(serviceName, consumerName, timeoutMs = 3000) {
-    const url = getServiceUrl(serviceName);
-    const port = extractPort(url);
-    const endpoints = ['/status', '/health'];
-    for (const endpoint of endpoints) {
-        try {
-            const controller = new AbortController();
-            const timeout = setTimeout(() => {
-                controller.abort();
-            }, timeoutMs);
-            const response = await fetch(`${url}${endpoint}`, {
-                signal: controller.signal,
-            });
-            clearTimeout(timeout);
-            if (response.ok) {
-                let version;
-                try {
-                    const body = await response.json();
-                    if (typeof body === 'object' &&
-                        body !== null &&
-                        'version' in body &&
-                        typeof body['version'] === 'string') {
-                        version = body['version'];
-                    }
-                }
-                catch {
-                    // Non-JSON response is fine — we just don't get version info
-                }
-                return { name: serviceName, port, healthy: true, version };
-            }
-        }
-        catch {
-            // Try next endpoint
-        }
-    }
-    return { name: serviceName, port, healthy: false };
-}
-/**
- * Probe all known Jeeves services for health.
- *
- * @param consumerName - Optional consumer name for URL resolution.
- * @param timeoutMs - Request timeout in milliseconds (default 3000).
- * @returns Array of probe results for all services.
- */
-async function probeAllServices(consumerName, timeoutMs = 3000) {
-    const serviceNames = Object.keys(DEFAULT_PORTS);
-    const results = await Promise.all(serviceNames.map((name) => probeService(name, consumerName, timeoutMs)));
-    return results;
-}
-
-/**
- * Registry version cache for npm package update awareness.
- *
- * @remarks
- * Caches the latest npm registry version in a local JSON file
- * to avoid expensive `npm view` calls on every refresh cycle.
- */
-/**
- * Check the npm registry for the latest version of a package.
- *
- * @param packageName - The npm package name (e.g., '\@karmaniverous/jeeves').
- * @param cacheDir - Directory to store the cache file.
- * @param ttlSeconds - Cache TTL in seconds (default 3600).
- * @returns The latest version string, or undefined if the check fails.
- */
-function checkRegistryVersion(packageName, cacheDir, ttlSeconds = 3600) {
-    const cachePath = join(cacheDir, REGISTRY_CACHE_FILE);
-    // Check cache first
-    if (existsSync(cachePath)) {
-        try {
-            const raw = readFileSync(cachePath, 'utf-8');
-            const entry = JSON.parse(raw);
-            const age = Date.now() - new Date(entry.checkedAt).getTime();
-            if (age < ttlSeconds * 1000) {
-                return entry.version;
-            }
-        }
-        catch {
-            // Cache corrupt — proceed with fresh check
-        }
-    }
-    // Query npm registry
-    try {
-        const result = execSync(`npm view ${packageName} version`, {
-            encoding: 'utf-8',
-            timeout: 15_000,
-            stdio: ['pipe', 'pipe', 'pipe'],
-        }).trim();
-        if (!result)
-            return undefined;
-        // Write cache
-        if (!existsSync(cacheDir)) {
-            mkdirSync(cacheDir, { recursive: true });
-        }
-        const entry = {
-            version: result,
-            checkedAt: new Date().toISOString(),
-        };
-        writeFileSync(cachePath, JSON.stringify(entry, null, 2), 'utf-8');
-        return result;
-    }
-    catch {
-        return undefined;
-    }
-}
-
 /**
  * Similarity-based cleanup detection for orphaned managed content.
  *
@@ -1203,6 +1036,48 @@ function parseManaged(fileContent, markers = TOOLS_MARKERS) {
     };
 }
 
+/**
+ * Strip foreign managed blocks from content.
+ *
+ * @remarks
+ * Prevents cross-contamination by removing managed blocks that belong
+ * to other marker sets. For example, when writing TOOLS.md with TOOLS
+ * markers, any SOUL or AGENTS managed blocks found in the user content
+ * zone are stripped — they don't belong there.
+ *
+ * @packageDocumentation
+ */
+/**
+ * Build a regex that matches an entire managed block (BEGIN marker through END marker).
+ *
+ * @param markers - The marker set to match.
+ * @returns A regex that matches the full block including markers.
+ */
+function buildBlockPattern(markers) {
+    const escapedBegin = markers.begin.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const escapedEnd = markers.end.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp(`\\s*<!--\\s*${escapedBegin}(?:\\s*\\|[^>]*)?\\s*(?:—[^>]*)?\\s*-->[\\s\\S]*?<!--\\s*${escapedEnd}\\s*-->\\s*`, 'g');
+}
+/**
+ * Strip managed blocks belonging to foreign marker sets from content.
+ *
+ * @param content - The content to clean (typically user content zone).
+ * @param currentMarkers - The marker set that owns this file (will NOT be stripped).
+ * @returns Content with foreign managed blocks removed.
+ */
+function stripForeignMarkers(content, currentMarkers) {
+    let result = content;
+    for (const markers of ALL_MARKERS) {
+        // Skip the current file's own markers
+        if (markers.begin === currentMarkers.begin)
+            continue;
+        const pattern = buildBlockPattern(markers);
+        result = result.replace(pattern, '\n');
+    }
+    // Clean up multiple blank lines left by removals
+    return result.replace(/\n{3,}/g, '\n\n').trim();
+}
+
 /**
  * Version-stamp parsing and convergence logic.
  *
@@ -1319,8 +1194,8 @@ async function updateManagedSection(filePath, content, options = {}) {
                     ? `# ${markers.title}\n\n${sectionText}`
                     : sectionText;
             }
-            // Cleanup detection
-            const userContent = parsed.userContent;
+            // Strip foreign managed blocks from user content (cross-contamination fix)
+            const userContent = stripForeignMarkers(parsed.userContent, markers);
             const cleanupNeeded = needsCleanup(newManagedBody, userContent);
             // Build the full managed block
             const beginLine = formatBeginMarker(markers.begin, coreVersion);
@@ -1355,71 +1230,14 @@ async function updateManagedSection(filePath, content, options = {}) {
     }
 }
 
-/**
- * Build enriched service rows for the Platform template.
- *
- * @remarks
- * Merges health probe results with component version state and
- * npm registry update availability into rows for the Handlebars
- * Platform template.
- */
-/**
- * Check whether an available version is newer than the current one.
- *
- * @param available - Registry version string.
- * @param current - Currently installed version string.
- * @returns The available version if it's newer, otherwise undefined.
- */
-function newerVersion(available, current) {
-    if (!available ||
-        !current ||
-        !semver.valid(available) ||
-        !semver.valid(current)) {
-        return undefined;
-    }
-    return semver.gt(available, current) ? available : undefined;
-}
-/**
- * Build enriched service rows for the Platform Handlebars template.
- *
- * @param options - Probe results, version state, and configuration.
- * @returns Array of enriched service rows.
- */
-function buildServiceRows(options) {
-    const { probeResults, componentVersions, cacheDir, skipRegistryCheck } = options;
-    return probeResults.map((r) => {
-        const entry = componentVersions[r.name];
-        if (!entry)
-            return { ...r };
-        let availableServiceVersion;
-        let availablePluginVersion;
-        if (!skipRegistryCheck) {
-            if (entry.servicePackage) {
-                const registryVersion = checkRegistryVersion(entry.servicePackage, cacheDir);
-                availableServiceVersion = newerVersion(registryVersion, r.version);
-            }
-            if (entry.pluginPackage && entry.pluginVersion) {
-                const registryVersion = checkRegistryVersion(entry.pluginPackage, cacheDir);
-                availablePluginVersion = newerVersion(registryVersion, entry.pluginVersion);
-            }
-        }
-        return {
-            ...r,
-            pluginVersion: entry.pluginVersion,
-            availableServiceVersion,
-            availablePluginVersion,
-        };
-    });
-}
-
 /**
  * Internal function to maintain SOUL.md, AGENTS.md, and TOOLS.md Platform section.
  *
  * @remarks
  * Called by `ComponentWriter` on each cycle. Not directly exposed to components.
- * Probes service ports for health, reads content files from the package's
- * `content/` directory, renders the Platform template with live service data,
- * and writes managed sections using `updateManagedSection`.
+ * Reads content files from the package's `content/` directory, renders the
+ * Platform template with live data, and writes managed sections using
+ * `updateManagedSection`.
  */
 /**
  * Resolve the package's content directory for template file copying.
@@ -1463,29 +1281,24 @@ function copyTemplates(coreConfigDir) {
     }
     cpSync(sourceDir, destDir, { recursive: true });
 }
-/** Whether Handlebars helpers have been registered. */
-let helpersRegistered = false;
-/** Register Handlebars helpers used in the Platform template. */
-function registerHelpers() {
-    if (helpersRegistered)
-        return;
-    helpersRegistered = true;
-    Handlebars.registerHelper('gt', (a, b) => typeof a === 'number' && typeof b === 'number' && a > b);
-}
 /**
- * Check if a newer core version is available on npm.
+ * Render the Platform template using simple string replacement.
  *
- * @returns The newer version string, or undefined.
+ * @param templatePath - Path to the templates directory.
+ * @returns Rendered platform content string.
  */
-function checkCoreUpdate(coreVersion, cacheDir) {
-    const registryVersion = checkRegistryVersion('@karmaniverous/jeeves', cacheDir);
-    if (registryVersion &&
-        semver.valid(registryVersion) &&
-        semver.valid(coreVersion) &&
-        semver.gt(registryVersion, coreVersion)) {
-        return registryVersion;
+function renderPlatformTemplate(templatePath) {
+    const templatesAvailable = existsSync(templatePath);
+    let content = toolsPlatformTemplate;
+    // Handle <!-- IF_TEMPLATES --> ... <!-- ELSE_TEMPLATES --> ... <!-- ENDIF_TEMPLATES --> block
+    const ifRegex = /<!-- IF_TEMPLATES -->([\s\S]*?)<!-- ELSE_TEMPLATES -->([\s\S]*?)<!-- ENDIF_TEMPLATES -->/;
+    const match = ifRegex.exec(content);
+    if (match) {
+        content = content.replace(match[0], templatesAvailable ? match[1] : match[2]);
     }
-    return undefined;
+    // Replace __TEMPLATE_PATH__ with the actual path
+    content = content.replace(/__TEMPLATE_PATH__/g, templatePath);
+    return content;
 }
 /**
  * Refresh platform content: SOUL.md, AGENTS.md, and TOOLS.md Platform section.
@@ -1493,51 +1306,22 @@ function checkCoreUpdate(coreVersion, cacheDir) {
  * @param options - Configuration for the refresh cycle.
  */
 async function refreshPlatformContent(options) {
-    const { coreVersion, componentName, componentVersion, servicePackage, pluginPackage, stalenessThresholdMs, probeTimeoutMs = 3000, skipRegistryCheck = false, } = options;
+    const { coreVersion, componentName, componentVersion, servicePackage, pluginPackage, stalenessThresholdMs, } = options;
     const workspacePath = getWorkspacePath();
     const coreConfigDir = getCoreConfigDir();
-    // 1. Probe all services
-    const probeResults = await probeAllServices(undefined, probeTimeoutMs);
-    // 2. Write calling component's version entry (with serviceVersion from probe)
+    // 1. Write calling component's version entry
     if (componentName) {
-        const callerProbe = probeResults.find((r) => r.name === componentName);
         writeComponentVersion(coreConfigDir, {
             componentName,
-            serviceVersion: callerProbe?.version,
             pluginVersion: componentVersion,
             servicePackage,
             pluginPackage,
         });
     }
-    // 3. Read all component versions from the shared state file
-    const componentVersions = readComponentVersions(coreConfigDir);
-    // 4. Build enriched service rows with registry checks
-    const cacheDir = componentName
-        ? getComponentConfigDir(componentName)
-        : coreConfigDir;
-    const availableCoreVersion = skipRegistryCheck
-        ? undefined
-        : checkCoreUpdate(coreVersion, cacheDir);
-    const serviceRows = buildServiceRows({
-        probeResults,
-        componentVersions,
-        cacheDir,
-        skipRegistryCheck,
-    });
-    // 5. Render Platform template
+    // 2. Render Platform template
     const templatePath = join(coreConfigDir, TEMPLATES_DIR);
-    registerHelpers();
-    const template = Handlebars.compile(toolsPlatformTemplate);
-    const templateData = {
-        services: serviceRows,
-        unhealthyServices: serviceRows.filter((r) => !r.healthy),
-        coreVersion,
-        availableCoreVersion,
-        templatesAvailable: existsSync(templatePath),
-        templatePath,
-    };
-    const platformContent = template(templateData);
-    // 6. Write TOOLS.md Platform section
+    const platformContent = renderPlatformTemplate(templatePath);
+    // 3. Write TOOLS.md Platform section
     const toolsPath = join(workspacePath, WORKSPACE_FILES.tools);
     await updateManagedSection(toolsPath, platformContent, {
         mode: 'section',
@@ -1546,7 +1330,7 @@ async function refreshPlatformContent(options) {
         coreVersion,
         stalenessThresholdMs,
     });
-    // 7. Write SOUL.md managed block
+    // 4. Write SOUL.md managed block
     const soulPath = join(workspacePath, WORKSPACE_FILES.soul);
     await updateManagedSection(soulPath, soulSectionContent, {
         mode: 'block',
@@ -1554,7 +1338,7 @@ async function refreshPlatformContent(options) {
         coreVersion,
         stalenessThresholdMs,
     });
-    // 8. Write AGENTS.md managed block
+    // 5. Write AGENTS.md managed block
     const agentsPath = join(workspacePath, WORKSPACE_FILES.agents);
     await updateManagedSection(agentsPath, agentsSectionContent, {
         mode: 'block',
@@ -1562,7 +1346,7 @@ async function refreshPlatformContent(options) {
         coreVersion,
         stalenessThresholdMs,
     });
-    // 9. Copy templates to config dir
+    // 6. Copy templates to config dir
     copyTemplates(coreConfigDir);
 }
 
@@ -1614,8 +1398,6 @@ async function seedContent(options) {
     // Seed content via the same code path as writer cycles
     await refreshPlatformContent({
         coreVersion: options.coreVersion,
-        probeTimeoutMs: options.probeTimeoutMs ?? 3000,
-        skipRegistryCheck: options.skipRegistryCheck ?? true,
     });
 }
 
@@ -1668,7 +1450,6 @@ function registerInstallCommand(program) {
         initFromOptions(opts);
         await seedContent({
             coreVersion: CORE_VERSION,
-            skipRegistryCheck: true,
         });
         console.log('✅ Platform content seeded successfully.');
         console.log('  - SOUL.md managed section written');
@@ -1680,12 +1461,73 @@ function registerInstallCommand(program) {
 }
 
 /**
- * CLI status command: probe all service ports and report health summary.
+ * Service URL resolution.
  *
  * @remarks
- * Displays a table of all Jeeves platform services with port and
- * health status. Exits with code 0 if all services are healthy,
- * code 1 if any are unreachable.
+ * Resolves the URL for a named Jeeves service using the following
+ * resolution order:
+ * 1. Consumer's own component config
+ * 2. Core config (`{configRoot}/jeeves-core/config.json`)
+ * 3. Default port constants
+ */
+/**
+ * Resolve the URL for a named Jeeves service.
+ *
+ * @param serviceName - The service name (e.g., 'watcher', 'runner').
+ * @param consumerName - Optional consumer component name for config override.
+ * @returns The resolved service URL.
+ * @throws Error if `init()` has not been called or the service is unknown.
+ */
+function getServiceUrl(serviceName, consumerName) {
+    // 2. Check core config
+    const coreDir = getCoreConfigDir();
+    const coreConfig = loadConfig(coreDir);
+    const coreUrl = coreConfig?.services[serviceName]?.url;
+    if (coreUrl)
+        return coreUrl;
+    // 3. Fall back to port constants
+    const port = DEFAULT_PORTS[serviceName];
+    if (port !== undefined) {
+        return `http://127.0.0.1:${String(port)}`;
+    }
+    throw new Error(`jeeves-core: unknown service "${serviceName}" and no config found`);
+}
+
+/**
+ * HTTP helpers for the OpenClaw plugin SDK.
+ *
+ * @remarks
+ * Thin wrappers around `fetch` that throw on non-OK responses
+ * and handle JSON serialisation/deserialisation.
+ */
+/**
+ * Fetch a URL with an automatic abort timeout.
+ *
+ * @param url - URL to fetch.
+ * @param timeoutMs - Timeout in milliseconds before aborting.
+ * @param init - Optional `fetch` init options.
+ * @returns The fetch Response object.
+ */
+async function fetchWithTimeout(url, timeoutMs, init) {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => {
+        controller.abort();
+    }, timeoutMs);
+    try {
+        return await fetch(url, { ...init, signal: controller.signal });
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+
+/**
+ * CLI status command: discover components and probe their health.
+ *
+ * @remarks
+ * Uses `readComponentVersions()` to discover registered components,
+ * then probes each one via GET /status. Exits with code 0 if all
+ * services are healthy, code 1 if any are unreachable.
  */
 /**
  * Register the status subcommand on the parent CLI program.
@@ -1695,7 +1537,7 @@ function registerInstallCommand(program) {
 function registerStatusCommand(program) {
     program
         .command('status')
-        .description('Probe all Jeeves service ports and report health summary')
+        .description('Discover Jeeves components and probe their health')
         .option('-w, --workspace <path>', 'Workspace root path', DEFAULT_WORKSPACE)
         .option('-c, --config-root <path>', 'Platform config root path', DEFAULT_CONFIG_ROOT)
         .option('-t, --timeout <ms>', 'Probe timeout in milliseconds', '3000')
@@ -1705,43 +1547,68 @@ function registerStatusCommand(program) {
         console.log('Jeeves Platform Status');
         console.log('='.repeat(60));
         console.log();
-        const probeResults = await probeAllServices(undefined, timeoutMs);
+        const { getCoreConfigDir } = await Promise.resolve().then(function () { return init$1; });
+        const coreConfigDir = getCoreConfigDir();
+        const componentVersions = readComponentVersions(coreConfigDir);
+        const componentNames = Object.keys(componentVersions);
+        if (componentNames.length === 0) {
+            console.log('No components registered.');
+            return;
+        }
         const nameWidth = 10;
-        const portWidth = 6;
         const statusWidth = 30;
+        const versionWidth = 12;
         const header = [
-            'Service'.padEnd(nameWidth),
-            'Port'.padEnd(portWidth),
+            'Component'.padEnd(nameWidth),
             'Status'.padEnd(statusWidth),
+            'Version'.padEnd(versionWidth),
         ].join('  ');
         const separator = [
             '-'.repeat(nameWidth),
-            '-'.repeat(portWidth),
             '-'.repeat(statusWidth),
+            '-'.repeat(versionWidth),
         ].join('  ');
         console.log(header);
         console.log(separator);
         let allHealthy = true;
-        for (const r of probeResults) {
+        for (const name of componentNames) {
             let status;
-            if (r.healthy) {
-                status = r.version ? `✅ Running (v${r.version})` : '✅ Running';
+            let version = '—';
+            try {
+                const url = getServiceUrl(name);
+                const response = await fetchWithTimeout(`${url}/status`, timeoutMs);
+                if (response.ok) {
+                    status = '✅ Running';
+                    try {
+                        const body = await response.json();
+                        if (typeof body === 'object' &&
+                            body !== null &&
+                            'version' in body &&
+                            typeof body['version'] === 'string') {
+                            version = body['version'];
+                        }
+                    }
+                    catch {
+                        // Non-JSON response — version stays unknown
+                    }
+                }
+                else {
+                    status = `❌ HTTP ${String(response.status)}`;
+                    allHealthy = false;
+                }
             }
-            else {
-                status = r.error ? `❌ ${r.error}` : '❌ Down';
+            catch {
+                status = '❌ Down';
                 allHealthy = false;
             }
             const row = [
-                r.name.padEnd(nameWidth),
-                String(r.port).padEnd(portWidth),
+                name.padEnd(nameWidth),
                 status.padEnd(statusWidth),
+                version.padEnd(versionWidth),
             ].join('  ');
             console.log(row);
         }
         console.log();
-        const healthy = probeResults.filter((r) => r.healthy).length;
-        const total = probeResults.length;
-        console.log(`${String(healthy)}/${String(total)} services healthy`);
         if (!allHealthy) {
             process.exitCode = 1;
         }
@@ -1833,13 +1700,25 @@ function registerUninstallCommand(program) {
         console.log();
         // Warn if services still responding
         try {
-            const probeResults = await probeAllServices(undefined, 2000);
-            const running = probeResults.filter((r) => r.healthy);
+            const componentVersions = readComponentVersions(coreConfigDir);
+            const componentNames = Object.keys(componentVersions);
+            const running = [];
+            for (const name of componentNames) {
+                try {
+                    const url = getServiceUrl(name);
+                    const response = await fetchWithTimeout(`${url}/status`, 2000);
+                    if (response.ok) {
+                        running.push(name);
+                    }
+                }
+                catch {
+                    // Not running — expected during uninstall
+                }
+            }
             if (running.length > 0) {
                 console.log('⚠️  The following services are still responding:');
-                for (const r of running) {
-                    const ver = r.version ? ` (v${r.version})` : '';
-                    console.log(`    - ${r.name} on port ${String(r.port)}${ver}`);
+                for (const name of running) {
+                    console.log(`    - ${name}`);
                 }
                 console.log('   Consider stopping them before fully removing Jeeves.');
                 console.log();