@volter/supercode-orchestrator 0.4.9 → 0.4.11

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/apply/doors.mjs

@@ -72,7 +72,7 @@ export function differs(want, live) {
  */
 function declaredOnly(spec, inference, rename) {
   const want = { schedule: spec.schedule };
-  for (const field of ['prompt', 'skills', 'deliver', 'workdir', 'repeat', 'script', 'no_agent', 'monitor_script', 'monitor_url', 'toolsets', 'context_from']) {
+  for (const field of ['prompt', 'skills', 'deliver', 'attach_to_session', 'workdir', 'repeat', 'script', 'no_agent', 'monitor_script', 'monitor_url', 'toolsets', 'context_from']) {
     if (spec[field] !== undefined) want[rename[field] ?? field] = spec[field];
   }
   if (spec.model !== undefined) Object.assign(want, namedModel(spec, inference));
@@ -152,7 +152,7 @@ export function hermesDoor({ home, python = null, source = null, runner = null,
     id: job.id,
     name: job.name ?? null,
     managed: {
-      schedule: job.schedule ?? null, prompt: job.prompt ?? null, skills: job.skills ?? null, deliver: job.deliver ?? null,
+      schedule: job.schedule ?? null, prompt: job.prompt ?? null, skills: job.skills ?? null, deliver: job.deliver ?? null, attach_to_session: job.attach_to_session ?? null,
       model: job.model ?? null, provider: job.provider ?? null, workdir: job.workdir ?? null, repeat: job.repeat?.times ?? null,
       script: job.script ?? null, no_agent: Boolean(job.no_agent), monitor_script: job.monitor_script ?? null,
       monitor_url: job.monitor_url ?? null, enabled_toolsets: job.enabled_toolsets ?? null, context_from: job.context_from ?? null,
@@ -234,7 +234,7 @@ export async function orchestratorDoor({ root, profile = 'default', load, socket
     id: job.id,
     name: job.residue?.name ?? null,
     managed: {
-      schedule: job.schedule ?? null, prompt: job.prompt ?? null, skills: job.skills ?? null, deliver: deliver(job.deliver),
+      schedule: job.schedule ?? null, prompt: job.prompt ?? null, skills: job.skills ?? null, deliver: deliver(job.deliver), attach_to_session: job.attach_to_session ?? null,
       model: job.model ?? null, workdir: job.workdir ?? null, repeat: job.repeat?.times ?? null,
       script: job.residue?.script ?? null, no_agent: job.residue?.no_agent === true, monitor_script: job.residue?.monitor_script ?? null,
       monitor_url: job.residue?.monitor_url ?? null, context_from: job.context_from ?? null,
@@ -254,7 +254,7 @@ export async function orchestratorDoor({ root, profile = 'default', load, socket
     return row;
   };
   /** What jobs.update can change; a change to anything else is refused per record, never dropped. */
-  const UPDATABLE = new Set(['schedule', 'prompt', 'deliver', 'model', 'workdir', 'script', 'no_agent', 'monitor_script', 'monitor_url']);
+  const UPDATABLE = new Set(['schedule', 'prompt', 'deliver', 'attach_to_session', 'model', 'workdir', 'script', 'no_agent', 'monitor_script', 'monitor_url']);
   return {
     target: 'orchestrator',
     list,
@@ -289,4 +289,4 @@ export async function orchestratorDoor({ root, profile = 'default', load, socket
 }
 
 /** The job fields the applier owns: the union both doors read (a door that has no such field reads null). */
-export const MANAGED_JOB_FIELDS = Object.freeze(['schedule', 'prompt', 'skills', 'deliver', 'model', 'provider', 'workdir', 'repeat', 'script', 'no_agent', 'monitor_script', 'monitor_url', 'enabled_toolsets', 'context_from']);
+export const MANAGED_JOB_FIELDS = Object.freeze(['schedule', 'prompt', 'skills', 'deliver', 'attach_to_session', 'model', 'provider', 'workdir', 'repeat', 'script', 'no_agent', 'monitor_script', 'monitor_url', 'enabled_toolsets', 'context_from']);

package/cron.mjs

@@ -12,7 +12,7 @@
 
 import { surfaceKeyString } from './ir.mjs';
 import { homeChannel } from './ir.mjs';
-import { endBinding, ensureRuntime, leaseId, newObligation, permissionResponse, reply } from './reducer.mjs';
+import { endBinding, ensureRuntime, leaseId, newObligation, permissionResponse, reply, startWorker } from './reducer.mjs';
 
 /** Retry delays after the 1st, 2nd and 3rd send attempt (§4.3 "retry pending obligations"). */
 export const BACKOFF_MINUTES = Object.freeze([1, 2, 4]);
@@ -799,6 +799,7 @@ function launchFire(state, profile, job, fire, prompt, now, effects) {
     deliverResult(state, profile, { job, fire }, fire.error, true, now, effects);
     return;
   }
+  if (job.attach_to_session === true && attachFire(state, profile, job, fire, prompt, now, effects)) return;
   const rt = ensureRuntime(state);
 
   const key = { platform: 'cron', kind: 'dm', chat_id: job.id };
@@ -819,6 +820,42 @@ function launchFire(state, profile, job, fire, prompt, now, effects) {
   effects.push({ type: 'save' });
 }
 
+/**
+ * `attach_to_session`: the fire is a turn in the live session of the conversation it delivers to, taken the way an
+ * inbound message there is: it steers the running turn where the worker takes input mid-turn, waits behind it
+ * otherwise, and reopens the conversation's own session when its worker is gone. The conversation's reply is the
+ * delivery, so the fire is done once it is handed over. False (a session of its own) when that conversation has
+ * no live binding.
+ */
+function attachFire(state, profile, job, fire, prompt, now, effects) {
+  const target = resolveTarget(job, profile);
+  if (!target?.platform) return false;
+  const found = Object.entries(profile.bindings).find(([ks, b]) => !b.ended_at && !ks.includes('#')
+    && b.key.platform === target.platform && String(b.key.chat_id ?? '') === String(target.chat_id ?? '')
+    && String(b.key.thread_id ?? '') === String(target.thread_id ?? ''));
+  if (!found) return false;
+  const [keyString, binding] = found;
+  const rt = ensureRuntime(state);
+  const lid = leaseId(profile.name, keyString);
+  if (!rt.leases[lid] && !rt.turns[lid] && !rt.starting[lid]) {
+    if (binding.worker.session_id) binding.residue.resume_runtime_id ??= binding.residue.runtime_id ?? binding.worker.session_id;
+    startWorker(state, profile, keyString, effects);
+  }
+  binding.last_activity_at = now;
+  const text = `[scheduled: ${job.name ?? job.id}] ${prompt}`;
+  if (rt.turns[lid] && rt.leases[lid]?.steer) effects.push({ type: 'steer_input', profile: profile.name, keyString, text });
+  else if (rt.turns[lid] || !rt.leases[lid]) (rt.queues[lid] ??= []).push({ text, at: now, job_id: job.id });
+  else {
+    rt.turns[lid] = { started_at: now, buffer: '' };
+    effects.push({ type: 'send_input', profile: profile.name, keyString, text });
+  }
+  fire.started_at = now;
+  fire.residue = { ...(fire.residue ?? {}), attached_to: keyString };
+  finishFire(profile, fire, job, 'succeeded', now, null, effects);
+  effects.push({ type: 'save' });
+  return true;
+}
+
 function retryObligations(state, profile, now, effects) {
   const rt = ensureRuntime(state);
   const t = Date.parse(now);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "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/reducer.mjs

@@ -228,7 +228,7 @@ function handleInbound(state, ev, effects) {
  * a burst of messages before the lease exists queues behind ONE start (the
  * `started`/`error` worker events clear the mark).
  */
-function startWorker(state, profile, keyString, effects) {
+export function startWorker(state, profile, keyString, effects) {
   const rt = ensureRuntime(state);
   rt.starting[leaseId(profile.name, keyString)] = true;
   // A binding whose runtime went away with the daemon reopens that same session where its harness can, so the

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(/\/$/, '');