archgraph-argo 0.10.43 → 0.10.46

package/argo/scripts/validateTraceProposal.js

@@ -1,181 +1,181 @@
-const fs = require('fs');
-const path = require('path');
-
-const {
-  getArgoRoot,
-  getWorkspaceRoot,
-} = require('./argo-paths.js');
-
-const repoRoot = getWorkspaceRoot();
-const DEFAULT_PROPOSAL_PATH = 'design/KG/ImplementationToIntentTraceProposal.json';
-const TRACE_PROPOSAL_SCHEMA_PATH = '.argo/schema/ImplementationToIntentTraceProposal.schema.json';
-
-function main() {
-    const proposalPath = process.argv[2] || DEFAULT_PROPOSAL_PATH;
-    const errors = validateTraceProposal(proposalPath);
-
-    if (errors.length > 0) {
-        console.error('Trace proposal validation failed:');
-        for (const error of errors) {
-            console.error(`- ${error}`);
-        }
-        process.exit(1);
-    }
-
-    console.log(`Trace proposal validation passed for: ${proposalPath}`);
-}
-
-function resolveSchemaAbsolutePath(schemaPath) {
-    const bundledCandidate = path.join(getArgoRoot(), 'schema', path.basename(schemaPath));
-    if (fs.existsSync(bundledCandidate)) {
-        return bundledCandidate;
-    }
-    return path.join(repoRoot, schemaPath);
-}
-
-function validateTraceProposal(proposalPath) {
-    const errors = [];
-    const schemaAbsolutePath = resolveSchemaAbsolutePath(TRACE_PROPOSAL_SCHEMA_PATH);
-    if (!fs.existsSync(schemaAbsolutePath)) {
-        errors.push(`schema file is missing at ${TRACE_PROPOSAL_SCHEMA_PATH}`);
-        return errors;
-    }
-
-    const proposalAbsolutePath = path.join(repoRoot, proposalPath.replace(/[\\/]+/g, path.sep));
-    if (!fs.existsSync(proposalAbsolutePath)) {
-        errors.push(`proposal file is missing at ${proposalPath}`);
-        return errors;
-    }
-
-    const document = readJson(proposalAbsolutePath, proposalPath, errors);
-    if (!document) {
-        return errors;
-    }
-
-    requireExact(document, 'proposalType', 'implementation-to-intent-trace', errors, proposalPath);
-    requireString(document, 'generatedAt', errors, proposalPath);
-    requireExact(document, 'sourceAgent', 'ImplementationDesign', errors, proposalPath);
-    requireExact(document, 'targetAgent', 'IntentionDesign', errors, proposalPath);
-    requireExact(document, 'lifecycle', 'temporary-trace-proposal', errors, proposalPath);
-
-    const graphPath = requireString(document, 'sourceIntentGraphPath', errors, proposalPath);
-    if (graphPath) {
-        ensureRepoPathExists(graphPath, `${proposalPath}.sourceIntentGraphPath`, errors);
-    }
-
-    const implementationContracts = requireStringArray(document, 'implementationContracts', true, errors, proposalPath);
-    if (Array.isArray(implementationContracts)) {
-        implementationContracts.forEach((contractPath, index) => {
-            ensureRepoPathExists(contractPath, `${proposalPath}.implementationContracts[${index}]`, errors);
-        });
-    }
-
-    const anchorProposals = requireArray(document, 'anchorProposals', true, errors, proposalPath);
-    if (Array.isArray(anchorProposals)) {
-        anchorProposals.forEach((anchor, index) => validateAnchorProposal(anchor, `${proposalPath}.anchorProposals[${index}]`, errors));
-    }
-
-    return errors;
-}
-
-function validateAnchorProposal(anchor, prefix, errors) {
-    requireString(anchor, 'intentElementId', errors, prefix);
-    requireString(anchor, 'implementationElementName', errors, prefix);
-    const implementationElementKind = requireString(anchor, 'implementationElementKind', errors, prefix);
-    if (implementationElementKind && ![
-        'stable-directory',
-        'contract-file',
-        'explicit-test-entry',
-        'critical-guardrail',
-        'runtime-component',
-        'schema-contract',
-        'mcp-tool',
-        'command',
-    ].includes(implementationElementKind)) {
-        errors.push(`${prefix}.implementationElementKind has unsupported value '${implementationElementKind}'`);
-    }
-
-    const implementsType = requireString(anchor, 'implementsType', errors, prefix);
-    if (implementsType && !['direct', 'indirect'].includes(implementsType)) {
-        errors.push(`${prefix}.implementsType must be 'direct' or 'indirect'`);
-    }
-
-    requireString(anchor, 'tracePurpose', errors, prefix);
-    const contractPaths = requireStringArray(anchor, 'contractPaths', true, errors, prefix);
-    if (Array.isArray(contractPaths)) {
-        contractPaths.forEach((contractPath, index) => {
-            ensureRepoPathExists(contractPath, `${prefix}.contractPaths[${index}]`, errors);
-        });
-    }
-    const contextEntryPoints = requireStringArray(anchor, 'contextEntryPoints', true, errors, prefix);
-    if (Array.isArray(contextEntryPoints)) {
-        contextEntryPoints.forEach((entryPoint, index) => {
-            ensureRepoPathExists(entryPoint, `${prefix}.contextEntryPoints[${index}]`, errors);
-        });
-    }
-    requireStringArray(anchor, 'excludedDetails', true, errors, prefix);
-}
-
-function readJson(filePath, label, errors) {
-    try {
-        return JSON.parse(fs.readFileSync(filePath, 'utf8').replace(/^\uFEFF/, ''));
-    } catch (error) {
-        errors.push(`failed to parse ${label}: ${String(error)}`);
-        return undefined;
-    }
-}
-
-function requireExact(object, key, expectedValue, errors, prefix) {
-    const value = requireString(object, key, errors, prefix);
-    if (value && value !== expectedValue) {
-        errors.push(`${prefix}.${key} must be '${expectedValue}'`);
-    }
-}
-
-function requireString(object, key, errors, prefix) {
-    if (!object || typeof object[key] !== 'string' || object[key].trim() === '') {
-        errors.push(`${prefix}.${key} must be a non-empty string`);
-        return undefined;
-    }
-    return object[key];
-}
-
-function requireArray(object, key, mustHaveItems, errors, prefix) {
-    if (!object || !Array.isArray(object[key])) {
-        errors.push(`${prefix}.${key} must be an array`);
-        return undefined;
-    }
-    if (mustHaveItems && object[key].length === 0) {
-        errors.push(`${prefix}.${key} must not be empty`);
-    }
-    return object[key];
-}
-
-function requireStringArray(object, key, mustHaveItems, errors, prefix) {
-    const value = requireArray(object, key, mustHaveItems, errors, prefix);
-    if (!Array.isArray(value)) {
-        return undefined;
-    }
-    value.forEach((entry, index) => {
-        if (typeof entry !== 'string' || entry.trim() === '') {
-            errors.push(`${prefix}.${key}[${index}] must be a non-empty string`);
-        }
-    });
-    return value;
-}
-
-function ensureRepoPathExists(relativePath, label, errors) {
-    const normalized = relativePath.replace(/[\\/]+/g, path.sep);
-    const absolutePath = path.join(repoRoot, normalized);
-    if (!fs.existsSync(absolutePath)) {
-        errors.push(`${label} points to a missing path: ${relativePath}`);
-    }
-}
-
-if (require.main === module) {
-    main();
-}
-
-module.exports = {
-    validateTraceProposal,
-};
+const fs = require('fs');
+const path = require('path');
+
+const {
+  getArgoRoot,
+  getWorkspaceRoot,
+} = require('./argo-paths.js');
+
+const repoRoot = getWorkspaceRoot();
+const DEFAULT_PROPOSAL_PATH = 'design/KG/ImplementationToIntentTraceProposal.json';
+const TRACE_PROPOSAL_SCHEMA_PATH = '.argo/schema/ImplementationToIntentTraceProposal.schema.json';
+
+function main() {
+    const proposalPath = process.argv[2] || DEFAULT_PROPOSAL_PATH;
+    const errors = validateTraceProposal(proposalPath);
+
+    if (errors.length > 0) {
+        console.error('Trace proposal validation failed:');
+        for (const error of errors) {
+            console.error(`- ${error}`);
+        }
+        process.exit(1);
+    }
+
+    console.log(`Trace proposal validation passed for: ${proposalPath}`);
+}
+
+function resolveSchemaAbsolutePath(schemaPath) {
+    const bundledCandidate = path.join(getArgoRoot(), 'schema', path.basename(schemaPath));
+    if (fs.existsSync(bundledCandidate)) {
+        return bundledCandidate;
+    }
+    return path.join(repoRoot, schemaPath);
+}
+
+function validateTraceProposal(proposalPath) {
+    const errors = [];
+    const schemaAbsolutePath = resolveSchemaAbsolutePath(TRACE_PROPOSAL_SCHEMA_PATH);
+    if (!fs.existsSync(schemaAbsolutePath)) {
+        errors.push(`schema file is missing at ${TRACE_PROPOSAL_SCHEMA_PATH}`);
+        return errors;
+    }
+
+    const proposalAbsolutePath = path.join(repoRoot, proposalPath.replace(/[\\/]+/g, path.sep));
+    if (!fs.existsSync(proposalAbsolutePath)) {
+        errors.push(`proposal file is missing at ${proposalPath}`);
+        return errors;
+    }
+
+    const document = readJson(proposalAbsolutePath, proposalPath, errors);
+    if (!document) {
+        return errors;
+    }
+
+    requireExact(document, 'proposalType', 'implementation-to-intent-trace', errors, proposalPath);
+    requireString(document, 'generatedAt', errors, proposalPath);
+    requireExact(document, 'sourceAgent', 'ImplementationDesign', errors, proposalPath);
+    requireExact(document, 'targetAgent', 'IntentionDesign', errors, proposalPath);
+    requireExact(document, 'lifecycle', 'temporary-trace-proposal', errors, proposalPath);
+
+    const graphPath = requireString(document, 'sourceIntentGraphPath', errors, proposalPath);
+    if (graphPath) {
+        ensureRepoPathExists(graphPath, `${proposalPath}.sourceIntentGraphPath`, errors);
+    }
+
+    const implementationContracts = requireStringArray(document, 'implementationContracts', true, errors, proposalPath);
+    if (Array.isArray(implementationContracts)) {
+        implementationContracts.forEach((contractPath, index) => {
+            ensureRepoPathExists(contractPath, `${proposalPath}.implementationContracts[${index}]`, errors);
+        });
+    }
+
+    const anchorProposals = requireArray(document, 'anchorProposals', true, errors, proposalPath);
+    if (Array.isArray(anchorProposals)) {
+        anchorProposals.forEach((anchor, index) => validateAnchorProposal(anchor, `${proposalPath}.anchorProposals[${index}]`, errors));
+    }
+
+    return errors;
+}
+
+function validateAnchorProposal(anchor, prefix, errors) {
+    requireString(anchor, 'intentElementId', errors, prefix);
+    requireString(anchor, 'implementationElementName', errors, prefix);
+    const implementationElementKind = requireString(anchor, 'implementationElementKind', errors, prefix);
+    if (implementationElementKind && ![
+        'stable-directory',
+        'contract-file',
+        'explicit-test-entry',
+        'critical-guardrail',
+        'runtime-component',
+        'schema-contract',
+        'mcp-tool',
+        'command',
+    ].includes(implementationElementKind)) {
+        errors.push(`${prefix}.implementationElementKind has unsupported value '${implementationElementKind}'`);
+    }
+
+    const implementsType = requireString(anchor, 'implementsType', errors, prefix);
+    if (implementsType && !['direct', 'indirect'].includes(implementsType)) {
+        errors.push(`${prefix}.implementsType must be 'direct' or 'indirect'`);
+    }
+
+    requireString(anchor, 'tracePurpose', errors, prefix);
+    const contractPaths = requireStringArray(anchor, 'contractPaths', true, errors, prefix);
+    if (Array.isArray(contractPaths)) {
+        contractPaths.forEach((contractPath, index) => {
+            ensureRepoPathExists(contractPath, `${prefix}.contractPaths[${index}]`, errors);
+        });
+    }
+    const contextEntryPoints = requireStringArray(anchor, 'contextEntryPoints', true, errors, prefix);
+    if (Array.isArray(contextEntryPoints)) {
+        contextEntryPoints.forEach((entryPoint, index) => {
+            ensureRepoPathExists(entryPoint, `${prefix}.contextEntryPoints[${index}]`, errors);
+        });
+    }
+    requireStringArray(anchor, 'excludedDetails', true, errors, prefix);
+}
+
+function readJson(filePath, label, errors) {
+    try {
+        return JSON.parse(fs.readFileSync(filePath, 'utf8').replace(/^\uFEFF/, ''));
+    } catch (error) {
+        errors.push(`failed to parse ${label}: ${String(error)}`);
+        return undefined;
+    }
+}
+
+function requireExact(object, key, expectedValue, errors, prefix) {
+    const value = requireString(object, key, errors, prefix);
+    if (value && value !== expectedValue) {
+        errors.push(`${prefix}.${key} must be '${expectedValue}'`);
+    }
+}
+
+function requireString(object, key, errors, prefix) {
+    if (!object || typeof object[key] !== 'string' || object[key].trim() === '') {
+        errors.push(`${prefix}.${key} must be a non-empty string`);
+        return undefined;
+    }
+    return object[key];
+}
+
+function requireArray(object, key, mustHaveItems, errors, prefix) {
+    if (!object || !Array.isArray(object[key])) {
+        errors.push(`${prefix}.${key} must be an array`);
+        return undefined;
+    }
+    if (mustHaveItems && object[key].length === 0) {
+        errors.push(`${prefix}.${key} must not be empty`);
+    }
+    return object[key];
+}
+
+function requireStringArray(object, key, mustHaveItems, errors, prefix) {
+    const value = requireArray(object, key, mustHaveItems, errors, prefix);
+    if (!Array.isArray(value)) {
+        return undefined;
+    }
+    value.forEach((entry, index) => {
+        if (typeof entry !== 'string' || entry.trim() === '') {
+            errors.push(`${prefix}.${key}[${index}] must be a non-empty string`);
+        }
+    });
+    return value;
+}
+
+function ensureRepoPathExists(relativePath, label, errors) {
+    const normalized = relativePath.replace(/[\\/]+/g, path.sep);
+    const absolutePath = path.join(repoRoot, normalized);
+    if (!fs.existsSync(absolutePath)) {
+        errors.push(`${label} points to a missing path: ${relativePath}`);
+    }
+}
+
+if (require.main === module) {
+    main();
+}
+
+module.exports = {
+    validateTraceProposal,
+};

