@volter/supercode-orchestrator 0.4.10 → 0.4.12

package/activation.mjs

@@ -6,6 +6,7 @@ import { join, relative, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { mkdirSync, readFileSync, readdirSync, lstatSync, rmSync, writeFileSync, existsSync } from 'node:fs';
 import { CLAUDE_BRIDGE, linkTo, skillSources } from './hermes-home.mjs';
+import { ownLogin } from './worker-route.mjs';
 
 /** Which env var each harness reads its config home from (supercode registry evidence). */
 export const HOME_ENV = Object.freeze({
@@ -44,7 +45,8 @@ export function activationEnv({ root, profile, surfaceKey, vault }) {
   // `home: user` keeps the user's own harness home (their CLAUDE.md, skills, hooks, plugins, MCP servers and login);
   // the profile's persona and skills come in beside it through the launch (userHomeArguments).
   if (worker.home === 'user') env.HOME = homedir();
-  else if (homeVar) env[homeVar] = join(profile.dir, worker.harness);
+  // a worker on its user's own login keeps that user's config home (worker-route.mjs `ownLogin`)
+  else if (homeVar && !ownLogin(profile)) env[homeVar] = join(profile.dir, worker.harness);
   for (const [k, v] of Object.entries(worker.env ?? {})) env[k] = resolveRef(v, vault);
   env[ORCH_ENV.root] = root;
   env[ORCH_ENV.profile] = profile.name;
@@ -131,10 +133,15 @@ export function materializeSkills(profile) {
     mkdirSync(join(profile.dir, worker.harness, '.claude-plugin'), { recursive: true });
     if (!existsSync(manifest) || readFileSync(manifest, 'utf8') !== text) writeFileSync(manifest, text);
   }
-  for (const [name, from] of sources) linkTo(join(into, name), relative(into, from));
-  for (const entry of readdirSync(into)) {
-    const path = join(into, entry);
-    if (lstatSync(path).isSymbolicLink() && !sources.has(entry) && !existsSync(path)) rmSync(path, { force: true });
+  // A worker on its user's own login reads them from the `--add-dir`ed Claude home's `.claude/skills` (worker-route.mjs
+  // `ownLogin`), linked beside `skills/`, which the orchestrator's own skill lookup still reads.
+  for (const folder of [into, ...(ownLogin(profile) ? [join(profile.dir, worker.harness, '.claude', 'skills')] : [])]) {
+    mkdirSync(folder, { recursive: true });
+    for (const [name, from] of sources) linkTo(join(folder, name), relative(folder, from));
+    for (const entry of readdirSync(folder)) {
+      const path = join(folder, entry);
+      if (lstatSync(path).isSymbolicLink() && !sources.has(entry) && !existsSync(path)) rmSync(path, { force: true });
+    }
   }
   return into;
 }

package/bin/orchestrator.mjs

@@ -69,6 +69,9 @@ import * as events from '../events.mjs';
 import { httpJobExecutor } from '../hosted.mjs';
 import { SupercodeHarnessClient } from '@volter/supercode-harness-sdk';
 
+/** How long a starting daemon waits for a stopping predecessor to release the home's lease. */
+const LEASE_HANDOFF_MS = 20_000;
+
 /// Adapter selector -> constructor. A `platforms:` block picks its adapter by
 /// `extra.adapter` when it has one and by the block's own name otherwise, so
 /// `platforms.slack.extra.adapter: chat-sdk` and `platforms.api_server` both
@@ -596,6 +599,13 @@ async function main() {
   if (!args.once) {
     // Serialize lease replacement before loading state. An acquisition guard
     // left by a crash fails closed; inspect it before removing it manually.
+    // A service manager's restart starts this one while the last is still stopping (launchd's kickstart -k did, and
+    // this one exited 'already serving'): a live predecessor gets a moment to let go before it counts as serving.
+    for (let waited = 0; waited < LEASE_HANDOFF_MS; waited += 250) {
+      const previous = readLock(root);
+      if (!previous || previous.pid === process.pid || !leaseIsLive(previous)) break;
+      await new Promise((resolve) => setTimeout(resolve, 250));
+    }
     const guard = join(root, 'orchestrator.acquire');
     mkdirSync(guard);
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {

package/worker-route.mjs

@@ -91,9 +91,27 @@ export function workerRoute(profile, worker, vault) {
   return { model, args: ['-c', `model_provider=${JSON.stringify(id)}`], env };
 }
 
-/** Claude Code's route: its own environment and the endpoint's Messages wire. */
+/**
+ * Whether a Claude Code worker runs on its user's own Claude login: `provider: anthropic` with no endpoint and no key,
+ * in the profile's home (a `home: user` worker is in that user's home already). The runhuman lobby managers run so.
+ * Claude Code finds its login through its config home, and a `CLAUDE_CONFIG_DIR` of the profile's own reports "Not
+ * logged in" (measured, claude 2.1.280), so the worker keeps its user's config home and the profile's reaches it by
+ * flag: `--add-dir` the profile's Claude home (its `CLAUDE.md`, read there under
+ * `CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD`, and its `.claude/skills`), `--setting-sources project,local` so that
+ * user's own settings, hooks and `CLAUDE.md` stay out, and `--strict-mcp-config` so only the MCP door's servers mount.
+ */
+export function ownLogin(profile, worker = profile?.worker) {
+  const route = hermesModel(profile);
+  return worker?.harness === 'claude-code' && worker?.home !== 'user' && route?.provider === 'anthropic' && !route.base_url && !route.api_key;
+}
+
+/** Claude Code's route: its own environment, the endpoint's Messages wire, or its user's own login (`ownLogin`). */
 function claudeRoute(profile, route, model, vault) {
   if (!['custom', 'anthropic'].includes(route.provider)) throw new Error(`model.provider ${route.provider} has no Claude Code route in this orchestrator yet; refused rather than run on Claude Code's default`);
+  if (ownLogin(profile, { ...profile.worker, harness: 'claude-code' })) {
+    const env = { CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD: '1', ...(model ? { ANTHROPIC_MODEL: model } : {}) };
+    return { model, args: ['--add-dir', join(profile.dir, 'claude-code'), '--setting-sources', 'project,local', '--strict-mcp-config'], env };
+  }
   if (!route.base_url) throw new Error('Claude Code runs on a model with an endpoint (model.base_url); refused rather than run on Claude Code\'s default');
   const env = { CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1' };
   if (route.base_url) env.ANTHROPIC_BASE_URL = String(resolve(route.base_url, vault).value).replace(/\/v1\/?$/, '').replace(/\/$/, '');