hermes-connect-services 1.0.0 → 1.0.1

package/README.md

@@ -19,7 +19,16 @@ node hermes-connect-services/bin/sync-hermes-config.mjs
 node hermes-connect-services/bin/sync-hermes-config.mjs --install-hooks
 ```
 
-两步可以合成一次带 `--install-hooks` 的运行。配置文件位置自动探测：
+两步可以合成一次带 `--install-hooks` 的运行。
+
+也可以走 npm(四个端点包 + 本包装在同一项目里,脚本会自动在 `node_modules/` 找兄弟包):
+
+```sh
+npm i zcode-trae-connect zcode-workbuddy-connect zcode-qoder-connect zcode-qwenwork-connect hermes-connect-services
+npx hermes-connect-sync --install-hooks
+```
+
+配置文件位置自动探测:
 
 | 平台 | 路径 |
 |---|---|

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-connect-services",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Bring zcode-ai-connect's four loopback endpoints to hermes: lazy-start them on session start and sync them into hermes' config.yaml as OpenAI-compatible providers.",
   "type": "module",
   "license": "MIT",
@@ -23,6 +23,7 @@
   "files": [
     "bin",
     "src",
+    "tests",
     "README.md",
     "LICENSE"
   ],

package/src/services.mjs

@@ -15,12 +15,21 @@ import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { mkdir, appendFile } from 'node:fs/promises';
 import { spawn } from 'node:child_process';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join, resolve, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-/** Suite root = parent of this directory; overridable for relocation/tests. */
+/**
+ * Suite root = the directory the sibling tools live in.
+ *
+ * In a git checkout that is the repo root; in an npm install the module sits
+ * at `<proj>/node_modules/hermes-connect-services/src/`, so one level up from
+ * `node_modules` is what we want — otherwise every path would gain a second
+ * `node_modules`.
+ */
+const PACKAGE_PARENT = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
 export const SUITE_ROOT = resolve(
-  process.env.AI_CONNECT_SUITE_ROOT ?? dirname(dirname(dirname(fileURLToPath(import.meta.url)))),
+  process.env.AI_CONNECT_SUITE_ROOT
+  ?? (basename(PACKAGE_PARENT) === 'node_modules' ? dirname(PACKAGE_PARENT) : PACKAGE_PARENT),
 );
 
 export const SERVICES = [
@@ -56,8 +65,39 @@ export const SERVICES = [
 
 export const HOME = process.env.USERPROFILE ?? process.env.HOME ?? '.';
 
-export const cliPath = (service) => join(SUITE_ROOT, service.tool, 'bin', 'cli.mjs');
-export const toolRoot = (service) => join(SUITE_ROOT, service.tool);
+const toolDirCache = new Map();
+
+/**
+ * Where a sibling tool actually lives.
+ *
+ * Three layouts have to work, because this module ships both as a git checkout
+ * and as an npm package:
+ *
+ *   <repo>/hermes-connect-services/ + <repo>/zcode-trae-connect/   (checkout)
+ *   <proj>/node_modules/zcode-trae-connect/                        (npm install)
+ *   <prefix>/node_modules/zcode-trae-connect/                      (npm -g)
+ *
+ * `AI_CONNECT_SUITE_ROOT` wins when set, which is the escape hatch for any
+ * layout not covered above.
+ */
+export function toolDir(service) {
+  const cached = toolDirCache.get(service.id);
+  if (cached) return cached;
+
+  const candidates = [
+    process.env.AI_CONNECT_SUITE_ROOT ? join(process.env.AI_CONNECT_SUITE_ROOT, service.tool) : null,
+    join(SUITE_ROOT, service.tool),
+    join(SUITE_ROOT, 'node_modules', service.tool),
+    join(dirname(SUITE_ROOT), service.tool),
+  ].filter(Boolean);
+
+  const resolved = candidates.find((dir) => existsSync(join(dir, 'bin', 'cli.mjs'))) ?? candidates[1];
+  toolDirCache.set(service.id, resolved);
+  return resolved;
+}
+
+export const cliPath = (service) => join(toolDir(service), 'bin', 'cli.mjs');
+export const toolRoot = (service) => toolDir(service);
 export const stateDir = (service) => join(HOME, service.state);
 
 /** Read `{token, port}` from the tool's state dir, falling back to its default port. */

package/tests/test-yaml-patch.mjs

@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+/**
+ * Regressions for the YAML patcher — the one piece of this module that can
+ * corrupt a user's config, so it gets tests instead of good intentions.
+ *
+ * Run: node hermes-connect-services/tests/test-yaml-patch.mjs
+ */
+import assert from 'node:assert/strict';
+import { patchManagedBlock, readManagedBlock, readManagedChildren } from '../src/yaml-patch.mjs';
+
+const MARKER = 'zcode-ai-connect';
+const sample = [
+  'model:',
+  '  provider: nous',
+  'providers:',
+  '  xiaoxin:',
+  '    name: xiaoxin',
+  '    base_url: https://example.test',
+  'fallback_providers: []',
+  '',
+  '# trailing comment that must survive',
+  'display:',
+  '  language: zh',
+  '',
+].join('\n');
+
+let passed = 0;
+const check = (name, fn) => {
+  fn();
+  passed += 1;
+  console.log(`  ok  ${name}`);
+};
+
+console.log('test-yaml-patch');
+
+check('inserts a managed region inside an existing mapping', () => {
+  const { text, action } = patchManagedBlock(sample, 'providers', 'zc-trae:\n  base_url: "http://127.0.0.1:1/v1"', { marker: MARKER });
+  assert.equal(action, 'inserted');
+  assert.match(text, /providers:\n  xiaoxin:/);
+  assert.match(text, /# >>> zcode-ai-connect >>>\n {2}zc-trae:/);
+  assert.match(text, /fallback_providers: \[\]/);
+});
+
+check('replaces its own region and leaves foreign keys alone', () => {
+  const first = patchManagedBlock(sample, 'providers', 'zc-trae:\n  base_url: "a"', { marker: MARKER }).text;
+  const second = patchManagedBlock(first, 'providers', 'zc-trae:\n  base_url: "b"', { marker: MARKER }).text;
+  assert.match(second, /base_url: "b"/);
+  assert.match(second, /  xiaoxin:/);
+  assert.equal(readManagedChildren(second, 'providers', { marker: MARKER }).length, 1);
+});
+
+check('is idempotent: re-patching identical content writes no change', () => {
+  const once = patchManagedBlock(sample, 'providers', 'zc-trae:\n  base_url: "a"', { marker: MARKER }).text;
+  const twice = patchManagedBlock(once, 'providers', 'zc-trae:\n  base_url: "a"', { marker: MARKER });
+  assert.equal(twice.changed, false);
+  assert.equal(twice.text, once);
+});
+
+check('removal restores the original bytes exactly', () => {
+  const once = patchManagedBlock(sample, 'providers', 'zc-trae:\n  base_url: "a"', { marker: MARKER }).text;
+  const gone = patchManagedBlock(once, 'providers', '', { marker: MARKER }).text;
+  assert.equal(gone, sample);
+});
+
+check('creates the top-level key when it is missing', () => {
+  const { text, action } = patchManagedBlock(sample, 'model_overrides', 'zc-trae:\n  "id":\n    supports_tools: true', { marker: MARKER });
+  assert.equal(action, 'inserted');
+  assert.match(text, /\nmodel_overrides:\n {2}# >>> zcode-ai-connect >>>/);
+  assert.match(text, /display:\n {2}language: zh/);
+});
+
+check('never touches content outside its own mapping', () => {
+  const { text } = patchManagedBlock(sample, 'providers', 'zc-trae:\n  base_url: "a"', { marker: MARKER });
+  assert.equal(readManagedBlock(text, 'model', { marker: MARKER }), '');
+  assert.match(text, /model:\n {2}provider: nous/);
+});
+
+check('readManagedChildren round-trips every provider id', () => {
+  const body = [
+    'zc-trae:',
+    '  base_url: "http://127.0.0.1:39272/v1"',
+    '  models:',
+    '    "a": {}',
+    'zc-workbuddy:',
+    '  base_url: "http://127.0.0.1:39271/v1"',
+  ].join('\n');
+  const once = patchManagedBlock(sample, 'providers', body, { marker: MARKER }).text;
+  const children = readManagedChildren(once, 'providers', { marker: MARKER });
+  assert.deepEqual(children.map((c) => c.key), ['zc-trae', 'zc-workbuddy']);
+  assert.match(children[0].body, /models:\n {4}"a": \{\}/);
+  // Feeding them back unchanged must be a no-op — this is what keeps `--only`
+  // from silently deleting the providers it was not asked about.
+  const twice = patchManagedBlock(once, 'providers', children.map((c) => c.body).join('\n'), { marker: MARKER });
+  assert.equal(twice.text, once);
+});
+
+check('survives an unterminated marker (hand-edit gone wrong)', () => {
+  // A hand-edit that dropped the closing marker leaves an orphan inside the
+  // providers mapping — the next sync must repair it, not stack a second one.
+  const broken = sample.replace(
+    'fallback_providers: []',
+    `  # >>> ${MARKER} >>>\n  zc-trae:\n    base_url: "a"\nfallback_providers: []`,
+  );
+  const repaired = patchManagedBlock(broken, 'providers', 'zc-trae:\n  base_url: "a"', { marker: MARKER });
+  assert.equal(repaired.text.match(new RegExp(`# >>> ${MARKER} >>>`, 'g')).length, 1);
+  assert.match(repaired.text, /# <<< zcode-ai-connect <<</);
+});
+
+console.log(`\n${passed} passed`);