package/bin/argo-deploy.js

@@ -1,12 +1,12 @@
-#!/usr/bin/env node
-'use strict';
-
-const { spawnSync } = require('node:child_process');
-const path = require('node:path');
-
-const script = path.join(__dirname, '..', 'install-argo.ps1');
-const shell = process.platform === 'win32' ? 'powershell' : 'pwsh';
-const args = ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', script, ...process.argv.slice(2)];
-
-const result = spawnSync(shell, args, { stdio: 'inherit' });
-process.exit(result.status === null ? 1 : result.status);
+#!/usr/bin/env node
+'use strict';
+
+const { spawnSync } = require('node:child_process');
+const path = require('node:path');
+
+const script = path.join(__dirname, '..', 'install-argo.ps1');
+const shell = process.platform === 'win32' ? 'powershell' : 'pwsh';
+const args = ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', script, ...process.argv.slice(2)];
+
+const result = spawnSync(shell, args, { stdio: 'inherit' });
+process.exit(result.status === null ? 1 : result.status);

package/install-argo.ps1

@@ -24,7 +24,8 @@ param(
     [string]$OpenClawWorkspace = "$env:USERPROFILE\.openclaw\workspace",
     [string]$OpenClawRepoRoot = '',
     [switch]$SkipOpenClaw,
-    [string]$McpPath
+    [string]$McpPath,
+    [string]$GraphMcpUrl = 'https://argo.derekworkspacev5.com/mcp'
 )
 
 $ErrorActionPreference = 'Stop'
