smol-symphony 0.4.3 → 0.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/WORKFLOW.template.yaml +17 -11
- package/dist/core/credential/extract.js +31 -2
- package/dist/core/credential/extract.js.map +1 -1
- package/dist/shell/main-credential.js +6 -4
- package/dist/shell/main-credential.js.map +1 -1
- package/dist/shell/main-runner-dispatch.js +28 -6
- package/dist/shell/main-runner-dispatch.js.map +1 -1
- package/dist/shell/main-runner.js +15 -11
- package/dist/shell/main-runner.js.map +1 -1
- package/package.json +1 -1
package/WORKFLOW.template.yaml
CHANGED
|
@@ -791,9 +791,10 @@ acp:
|
|
|
791
791
|
# client (and pi-acp ignores the ACP mcpServers descriptor), symphony also
|
|
792
792
|
# stages a per-dispatch extension at ~/.pi/agent/extensions/symphony-mcp.ts
|
|
793
793
|
# that bridges the symphony tools (transition / request_human_steering /
|
|
794
|
-
# propose_issue) to the MCP endpoint.
|
|
795
|
-
#
|
|
796
|
-
#
|
|
794
|
+
# propose_issue) to the MCP endpoint. The Copilot segment host
|
|
795
|
+
# (individual/business/enterprise) is auto-derived per dispatch from the
|
|
796
|
+
# token's proxy-ep field; `acp.copilot_host` (below) overrides it for the
|
|
797
|
+
# cases auto-derivation cannot cover.
|
|
797
798
|
|
|
798
799
|
# model (string | null): optional model selector forwarded to the chosen adapter.
|
|
799
800
|
# Each adapter profile knows how to surface it natively:
|
|
@@ -825,14 +826,19 @@ acp:
|
|
|
825
826
|
# Leave unset / null for the adapter's own default. Default: null.
|
|
826
827
|
# effort: xhigh
|
|
827
828
|
|
|
828
|
-
# copilot_host (string, pi only): the GitHub Copilot API
|
|
829
|
-
#
|
|
830
|
-
#
|
|
831
|
-
#
|
|
832
|
-
#
|
|
833
|
-
#
|
|
834
|
-
#
|
|
835
|
-
#
|
|
829
|
+
# copilot_host (string, pi only): EXPLICIT OVERRIDE of the GitHub Copilot API
|
|
830
|
+
# host. Normally you never set this: the Copilot API is segment-bound per plan
|
|
831
|
+
# (individual/business/enterprise — a token is answered ONLY by its own
|
|
832
|
+
# api.<segment>.githubcopilot.com; every other authority returns 421
|
|
833
|
+
# Misdirected Request), and symphony AUTO-DERIVES the segment per dispatch
|
|
834
|
+
# from the host token's own proxy-ep field. The derived (or overridden) host
|
|
835
|
+
# scopes BOTH the egress token substitution AND the staged pi models.json
|
|
836
|
+
# baseUrl the in-VM pi dials. Set this only when auto-derivation cannot work —
|
|
837
|
+
# e.g. a GitHub Enterprise Server flavor (copilot-api.<your-domain>) or a
|
|
838
|
+
# COPILOT_GITHUB_TOKEN env credential without a proxy-ep field. A pasted URL
|
|
839
|
+
# is normalized to its host; a malformed value fails the workflow parse.
|
|
840
|
+
# Default: auto-derived from the token; falls back to api.individual.githubcopilot.com
|
|
841
|
+
# copilot_host: copilot-api.ghe.example.com
|
|
836
842
|
|
|
837
843
|
# NOTE: the launch shape is fixed (an in-VM agent dials back the `/acp` WebSocket
|
|
838
844
|
# and spawns the chosen adapter). Customizing what the agent spawns requires
|
|
@@ -113,7 +113,11 @@ export function extractPiToken(parsed) {
|
|
|
113
113
|
const access = nonEmptyString(rec['access']);
|
|
114
114
|
if (access === null)
|
|
115
115
|
return null;
|
|
116
|
-
return {
|
|
116
|
+
return {
|
|
117
|
+
accessToken: access,
|
|
118
|
+
expiresAtMs: coerceExpiresAtMs(rec['expires']),
|
|
119
|
+
copilotApiHost: deriveCopilotApiHost(access),
|
|
120
|
+
};
|
|
117
121
|
}
|
|
118
122
|
/**
|
|
119
123
|
* Pure: read `COPILOT_GITHUB_TOKEN` from a host-environment snapshot as a pi
|
|
@@ -123,7 +127,32 @@ export function extractPiToken(parsed) {
|
|
|
123
127
|
*/
|
|
124
128
|
export function piEnvFallback(env) {
|
|
125
129
|
const token = nonEmptyString(env['COPILOT_GITHUB_TOKEN']);
|
|
126
|
-
|
|
130
|
+
if (token === null)
|
|
131
|
+
return null;
|
|
132
|
+
return { accessToken: token, expiresAtMs: null, copilotApiHost: deriveCopilotApiHost(token) };
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Derive the Copilot API host a Copilot access token is segment-bound to. The
|
|
136
|
+
* token is a `k=v;k=v;…` record whose `proxy-ep` field names the only authority
|
|
137
|
+
* GitHub will answer for it (`proxy.<segment>.githubcopilot.com`; everything
|
|
138
|
+
* else returns 421 Misdirected Request). Mirrors pi's own derivation:
|
|
139
|
+
* `proxy.` → `api.` on the same domain.
|
|
140
|
+
*
|
|
141
|
+
* SECURITY: the host is GUARDED to `api.<segment>.githubcopilot.com` — this
|
|
142
|
+
* value widens the egress token-substitution scope, so a tampered/garbled
|
|
143
|
+
* auth.json must never be able to steer the real token toward an arbitrary
|
|
144
|
+
* host. A non-matching proxy-ep (incl. GHE's `copilot-api.<domain>` flavor)
|
|
145
|
+
* derives null; the explicit `acp.copilot_host` override covers those.
|
|
146
|
+
*/
|
|
147
|
+
export function deriveCopilotApiHost(accessToken) {
|
|
148
|
+
for (const field of accessToken.split(';')) {
|
|
149
|
+
if (!field.startsWith('proxy-ep='))
|
|
150
|
+
continue;
|
|
151
|
+
const ep = field.slice('proxy-ep='.length).trim();
|
|
152
|
+
const m = /^proxy\.([a-z0-9-]+)\.githubcopilot\.com$/i.exec(ep);
|
|
153
|
+
return m === null ? null : `api.${m[1].toLowerCase()}.githubcopilot.com`;
|
|
154
|
+
}
|
|
155
|
+
return null;
|
|
127
156
|
}
|
|
128
157
|
// ── JWT / expiry coercion ───────────────────────────────────────────────────────
|
|
129
158
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../src/core/credential/extract.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../src/core/credential/extract.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,10 +94,12 @@ export function buildCredentialSubstrate(input) {
|
|
|
94
94
|
// reports whether a fresh token landed (false ⇒ genuine auth failure → end attempt).
|
|
95
95
|
refreshCredential: (adapter) => registry.refreshAdapter(adapter),
|
|
96
96
|
buildPerVmHooks,
|
|
97
|
-
buildAdapterSpec: (adapter, accountId = null) => input.core.buildAdapterCredentialSpecWithPlaceholder(adapter, input.random, accountId, {
|
|
98
|
-
// pi: the Copilot segment host
|
|
99
|
-
//
|
|
100
|
-
|
|
97
|
+
buildAdapterSpec: (adapter, accountId = null, piUpstreamHost = null) => input.core.buildAdapterCredentialSpecWithPlaceholder(adapter, input.random, accountId, {
|
|
98
|
+
// pi: the Copilot segment host scopes the token substitution; the runner
|
|
99
|
+
// passes the per-dispatch resolved host (explicit acp.copilot_host override
|
|
100
|
+
// or the token-derived segment), falling back to the live cfg value.
|
|
101
|
+
// Ignored by the claude/codex spec arms.
|
|
102
|
+
piUpstreamHost: piUpstreamHost ?? input.piUpstreamHost(),
|
|
101
103
|
}),
|
|
102
104
|
buildHooksConfig: (specs, egressAllowlist) => input.core.buildAdapterHooksConfig(specs, egressAllowlist),
|
|
103
105
|
buildFakeCreds: (fakeInput) => input.core.buildGondolinFakeCreds(fakeInput),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-credential.js","sourceRoot":"","sources":["../../src/shell/main-credential.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main-credential.js","sourceRoot":"","sources":["../../src/shell/main-credential.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,43 @@
|
|
|
1
1
|
// Per-dispatch helpers sliced out of src/shell/main-runner.ts (kind: shell
|
|
2
2
|
// helper) to keep the runner slice under the max-lines budget. Same import
|
|
3
3
|
// rules as the parent: src/types + siblings only (no core).
|
|
4
|
+
/** The default (individual-segment) Copilot host — mirrors core PI_UPSTREAM_HOST
|
|
5
|
+
* (this shell sibling may not import core; the literal is pinned by tests). */
|
|
6
|
+
const PI_DEFAULT_COPILOT_HOST = 'api.individual.githubcopilot.com';
|
|
4
7
|
/**
|
|
5
|
-
* Per-adapter
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
8
|
+
* Per-adapter dispatch routing. pi-acp advertises no MCP transport caps and
|
|
9
|
+
* IGNORES session/new mcpServers (advertising the http server would fail the
|
|
10
|
+
* assertMcpSupported init check), so a pi dispatch sends an EMPTY list over ACP
|
|
11
|
+
* and gets the SAME url+bearer staged as an in-guest extension (buildPiFiles)
|
|
9
12
|
* — one activateMcp descriptor feeds both, so the transports cannot diverge.
|
|
10
13
|
* Adapter resolution mirrors core resolveDispatchConfig (state override → acp).
|
|
14
|
+
*
|
|
15
|
+
* `piCopilotHost` is the EFFECTIVE Copilot API host for a pi dispatch — the
|
|
16
|
+
* Copilot API is segment-bound per plan (a token answered only by
|
|
17
|
+
* api.<segment>.githubcopilot.com; others 421) — resolved as:
|
|
18
|
+
* 1. an explicit non-default `acp.copilot_host` (operator override, e.g. GHE),
|
|
19
|
+
* 2. else the segment derived from the HOST token's own proxy-ep field
|
|
20
|
+
* (zero-config: the token names its authority),
|
|
21
|
+
* 3. else the individual-segment default.
|
|
22
|
+
* It scopes BOTH the egress token substitution and the staged guest models.json
|
|
23
|
+
* baseUrl. Always null for non-pi dispatches.
|
|
11
24
|
*/
|
|
12
|
-
export function
|
|
25
|
+
export async function deriveDispatchRouting(input, cfg, entry, mcpServers) {
|
|
13
26
|
const first = mcpServers[0];
|
|
14
27
|
const endpoint = first !== undefined && 'type' in first && first.type === 'http' && entry.mcp_token
|
|
15
28
|
? { url: first.url, token: entry.mcp_token }
|
|
16
29
|
: null;
|
|
17
30
|
const adapter = cfg.states[entry.issue.state]?.adapter ?? cfg.acp.adapter;
|
|
18
|
-
|
|
31
|
+
if (adapter !== 'pi')
|
|
32
|
+
return { endpoint, acpMcpServers: mcpServers, piCopilotHost: null };
|
|
33
|
+
return { endpoint, acpMcpServers: [], piCopilotHost: await resolvePiCopilotHost(input, cfg) };
|
|
34
|
+
}
|
|
35
|
+
async function resolvePiCopilotHost(input, cfg) {
|
|
36
|
+
const configured = cfg.acp.copilot_host;
|
|
37
|
+
if (configured !== PI_DEFAULT_COPILOT_HOST)
|
|
38
|
+
return configured; // explicit override wins
|
|
39
|
+
const token = await input.ports.credentialPort.probe('pi').catch(() => null);
|
|
40
|
+
return token?.copilotApiHost ?? configured;
|
|
19
41
|
}
|
|
20
42
|
/**
|
|
21
43
|
* Open (or reopen) the per-issue run log + stamp the attempt number. Routed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-runner-dispatch.js","sourceRoot":"","sources":["../../src/shell/main-runner-dispatch.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,2EAA2E;AAC3E,4DAA4D;AAQ5D
|
|
1
|
+
{"version":3,"file":"main-runner-dispatch.js","sourceRoot":"","sources":["../../src/shell/main-runner-dispatch.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,2EAA2E;AAC3E,4DAA4D;AAQ5D;gFACgF;AAChF,MAAM,uBAAuB,GAAG,kCAAkC,CAAC;AAEnE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAuB,EACvB,GAAkB,EAClB,KAAmB,EACnB,UAAuB;IAEvB,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,QAAQ,GACZ,KAAK,KAAK,SAAS,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,SAAS;QAChF,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE;QAC5C,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;IAC1E,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;IAC1F,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;AAChG,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,KAAuB,EAAE,GAAkB;IAC7E,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC;IACxC,IAAI,UAAU,KAAK,uBAAuB;QAAE,OAAO,UAAU,CAAC,CAAC,yBAAyB;IACxF,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC7E,OAAO,KAAK,EAAE,cAAc,IAAI,UAAU,CAAC;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,KAAuB,EAAE,KAAmB;IACnF,MAAM,KAAK,CAAC,KAAK,CAAC,WAAW;SAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;SAClG,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACb,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAChH,CAAC;IACJ,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;AAC1E,CAAC"}
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
// Core-free: imports src/types + sibling shell ONLY — every pure decider arrives
|
|
26
26
|
// injected via `input.core` (only the composition root imports core).
|
|
27
27
|
import os from 'node:os';
|
|
28
|
-
import {
|
|
28
|
+
import { deriveDispatchRouting, openDispatchRunLog } from './main-runner-dispatch.js';
|
|
29
29
|
import { resolveMountRealpath } from './interp/vm.js';
|
|
30
30
|
import { runAttempt } from './runner-loop.js';
|
|
31
31
|
import { createActionsRunner } from './actions-runner.js';
|
|
@@ -77,10 +77,10 @@ async function runOneDispatch(input, actions, plan, entry, cancel) {
|
|
|
77
77
|
// is built ONCE and memoized, then threaded through BOTH guest staging (→ buildVmPlan)
|
|
78
78
|
// AND the egress substitution hooks, so the guest placeholder and the substitution
|
|
79
79
|
// placeholder can never diverge. Keyed by adapter (one per dispatch in practice).
|
|
80
|
-
const
|
|
81
|
-
const
|
|
82
|
-
const credStager = buildCredStager(input, specFor,
|
|
83
|
-
const bringUp = buildBringUp(input, entry,
|
|
80
|
+
const routing = await deriveDispatchRouting(input, cfg, entry, mcpServers);
|
|
81
|
+
const specFor = buildDispatchSpec(input, routing.piCopilotHost);
|
|
82
|
+
const credStager = buildCredStager(input, specFor, routing);
|
|
83
|
+
const bringUp = buildBringUp(input, entry, routing.acpMcpServers, specFor, acpReg);
|
|
84
84
|
let outcome;
|
|
85
85
|
try {
|
|
86
86
|
const deps = buildRunnerDeps(input, credStager, actions, bringUp, cfg, acpReg.token);
|
|
@@ -109,13 +109,15 @@ async function runOneDispatch(input, actions, plan, entry, cancel) {
|
|
|
109
109
|
* substitution never matches the guest's bearer. This memoizes the spec per adapter
|
|
110
110
|
* for the dispatch so the SAME `AdapterCredentialSpec` is threaded everywhere.
|
|
111
111
|
*/
|
|
112
|
-
function buildDispatchSpec(input) {
|
|
112
|
+
function buildDispatchSpec(input, piCopilotHost) {
|
|
113
113
|
const cache = new Map();
|
|
114
114
|
return (adapter) => {
|
|
115
115
|
const hit = cache.get(adapter);
|
|
116
116
|
if (hit)
|
|
117
117
|
return hit;
|
|
118
|
-
|
|
118
|
+
// piCopilotHost = the dispatch-resolved segment host (deriveDispatchRouting);
|
|
119
|
+
// scopes the pi token substitution. Ignored by the claude/codex spec arms.
|
|
120
|
+
const spec = input.substrates.credential.buildAdapterSpec(adapter, null, piCopilotHost);
|
|
119
121
|
cache.set(adapter, spec);
|
|
120
122
|
return spec;
|
|
121
123
|
};
|
|
@@ -292,7 +294,7 @@ function buildEgress(input, adapterId, spec, token) {
|
|
|
292
294
|
* staged the placeholder-only fake creds keyed on the SAME `AdapterCredentialSpec`
|
|
293
295
|
* the egress hooks substitute (codex HIGH #4 — one spec, threaded everywhere).
|
|
294
296
|
*/
|
|
295
|
-
function buildCredStager(input, specFor,
|
|
297
|
+
function buildCredStager(input, specFor, routing) {
|
|
296
298
|
const { credential } = input.substrates;
|
|
297
299
|
return {
|
|
298
300
|
stageFakeCreds: async (adapter) => {
|
|
@@ -312,9 +314,11 @@ function buildCredStager(input, specFor, mcpEndpoint) {
|
|
|
312
314
|
claudeIdentity,
|
|
313
315
|
codexIdentity,
|
|
314
316
|
// Consumed only by the pi case (the staged symphony-mcp extension +
|
|
315
|
-
// the Copilot-segment models.json override).
|
|
316
|
-
|
|
317
|
-
|
|
317
|
+
// the Copilot-segment models.json override). The host is the SAME
|
|
318
|
+
// dispatch-resolved value the substitution spec uses (deriveDispatchRouting),
|
|
319
|
+
// so the guest dial target and the token scope cannot diverge.
|
|
320
|
+
mcp: routing.endpoint,
|
|
321
|
+
piCopilotHost: routing.piCopilotHost,
|
|
318
322
|
});
|
|
319
323
|
},
|
|
320
324
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-runner.js","sourceRoot":"","sources":["../../src/shell/main-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"main-runner.js","sourceRoot":"","sources":["../../src/shell/main-runner.ts"],"names":[],"mappings":"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"}
|