@scp-dev/core 0.1.4 → 0.1.5

package/dist/index.d.ts

@@ -346,7 +346,7 @@ declare const LIMITS: {
     readonly hookEndedGraceS: 30;
     readonly restartGraceS: 60;
     readonly injectMessages: 5;
-    readonly injectBytes: 4096;
+    readonly injectBytes: 7168;
     readonly pushBytes: 20480;
     /** the stops a session's push may continue between two prompts */
     readonly pushes: 20;
@@ -422,6 +422,12 @@ declare const MESSAGE_KINDS: readonly MessageKind[];
 declare const STATUS_STATES: readonly StatusState[];
 declare function validHandle(handle: string): boolean;
 declare function validHarness(harness: string): boolean;
+/** harness names of the path a claim came by (a bare CLI, hook or MCP shim), not of the agent behind it */
+declare const GENERIC_HARNESSES: ReadonlySet<string>;
+/** whether a claim of harness `claimed` may take a row of harness `held`: the same harness, or a generic row, which heals to the claim's */
+declare function harnessFits(held: string | null, claimed: string): boolean;
+/** the harness a claimed row keeps: the claim's, except that a generic claim never replaces a known harness */
+declare function keptHarness(held: string | null, claimed: string): string;
 interface Claim {
     handle?: string;
     harness?: string;
@@ -2492,4 +2498,4 @@ declare function sha256Hex(text: string): string;
 /** the UTF-8 byte length of text, the unit every byte limit counts in */
 declare function utf8Bytes(text: string): number;
 
-export { ACCOUNT_HANDLE, ACTIVITY_KINDS, type ActivityKind, type ActivityRow, type Admission, type AskResult, type Attachment, type AuditRow, BROKER_CAPABILITIES, type BreakerAdmission, CAPABILITIES, CLI_NAME, type Claim, type CoreOptions, type CrossAccountGate, type CrossAccountLink, DEFAULT_IMPLEMENTATION_PREFIXES, DEFAULT_JUDGE_BUDGET, DEFAULT_JUDGE_EFFORT, type DataClass, ERROR_CODES, type EndpointKind, type EndpointRow, type EndpointView, type Envelope, type ErrorCode, FakeJudgeClient, GONE_PREFIX, GROUP_NAME, type GateContext, type GateVerdict, HANDBACK_CUT, HUMAN_HANDLE, HttpJudgeClient, type HttpJudgeOptions, JUDGE_BREAKER_DEFAULTS, JUDGE_CATEGORIES, JUDGE_EFFORTS, JUDGE_FALLBACK_NOTE, JUDGE_MAX_OUTPUT_TOKENS, JUDGE_PROMPT_VERSION, JUDGE_PROVIDERS, JUDGE_VERDICTS, type JudgeAuditDetail, type JudgeAuditEvent, type JudgeBoundary, JudgeBreaker, type JudgeBreakerOptions, type JudgeBudget, type JudgeCategory, type JudgeClient, type JudgeContext, type JudgeEffort, type JudgeHeld, type JudgeModelConfig, type JudgePolicy, type JudgeProvider, JudgeProviderError, type JudgeRedacted, type JudgeSide, type JudgeStats, type JudgeVerdict, LIMITS, MESSAGE_KINDS, type MessageKind, type MessageReceipts, type MessageRow, OMITTED, PASS_GATE, PEEK, PREAMBLE, PREAMBLE_BRIEF, PRESET_LISTS, PROTOCOL, type PeekLevel, type PeekResult, type PeekSeen, type PeekState, type PeekTurn, type PeerView, type PiiHit, type Policy, type PolicyDefaults, type PolicyGroup, type PolicyRule, type PolicySubject, type Prefiltered, type Presence, REDACTION_KINDS, type Reach, type Redaction, RelayCore, RelayError, type RunJudgeInput, SCOPE_PRESETS, SERVER_FIELDS, SHORT_ID, STATUS_STATES, SYSTEM_HANDLE, type ScopeActor, type ScopeCap, type ScopeCaps, type ScopeChange, type ScopeDecision, type ScopeDirection, type ScopeEntry, type ScopeGroupIdentity, type ScopeGroupRules, type ScopeList, type ScopeNode, type ScopePolicyCap, type ScopePreset, type ScopeRules, type ScopeSubject, type ScopeView, type ScopeWorld, type SecretScanner, type Selector, type SendParams, type SendResult, type Sql, type SqlValue, type StatusState, type StopNudge, type StopWaitResult, TITLE_CHARS, type ThreadMessage, type Verdict, VerdictCache, WAKES, type Wake, type WhyResult, type XAllow, type XContact, XCounters, type XDelivered, type XEnvelopeFrom, XLIMITS, type XLimitConfig, type XLimits, type XListed, type XMessage, type XRelease, admits, allowlisted, applyRedactions, canonicalPolicy, cleanLabels, cleanText, clip, clipPasses, clipped, clock, collapseTools, createSecretScanner, crossFleet, dayStart, declaredLimits, deliveryText, digestText, dropQuoted, effectiveSelector, expandRules, findPii, findSecret, gateRefusal, groupCapKey, handbackOutput, hasScope, honestSender, isLeaving, joinRedacted, judgeBoundary, judgeDetailForAgents, judgeFellBack, judgeModel, judgePrompt, keepLast, leavesFleet, matches, mergeVerdicts, narrower, newId, newJudgeStats, one, parseJudgePolicy, parsePolicy, parseVerdict, parseXMessage, peekLevel, policyRefusal, prefilter, presenceText, presetOf, randomHex, reachLines, readText, receiptLines, redactPii, redactSecrets, redactionKind, relation, relationText, replyGrant, runJudge, sameSecret, scopeDecision, scopeLists, seqList, setImplementationPrefixes, sha256Hex, shortId, steerNote, stripControl, stripRelaySpans, stripSteerNote, unreachable, untilTomorrow, utf8Bytes, validHandle, validHarness, validSelector, wakeText, widenText, wrapMessage, wrapPeek, xlimits };
+export { ACCOUNT_HANDLE, ACTIVITY_KINDS, type ActivityKind, type ActivityRow, type Admission, type AskResult, type Attachment, type AuditRow, BROKER_CAPABILITIES, type BreakerAdmission, CAPABILITIES, CLI_NAME, type Claim, type CoreOptions, type CrossAccountGate, type CrossAccountLink, DEFAULT_IMPLEMENTATION_PREFIXES, DEFAULT_JUDGE_BUDGET, DEFAULT_JUDGE_EFFORT, type DataClass, ERROR_CODES, type EndpointKind, type EndpointRow, type EndpointView, type Envelope, type ErrorCode, FakeJudgeClient, GENERIC_HARNESSES, GONE_PREFIX, GROUP_NAME, type GateContext, type GateVerdict, HANDBACK_CUT, HUMAN_HANDLE, HttpJudgeClient, type HttpJudgeOptions, JUDGE_BREAKER_DEFAULTS, JUDGE_CATEGORIES, JUDGE_EFFORTS, JUDGE_FALLBACK_NOTE, JUDGE_MAX_OUTPUT_TOKENS, JUDGE_PROMPT_VERSION, JUDGE_PROVIDERS, JUDGE_VERDICTS, type JudgeAuditDetail, type JudgeAuditEvent, type JudgeBoundary, JudgeBreaker, type JudgeBreakerOptions, type JudgeBudget, type JudgeCategory, type JudgeClient, type JudgeContext, type JudgeEffort, type JudgeHeld, type JudgeModelConfig, type JudgePolicy, type JudgeProvider, JudgeProviderError, type JudgeRedacted, type JudgeSide, type JudgeStats, type JudgeVerdict, LIMITS, MESSAGE_KINDS, type MessageKind, type MessageReceipts, type MessageRow, OMITTED, PASS_GATE, PEEK, PREAMBLE, PREAMBLE_BRIEF, PRESET_LISTS, PROTOCOL, type PeekLevel, type PeekResult, type PeekSeen, type PeekState, type PeekTurn, type PeerView, type PiiHit, type Policy, type PolicyDefaults, type PolicyGroup, type PolicyRule, type PolicySubject, type Prefiltered, type Presence, REDACTION_KINDS, type Reach, type Redaction, RelayCore, RelayError, type RunJudgeInput, SCOPE_PRESETS, SERVER_FIELDS, SHORT_ID, STATUS_STATES, SYSTEM_HANDLE, type ScopeActor, type ScopeCap, type ScopeCaps, type ScopeChange, type ScopeDecision, type ScopeDirection, type ScopeEntry, type ScopeGroupIdentity, type ScopeGroupRules, type ScopeList, type ScopeNode, type ScopePolicyCap, type ScopePreset, type ScopeRules, type ScopeSubject, type ScopeView, type ScopeWorld, type SecretScanner, type Selector, type SendParams, type SendResult, type Sql, type SqlValue, type StatusState, type StopNudge, type StopWaitResult, TITLE_CHARS, type ThreadMessage, type Verdict, VerdictCache, WAKES, type Wake, type WhyResult, type XAllow, type XContact, XCounters, type XDelivered, type XEnvelopeFrom, XLIMITS, type XLimitConfig, type XLimits, type XListed, type XMessage, type XRelease, admits, allowlisted, applyRedactions, canonicalPolicy, cleanLabels, cleanText, clip, clipPasses, clipped, clock, collapseTools, createSecretScanner, crossFleet, dayStart, declaredLimits, deliveryText, digestText, dropQuoted, effectiveSelector, expandRules, findPii, findSecret, gateRefusal, groupCapKey, handbackOutput, harnessFits, hasScope, honestSender, isLeaving, joinRedacted, judgeBoundary, judgeDetailForAgents, judgeFellBack, judgeModel, judgePrompt, keepLast, keptHarness, leavesFleet, matches, mergeVerdicts, narrower, newId, newJudgeStats, one, parseJudgePolicy, parsePolicy, parseVerdict, parseXMessage, peekLevel, policyRefusal, prefilter, presenceText, presetOf, randomHex, reachLines, readText, receiptLines, redactPii, redactSecrets, redactionKind, relation, relationText, replyGrant, runJudge, sameSecret, scopeDecision, scopeLists, seqList, setImplementationPrefixes, sha256Hex, shortId, steerNote, stripControl, stripRelaySpans, stripSteerNote, unreachable, untilTomorrow, utf8Bytes, validHandle, validHarness, validSelector, wakeText, widenText, wrapMessage, wrapPeek, xlimits };

package/dist/index.js

@@ -126,7 +126,7 @@ var LIMITS = {
   hookEndedGraceS: 30,
   restartGraceS: 60,
   injectMessages: 5,
-  injectBytes: 4096,
+  injectBytes: 7168,
   pushBytes: 20480,
   /** the stops a session's push may continue between two prompts */
   pushes: 20,
@@ -192,6 +192,14 @@ function validHandle(handle) {
 function validHarness(harness) {
   return HARNESS.test(harness);
 }
+var GENERIC_HARNESSES = /* @__PURE__ */ new Set(["cli", "hook", "mcp", "shell"]);
+var generic = (harness) => harness === null || GENERIC_HARNESSES.has(harness);
+function harnessFits(held, claimed) {
+  return held === claimed || generic(held);
+}
+function keptHarness(held, claimed) {
+  return generic(claimed) && !generic(held) ? held : claimed;
+}
 var SCOPE_PRESETS = ["open", "tree", "parent", "none"];
 var SERVER_FIELDS = ["from", "id", "seq", "hop", "created_at", "auth", "expires_at", "relation"];
 
@@ -1086,6 +1094,7 @@ function utf8Bytes(text) {
 }
 
 // src/core.ts
+var GENERIC_SQL = `harness IN (${[...GENERIC_HARNESSES].map((h) => `'${h}'`).join(", ")})`;
 var HUMAN_HANDLE = "_human";
 var TITLE_CHARS = 64;
 var SYSTEM_HANDLE = "_relay";
@@ -1595,7 +1604,7 @@ var RelayCore = class {
     const bare = transient && fields.session !== null && BARE_PID_KEY.test(fields.session);
     let row = fields.session ? one(
       this.sql,
-      `SELECT * FROM endpoints WHERE kind = 'agent' AND harness = ?
+      `SELECT * FROM endpoints WHERE kind = 'agent' AND (harness = ? OR ${GENERIC_SQL})
            AND (session = ? OR (? = 1 AND substr(session, 1, ?) = ? AND (connections = 0 OR hook_seen >= ?)))
            AND substr(handle, 1, ${GONE_PREFIX.length}) != '${GONE_PREFIX}' ORDER BY COALESCE(last_seen, created_at) DESC LIMIT 1`,
       harness,
@@ -1624,7 +1633,7 @@ var RelayCore = class {
         if (!held) {
           this.sql.all(`UPDATE endpoints SET handle = ? WHERE id = ?`, handle, hooks.id);
           settled = true;
-        } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && held.harness === harness) {
+        } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && harnessFits(held.harness, harness)) {
           if (this.restarts(held, this.placement(scope, now).parent, fields.process) || this.redeems(held, scope, { harness, ...fields })) {
             ;
             ({ moved, stopBlocks } = this.leaveHooks(hooks, held.id));
@@ -1654,12 +1663,12 @@ var RelayCore = class {
         this.sql.all(`INSERT INTO endpoints (id, handle, kind, harness, labels, created_at) VALUES (?, ?, 'agent', ?, '{}', ?)`, id, handle, harness, now);
         row = this.byId(id);
         created = true;
-      } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && held.harness === harness && held.id !== scope.subagent?.root && !(scope.subagent && held.session?.startsWith("sub:") && held.session !== fields.session)) {
+      } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && harnessFits(held.harness, harness) && held.id !== scope.subagent?.root && !(scope.subagent && held.session?.startsWith("sub:") && held.session !== fields.session)) {
         own = transient && held.process !== null && fields.process !== null && sameHarness(held.process, fields.process);
         const ended = held.hook_ended !== null || (held.last_seen ?? held.created_at) < now - LIMITS.restartGraceS * 1e3;
         if ((!transient || own || ended) && (this.restarts(held, this.placement(scope, now).parent, fields.process) || this.redeems(held, scope, { harness, ...fields })))
           row = held;
-      } else if (scope.exact && held.kind === "agent" && held.process === null && held.session === null && held.harness === harness && this.restarts(held, this.placement(scope, now).parent, null)) {
+      } else if (scope.exact && held.kind === "agent" && held.process === null && held.session === null && harnessFits(held.harness, harness) && this.restarts(held, this.placement(scope, now).parent, null)) {
         row = held;
         joined = true;
         live = presenceOf(held, now) !== "offline";
@@ -1684,7 +1693,7 @@ var RelayCore = class {
        stop_blocks = CASE WHEN ? IS NOT NULL THEN ? WHEN ? IS NOT NULL AND session IS NOT ? THEN 0 ELSE stop_blocks END,
        briefed = CASE WHEN ? IS NOT NULL AND session IS NOT ? THEN NULL ELSE briefed END, introduced = CASE WHEN ? IS NOT NULL AND session IS NOT ? THEN NULL ELSE introduced END,
        directive_holds = CASE WHEN ? IS NOT NULL AND session IS NOT ? THEN NULL ELSE directive_holds END WHERE id = ?`,
-      harness,
+      keptHarness(row.harness, harness),
       fields.model,
       fields.cwd,
       fields.parent,
@@ -1813,7 +1822,7 @@ var RelayCore = class {
     if ((held.session !== null || held.process !== null) && presenceOf(held, now) !== "offline") {
       return new RelayError("unauthorized", `${handle} is held by a live ${held.harness} session: act as it from that session's own shell, no --as needed`);
     }
-    if (held.harness !== harness) return new RelayError("unauthorized", `${handle} is a ${held.harness} endpoint: pass --harness ${held.harness}`);
+    if (!harnessFits(held.harness, harness)) return new RelayError("unauthorized", `${handle} is a ${held.harness} endpoint: pass --harness ${held.harness}`);
     return new RelayError("unauthorized", `${handle} is placed in another tree or under another parent than this shell`);
   }
   /**
@@ -1875,7 +1884,7 @@ var RelayCore = class {
     const spent = this.spentGrant(scope);
     if (spent?.used_by !== row.id) return false;
     const lineage = this.lineageParent(scope.lineage);
-    if (!lineage) return row.harness === claimant.harness && spent.spent_cwd !== null && spent.spent_cwd === claimant.cwd;
+    if (!lineage) return harnessFits(row.harness, claimant.harness) && spent.spent_cwd !== null && spent.spent_cwd === claimant.cwd;
     return this.restarts(row, lineage, claimant.process) || this.ancestorsOf(row).includes(lineage.id);
   }
   /** the claim's grant, when an endpoint spent it */
@@ -6387,6 +6396,7 @@ export {
   DEFAULT_JUDGE_EFFORT,
   ERROR_CODES,
   FakeJudgeClient,
+  GENERIC_HARNESSES,
   GONE_PREFIX,
   GROUP_NAME,
   HANDBACK_CUT,
@@ -6449,6 +6459,7 @@ export {
   gateRefusal,
   groupCapKey,
   handbackOutput,
+  harnessFits,
   hasScope,
   honestSender,
   isLeaving,
@@ -6459,6 +6470,7 @@ export {
   judgeModel,
   judgePrompt,
   keepLast,
+  keptHarness,
   leavesFleet,
   matches,
   mergeVerdicts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/core",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Swarm Communication Protocol core: wire types, framing, scopes, policy, judge and the relay core.",
   "license": "Apache-2.0",
   "homepage": "https://scp.dev",

package/src/core.ts

@@ -38,6 +38,9 @@ import {
   type StopNudge,
   type StopWaitResult,
   type ThreadMessage,
+  GENERIC_HARNESSES,
+  harnessFits,
+  keptHarness,
   validHandle,
   validHarness,
   type Wake,
@@ -70,6 +73,8 @@ import { findSecret, redactSecrets } from "./scrub"
 import { one, type Sql, type SqlValue } from "./sql"
 import { utf8Bytes } from "./utf8"
 
+const GENERIC_SQL = `harness IN (${[...GENERIC_HARNESSES].map((h) => `'${h}'`).join(", ")})`
+
 export const HUMAN_HANDLE = "_human"
 /** an agent title's length cap */
 export const TITLE_CHARS = 64
@@ -811,7 +816,7 @@ export class RelayCore {
     let row = fields.session
       ? one<EndpointRow>(
           this.sql,
-          `SELECT * FROM endpoints WHERE kind = 'agent' AND harness = ?
+          `SELECT * FROM endpoints WHERE kind = 'agent' AND (harness = ? OR ${GENERIC_SQL})
            AND (session = ? OR (? = 1 AND substr(session, 1, ?) = ? AND (connections = 0 OR hook_seen >= ?)))
            AND substr(handle, 1, ${GONE_PREFIX.length}) != '${GONE_PREFIX}' ORDER BY COALESCE(last_seen, created_at) DESC LIMIT 1`,
           harness,
@@ -848,7 +853,7 @@ export class RelayCore {
         if (!held) {
           this.sql.all(`UPDATE endpoints SET handle = ? WHERE id = ?`, handle, hooks.id)
           settled = true
-        } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && held.harness === harness) {
+        } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && harnessFits(held.harness, harness)) {
           if (this.restarts(held, this.placement(scope, now).parent, fields.process) || this.redeems(held, scope, { harness, ...fields })) {
             ;({ moved, stopBlocks } = this.leaveHooks(hooks, held.id))
             row = undefined
@@ -881,7 +886,7 @@ export class RelayCore {
         held.kind === "agent" &&
         held.connections === 0 &&
         presenceOf(held, now) === "offline" &&
-        held.harness === harness &&
+        harnessFits(held.harness, harness) &&
         held.id !== scope.subagent?.root &&
         !(scope.subagent && held.session?.startsWith("sub:") && held.session !== fields.session)
       ) {
@@ -897,7 +902,7 @@ export class RelayCore {
         held.kind === "agent" &&
         held.process === null &&
         held.session === null &&
-        held.harness === harness &&
+        harnessFits(held.harness, harness) &&
         this.restarts(held, this.placement(scope, now).parent, null)
       ) {
         row = held
@@ -924,7 +929,7 @@ export class RelayCore {
        stop_blocks = CASE WHEN ? IS NOT NULL THEN ? WHEN ? IS NOT NULL AND session IS NOT ? THEN 0 ELSE stop_blocks END,
        briefed = CASE WHEN ? IS NOT NULL AND session IS NOT ? THEN NULL ELSE briefed END, introduced = CASE WHEN ? IS NOT NULL AND session IS NOT ? THEN NULL ELSE introduced END,
        directive_holds = CASE WHEN ? IS NOT NULL AND session IS NOT ? THEN NULL ELSE directive_holds END WHERE id = ?`,
-      harness,
+      keptHarness(row.harness, harness),
       fields.model,
       fields.cwd,
       fields.parent,
@@ -1062,7 +1067,7 @@ export class RelayCore {
     if ((held.session !== null || held.process !== null) && presenceOf(held, now) !== "offline") {
       return new RelayError("unauthorized", `${handle} is held by a live ${held.harness} session: act as it from that session's own shell, no --as needed`)
     }
-    if (held.harness !== harness) return new RelayError("unauthorized", `${handle} is a ${held.harness} endpoint: pass --harness ${held.harness}`)
+    if (!harnessFits(held.harness, harness)) return new RelayError("unauthorized", `${handle} is a ${held.harness} endpoint: pass --harness ${held.harness}`)
     return new RelayError("unauthorized", `${handle} is placed in another tree or under another parent than this shell`)
   }
 
@@ -1132,7 +1137,7 @@ export class RelayCore {
     const spent = this.spentGrant(scope)
     if (spent?.used_by !== row.id) return false
     const lineage = this.lineageParent(scope.lineage)
-    if (!lineage) return row.harness === claimant.harness && spent.spent_cwd !== null && spent.spent_cwd === claimant.cwd
+    if (!lineage) return harnessFits(row.harness, claimant.harness) && spent.spent_cwd !== null && spent.spent_cwd === claimant.cwd
     return this.restarts(row, lineage, claimant.process) || this.ancestorsOf(row).includes(lineage.id)
   }
 

package/src/protocol.ts

@@ -34,7 +34,7 @@ export const LIMITS = {
   hookEndedGraceS: 30,
   restartGraceS: 60,
   injectMessages: 5,
-  injectBytes: 4096,
+  injectBytes: 7168,
   pushBytes: 20480,
   /** the stops a session's push may continue between two prompts */
   pushes: 20,
@@ -144,6 +144,21 @@ export function validHarness(harness: string): boolean {
   return HARNESS.test(harness)
 }
 
+/** harness names of the path a claim came by (a bare CLI, hook or MCP shim), not of the agent behind it */
+export const GENERIC_HARNESSES: ReadonlySet<string> = new Set(["cli", "hook", "mcp", "shell"])
+
+const generic = (harness: string | null): boolean => harness === null || GENERIC_HARNESSES.has(harness)
+
+/** whether a claim of harness `claimed` may take a row of harness `held`: the same harness, or a generic row, which heals to the claim's */
+export function harnessFits(held: string | null, claimed: string): boolean {
+  return held === claimed || generic(held)
+}
+
+/** the harness a claimed row keeps: the claim's, except that a generic claim never replaces a known harness */
+export function keptHarness(held: string | null, claimed: string): string {
+  return generic(claimed) && !generic(held) ? held! : claimed
+}
+
 export interface Claim {
   handle?: string
   harness?: string