@@ -135,7 +136,8 @@ function Write-McpConfig {
     param(
         [string]$Path,
         [string]$ServersKey,
-        $ServerConfig
+        $ServerConfig,
+        [System.Collections.IDictionary]$ExtraServers = $null
     )
 
     $root = [ordered]@{}
@@ -160,6 +162,11 @@ function Write-McpConfig {
         }
     }
     $servers['argo'] = $ServerConfig
+    if ($null -ne $ExtraServers) {
+        foreach ($name in $ExtraServers.Keys) {
+            $servers[$name] = $ExtraServers[$name]
+        }
+    }
     $root[$ServersKey] = $servers
 
     New-Item -ItemType Directory -Force -Path (Split-Path $Path) | Out-Null
@@ -346,7 +353,8 @@ function Write-OpenClawMcpConfig {
     param(
         [string]$OpenClawHome,
         [string]$RepoRoot,
-        [string]$ArgoServer
+        [string]$ArgoServer,
+        $GraphMcpServer
     )
     $configPath = Join-Path $OpenClawHome 'openclaw.json'
     $root = [ordered]@{}
@@ -408,6 +416,9 @@ function Write-OpenClawMcpConfig {
         $argoServerObj.env = $envBlock
     }
     $servers['argo'] = $argoServerObj
+    if ($null -ne $GraphMcpServer) {
+        $servers['graph-mcp'] = $GraphMcpServer
+    }
     $mcp['servers'] = $servers
     $root['mcp'] = $mcp
     New-Item -ItemType Directory -Force -Path $OpenClawHome | Out-Null
@@ -836,7 +847,10 @@ if ($SkipDsh) {
     Write-Host "[19/22] argo\agents -> $DshHome\.agent-presets\<id> (DeepSeek Harness agent presets)"
     New-DshAgentPresets -DshHome $DshHome -AgentsSrc (Join-Path $argoDir 'agents')
 
-    Write-Host '  Restart `dsh web` to activate the MCP bridge and the wakeup plugin;'
+    Write-Host "  note: graph-mcp remote ($GraphMcpUrl) is NOT registered for DeepSeek Harness -"
+    Write-Host "  ~/.dsh/cordis.patch.yml only carries plugin rows (the dsh-argo-workspace bridge spawns"
+    Write-Host "  the local argo server); an HTTP remote MCP server has no equivalent cordis row here."
+    Write-Host "  Restart `dsh web` to activate the MCP bridge and the wakeup plugin;"
     Write-Host '  new sessions pick up the global rule and the argo-init skill automatically.'
     Write-Host '  The argo tools (mcp__argo__*) auto-follow the workspace the user switched to'
     Write-Host '  in one dsh instance - no restart needed between workspaces (the server honors'
@@ -956,6 +970,21 @@ if ($SkipMcp) {
     Write-Host 'Skipped MCP configuration (-SkipMcp).'
 } else {
     $argoServer = (Join-Path $ArgoRoot 'scripts\argo-mcp-server.js').Replace('\', '/')
+    $graphMcpServer = [ordered]@{
+        type    = 'remote'
+        url     = $GraphMcpUrl
+        enabled = $true
+    }
+    # OpenClaw MCP servers are keyed by `transport` (streamable-http / sse /
+    # stdio), not by a `type: remote` alias: canonicalizeConfiguredMcpServer only
+    # maps type http/streamable-http/sse/stdio to a transport, so a bare
+    # {type:remote,url} entry would be dialed over SSE and the streamable-http
+    # endpoint returns 404 (openclaw mcp probe graph-mcp: SSE error Non-200 404).
+    $openClawGraphMcpServer = [ordered]@{
+        url       = $GraphMcpUrl
+        transport = 'streamable-http'
+        enabled   = $true
+    }
 
     Write-Host '==> Registering argo MCP server in VS Code (GitHub Copilot)'
     $mcpPath = if ($McpPath) { $McpPath } else { Join-Path $env:APPDATA 'Code\User\mcp.json' }
@@ -963,7 +992,7 @@ if ($SkipMcp) {
         type    = 'stdio'
         command = 'node'
         args    = @($argoServer)
-    })
+    }) -ExtraServers ([ordered]@{ 'graph-mcp' = $graphMcpServer })
     Write-Host "argo MCP config written -> $mcpPath"
 
     Write-Host '==> Registering argo MCP server in Cursor'
@@ -971,7 +1000,7 @@ if ($SkipMcp) {
         type    = 'stdio'
         command = 'node'
         args    = @($argoServer)
-    })
+    }) -ExtraServers ([ordered]@{ 'graph-mcp' = $graphMcpServer })
     Write-Host "argo MCP config written -> $CursorMcpPath"
 
     Write-Host '==> Registering argo MCP server in OpenCode'
@@ -979,7 +1008,7 @@ if ($SkipMcp) {
         type    = 'local'
         command = @('node', $argoServer)
         enabled = $true
-    })
+    }) -ExtraServers ([ordered]@{ 'graph-mcp' = $graphMcpServer })
     Write-Host "argo MCP config written -> $OpenCodeConfigPath"
 
     if (-not $SkipOpenClaw) {
@@ -988,7 +1017,7 @@ if ($SkipMcp) {
         # installer runs from a non-workspace npm-global package dir).
         $openClawRepoRoot = if ($OpenClawRepoRoot) { $OpenClawRepoRoot } else { $repoRoot }
         Write-Host "[22/22] argo MCP server -> $(Join-Path $OpenClawHome 'openclaw.json') (OpenClaw mcp.servers.argo, env.ARGO_REPO_ROOT pinned)"
-        Write-OpenClawMcpConfig -OpenClawHome $OpenClawHome -RepoRoot $openClawRepoRoot -ArgoServer $argoServer
+        Write-OpenClawMcpConfig -OpenClawHome $OpenClawHome -RepoRoot $openClawRepoRoot -ArgoServer $argoServer -GraphMcpServer $openClawGraphMcpServer
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archgraph-argo",
-  "version": "0.10.43",
+  "version": "0.10.46",
   "description": "Deploy the ArchGraph ARGO toolchain, skills, and rules (schema, scripts, argo-init skill, global rule) with one command.",
   "license": "MIT",
   "bin": {