@memnexus-ai/mx-agent-cli 0.1.296-next.1 → 0.1.296-next.3
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/dist/__tests__/coordination-brief-pin.test.js +6 -2
- package/dist/__tests__/coordination-brief-pin.test.js.map +1 -1
- package/dist/__tests__/coordination-credential-endpoint.test.js +9 -7
- package/dist/__tests__/coordination-credential-endpoint.test.js.map +1 -1
- package/dist/__tests__/coordination-expected-team.test.d.ts +19 -0
- package/dist/__tests__/coordination-expected-team.test.d.ts.map +1 -0
- package/dist/__tests__/coordination-expected-team.test.js +423 -0
- package/dist/__tests__/coordination-expected-team.test.js.map +1 -0
- package/dist/__tests__/coordination-plain-shell-commands.test.js +494 -26
- package/dist/__tests__/coordination-plain-shell-commands.test.js.map +1 -1
- package/dist/__tests__/memory-log-result.test.js +36 -0
- package/dist/__tests__/memory-log-result.test.js.map +1 -1
- package/dist/__tests__/runtime-codex-adapter.test.js +33 -1
- package/dist/__tests__/runtime-codex-adapter.test.js.map +1 -1
- package/dist/__tests__/start-runtime-wiring.test.js +150 -2
- package/dist/__tests__/start-runtime-wiring.test.js.map +1 -1
- package/dist/__tests__/team-name-propagation.test.js +63 -0
- package/dist/__tests__/team-name-propagation.test.js.map +1 -1
- package/dist/__tests__/tracked-instruction-files.test.d.ts +21 -0
- package/dist/__tests__/tracked-instruction-files.test.d.ts.map +1 -0
- package/dist/__tests__/tracked-instruction-files.test.js +489 -0
- package/dist/__tests__/tracked-instruction-files.test.js.map +1 -0
- package/dist/__tests__/verify-hooks-check-all.test.js +12 -2
- package/dist/__tests__/verify-hooks-check-all.test.js.map +1 -1
- package/dist/agent-config/hooks/coordination-brief.sh +30 -6
- package/dist/commands/coordination.d.ts +36 -1
- package/dist/commands/coordination.d.ts.map +1 -1
- package/dist/commands/coordination.js +183 -10
- package/dist/commands/coordination.js.map +1 -1
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +3 -1
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/start.d.ts +28 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +68 -4
- package/dist/commands/start.js.map +1 -1
- package/dist/lib/agent-session.d.ts.map +1 -1
- package/dist/lib/agent-session.js +4 -0
- package/dist/lib/agent-session.js.map +1 -1
- package/dist/lib/claude.d.ts +25 -1
- package/dist/lib/claude.d.ts.map +1 -1
- package/dist/lib/claude.js +120 -25
- package/dist/lib/claude.js.map +1 -1
- package/dist/lib/coordination-worktree.d.ts +0 -26
- package/dist/lib/coordination-worktree.d.ts.map +1 -1
- package/dist/lib/coordination-worktree.js +61 -5
- package/dist/lib/coordination-worktree.js.map +1 -1
- package/dist/lib/instruction-files.d.ts +30 -0
- package/dist/lib/instruction-files.d.ts.map +1 -0
- package/dist/lib/instruction-files.js +45 -0
- package/dist/lib/instruction-files.js.map +1 -0
- package/dist/lib/memory.d.ts.map +1 -1
- package/dist/lib/memory.js +15 -3
- package/dist/lib/memory.js.map +1 -1
- package/dist/lib/runtime/codex-adapter.d.ts.map +1 -1
- package/dist/lib/runtime/codex-adapter.js +4 -0
- package/dist/lib/runtime/codex-adapter.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-hooks-check-all.test.js","sourceRoot":"","sources":["../../src/__tests__/verify-hooks-check-all.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"verify-hooks-check-all.test.js","sourceRoot":"","sources":["../../src/__tests__/verify-hooks-check-all.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,10 +48,16 @@
|
|
|
48
48
|
# then project config). A project with no URL configured now prints the
|
|
49
49
|
# could-not-run line below instead of silently briefing the wrong service.
|
|
50
50
|
#
|
|
51
|
-
# #
|
|
52
|
-
#
|
|
53
|
-
#
|
|
54
|
-
#
|
|
51
|
+
# MX_COORD_EXPECT_TEAM (#548, the fix #292 proposed). `mx-agent start <team>`
|
|
52
|
+
# exports the team it was asked to start as MX_COORD_EXPECT_TEAM into the
|
|
53
|
+
# session (lib/claude.ts, lib/agent-session.ts, lib/runtime/codex-adapter.ts).
|
|
54
|
+
# That value comes from the command line, not from the worktree, so this hook
|
|
55
|
+
# KEEPS an inherited, non-empty value and passes it to the CLI unchanged. The CLI
|
|
56
|
+
# compares it with the marker and refuses on a mismatch before it requests or
|
|
57
|
+
# reads any credential (expectedTeamRefusal, commands/coordination.ts). Only
|
|
58
|
+
# when no value is inherited does the hook derive one from the marker, which is
|
|
59
|
+
# the behaviour before #548: two values with one source, which cannot see a wrong
|
|
60
|
+
# marker. The hook still never reads CLAUDE_TEAM_NAME (MF-2, below).
|
|
55
61
|
#
|
|
56
62
|
# ── FAIL LOUD, ON THE CHANNEL THE MODEL READS ────────────────────────────────
|
|
57
63
|
# Every could-not-run outcome prints to STDOUT and exits 0.
|
|
@@ -134,6 +140,14 @@ fi
|
|
|
134
140
|
# The slug's VALIDITY is the CLI's to judge (coordination-token.ts:828 answers
|
|
135
141
|
# `misconfigured` for an invalid one). The hook does not re-implement the rule.
|
|
136
142
|
|
|
143
|
+
# #548: the launcher's expectation wins. Derived from the marker only when the
|
|
144
|
+
# session inherited none, so a launcher-set team is never replaced by the very
|
|
145
|
+
# file it exists to check.
|
|
146
|
+
EXPECT_TEAM="${MX_COORD_EXPECT_TEAM:-}"
|
|
147
|
+
if [ -z "$EXPECT_TEAM" ]; then
|
|
148
|
+
EXPECT_TEAM="$SLUG"
|
|
149
|
+
fi
|
|
150
|
+
|
|
137
151
|
# ── Run the brief. No token, no URL: the CLI resolves both. ──────────────────
|
|
138
152
|
# `env -u MX_COORD_SERVICE_TOKEN` is deliberate and is the whole point of #297.
|
|
139
153
|
# An inherited bearer in the session environment would short-circuit
|
|
@@ -157,7 +171,7 @@ if [ -z "$OUT_CAP" ] || [ -z "$ERR_CAP" ]; then
|
|
|
157
171
|
[ -n "$ERR_CAP" ] && rm -f "$ERR_CAP" 2>/dev/null || true
|
|
158
172
|
could_not_run "no-capture" "mktemp failed, so this hook cannot tell a rendered brief from a refusal; the brief below, if any, ran unclassified. Remedy: check free space and TMPDIR on this machine."
|
|
159
173
|
timeout "$TIMEOUT_SECS" \
|
|
160
|
-
env -u MX_COORD_SERVICE_TOKEN MX_COORD_EXPECT_TEAM="$
|
|
174
|
+
env -u MX_COORD_SERVICE_TOKEN MX_COORD_EXPECT_TEAM="$EXPECT_TEAM" \
|
|
161
175
|
mx-agent coordination brief 2>/dev/null || true
|
|
162
176
|
exit 0
|
|
163
177
|
fi
|
|
@@ -166,7 +180,7 @@ trap cleanup EXIT
|
|
|
166
180
|
|
|
167
181
|
status=0
|
|
168
182
|
timeout "$TIMEOUT_SECS" \
|
|
169
|
-
env -u MX_COORD_SERVICE_TOKEN MX_COORD_EXPECT_TEAM="$
|
|
183
|
+
env -u MX_COORD_SERVICE_TOKEN MX_COORD_EXPECT_TEAM="$EXPECT_TEAM" \
|
|
170
184
|
mx-agent coordination brief >"$OUT_CAP" 2>"$ERR_CAP" || status=$?
|
|
171
185
|
|
|
172
186
|
# Fixed-string, case-insensitive search of the captured CLI stderr.
|
|
@@ -195,6 +209,16 @@ elif [ "$status" -ne 0 ] && [ -s "$ERR_CAP" ] && grep -qiE "unknown command[ '\"
|
|
|
195
209
|
# Commander in an old CLI prints e.g. `error: unknown command 'coordination'`.
|
|
196
210
|
could_not_run "cli-too-old" "the installed mx-agent CLI predates the \`coordination\` command (need >=${MIN_CLI_VERSION}). Remedy: ${CLI_UPDATE_CMD}."
|
|
197
211
|
printed=1
|
|
212
|
+
elif [ "$status" -ne 0 ] && err_has "coordination: WRONG TEAM"; then
|
|
213
|
+
# #548. The CLI's EXPECTED_TEAM_MISMATCH_MARKER (commands/coordination.ts). The
|
|
214
|
+
# marker names a team other than the one this session was started as, and the
|
|
215
|
+
# CLI refused before any credential request. Fixed text: neither team name is
|
|
216
|
+
# copied from the capture, because the marker is text this hook does not control.
|
|
217
|
+
# Gated on a non-zero exit too (security review on PR #549, INFO): the refusal
|
|
218
|
+
# always exits 1, so a brief that exited 0 and merely echoed the phrase on
|
|
219
|
+
# stderr (a service-supplied flush warning, for example) is not mislabelled.
|
|
220
|
+
could_not_run "wrong-team" "the .mx-coordination-team marker in this worktree names a different team from the one this session was started as (MX_COORD_EXPECT_TEAM), so the CLI requested no credential and read no cached token. Remedy: run \`mx-agent coordination status\` to see both teams, the marker path and the fix; if git tracks the marker, every worktree on the branch shares it, so do not rewrite it in place."
|
|
221
|
+
printed=1
|
|
198
222
|
elif [ "$status" -ne 0 ] && [ -s "$ERR_CAP" ] && grep -qiE "TOKEN REJECTED \(HTTP 401\)|http[ /][0-9.]* ?401|status[ :=]*401|invalid token|unauthorized|missing bearer token|token revoked|token grace window expired" "$ERR_CAP" 2>/dev/null; then
|
|
199
223
|
# LOUD BY DESIGN (#4970). The 401 match must NOT be a bare "401" anywhere in
|
|
200
224
|
# the capture: the CLI prints ServiceHttpError's message, and that message is
|
|
@@ -47,6 +47,39 @@ import { type MemoryStore } from '../lib/coordination-memory.js';
|
|
|
47
47
|
* message ever observed.
|
|
48
48
|
*/
|
|
49
49
|
export declare const MESSAGE_BODY_MAX_CHARS = 16000;
|
|
50
|
+
/**
|
|
51
|
+
* Stable first words of the expected-team refusal (#548). The session-start hook
|
|
52
|
+
* greps the CLI's stderr for this (coordination-brief.sh), so keep the two in step.
|
|
53
|
+
*/
|
|
54
|
+
export declare const EXPECTED_TEAM_MISMATCH_MARKER = "coordination: WRONG TEAM";
|
|
55
|
+
/**
|
|
56
|
+
* The expected-team interlock (#548, the fix #292 proposed for #527 defect 1).
|
|
57
|
+
*
|
|
58
|
+
* `mx-agent start <team>` puts the team it was asked to start into the session
|
|
59
|
+
* environment as MX_COORD_EXPECT_TEAM (`lib/claude.ts`, `lib/agent-session.ts`,
|
|
60
|
+
* `lib/runtime/codex-adapter.ts`). That value comes from the command line, not
|
|
61
|
+
* from any file in the worktree, so it is independent of the marker. When it is
|
|
62
|
+
* set and non-empty and the marker names a different team, this returns the
|
|
63
|
+
* refusal lines. Otherwise it returns undefined and the caller behaves as before.
|
|
64
|
+
*
|
|
65
|
+
* WHAT THIS IS NOT. It does not choose the team a command acts as: the marker
|
|
66
|
+
* still names that team (MF-2, `lib/coordination-token.ts` header). It does not
|
|
67
|
+
* read CLAUDE_TEAM_NAME, the worktree name or any other heuristic. It can only
|
|
68
|
+
* refuse, so it cannot select a wrong team.
|
|
69
|
+
*
|
|
70
|
+
* Cases where it returns undefined, so today's handling applies unchanged:
|
|
71
|
+
* - MX_COORD_EXPECT_TEAM absent or empty;
|
|
72
|
+
* - no worktree located, or no marker, or a marker that is unreadable, empty or
|
|
73
|
+
* refused by `readTeamMarker` (each command already reports those itself);
|
|
74
|
+
* - the marker names the expected team.
|
|
75
|
+
*
|
|
76
|
+
* It reads the marker only. It reads no credential cache and requests nothing.
|
|
77
|
+
* `prepareClient` runs it before any credential resolution, which covers every
|
|
78
|
+
* queue command; `resolveTeam` and `runStatus` also run it, because escalate
|
|
79
|
+
* builds its `from` and status reads the cache without `prepareClient`. So a
|
|
80
|
+
* mismatch makes no token request and uses no cached or configured token.
|
|
81
|
+
*/
|
|
82
|
+
export declare function expectedTeamRefusal(env?: NodeJS.ProcessEnv, locate?: LocateWorktreeOptions): string[] | undefined;
|
|
50
83
|
/**
|
|
51
84
|
* Stable first line of the loud terminal auth failure. The session-start hook
|
|
52
85
|
* greps the CLI's stderr for this (coordination-brief.sh) — keep the two in
|
|
@@ -93,7 +126,9 @@ export declare function withTokenRefresh(inner: CoordinationClient, rebuild: (to
|
|
|
93
126
|
* still goes through env — it is read by the session-start hook in another process,
|
|
94
127
|
* which is the whole point of it.
|
|
95
128
|
*/
|
|
96
|
-
export declare function prepareClient(deps?: CoordinationDeps
|
|
129
|
+
export declare function prepareClient(deps?: CoordinationDeps, opts?: {
|
|
130
|
+
onWrongTeam?: 'exit' | 'null';
|
|
131
|
+
}): Promise<CoordinationClient | null>;
|
|
97
132
|
/**
|
|
98
133
|
* Injectable dependencies for the coordination commands. `client` stubs the
|
|
99
134
|
* queue service (queue mode); `memoryStore` stubs the named-memory backend
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordination.d.ts","sourceRoot":"","sources":["../../src/commands/coordination.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAKL,gBAAgB,EAIhB,KAAK,kBAAkB,EAExB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAML,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"coordination.d.ts","sourceRoot":"","sources":["../../src/commands/coordination.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ import { spawnSync } from 'node:child_process';
|
|
|
14
14
|
import { join } from 'node:path';
|
|
15
15
|
import { HttpCoordinationClient, resolveClientConfig, resolveCoordinationMode, ServiceUnreachableError, ServiceHttpError, CONFIG_KEY_URL, URL_SOURCE_LABEL, resolveCoordinationUrl, } from '../lib/coordination-client.js';
|
|
16
16
|
import { resolveCoordinationToken, refreshCoordinationToken, usesCredentialEndpoint, ENV_KEY_EXPECT_PROJECT, ENV_KEY_EXPECT_TEAM, } from '../lib/coordination-token.js';
|
|
17
|
-
import { locateCoordinationWorktree, noMarkerLines, readMarkerLine, readTeamMarker, } from '../lib/coordination-worktree.js';
|
|
17
|
+
import { defaultTrackedCoordinationFiles, locateCoordinationWorktree, noMarkerLines, readMarkerLine, readTeamMarker, } from '../lib/coordination-worktree.js';
|
|
18
18
|
import { isValidProjectSlug, invalidProjectSlugMessage, PROJECT_SLUG_RE_SOURCE } from '../lib/slug.js';
|
|
19
19
|
import { appendFallbackEntry, flushFallback } from '../lib/coordination-fallback.js';
|
|
20
20
|
import { sanitizeField, renderMessages, renderRoutingDescription, renderPipelineExtractionWarning, findOverBudgetDropped, } from '../lib/coordination-render.js';
|
|
@@ -114,6 +114,10 @@ function readMarkerTeam() {
|
|
|
114
114
|
* none of the three sources yields a team, exit non-zero with a fix hint.
|
|
115
115
|
*/
|
|
116
116
|
function resolveTeam(explicit) {
|
|
117
|
+
// #548: a session started as one team never sends as the team a wrong marker
|
|
118
|
+
// names. Runs before the marker is used for `from`, and before any fallback
|
|
119
|
+
// entry is written under it.
|
|
120
|
+
refuseOnExpectedTeamMismatch();
|
|
117
121
|
const team = explicit || readMarkerTeam() || process.env.CLAUDE_WORKTREE_NAME;
|
|
118
122
|
if (!team) {
|
|
119
123
|
console.error('Error: could not determine your team for the coordination `from` field. ' +
|
|
@@ -131,6 +135,135 @@ function resolveTeam(explicit) {
|
|
|
131
135
|
}
|
|
132
136
|
return team;
|
|
133
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* Stable first words of the expected-team refusal (#548). The session-start hook
|
|
140
|
+
* greps the CLI's stderr for this (coordination-brief.sh), so keep the two in step.
|
|
141
|
+
*/
|
|
142
|
+
export const EXPECTED_TEAM_MISMATCH_MARKER = 'coordination: WRONG TEAM';
|
|
143
|
+
/** A team name for a refusal line: printed only when it is a valid slug (#525 security review). */
|
|
144
|
+
function shownTeam(team) {
|
|
145
|
+
return isValidProjectSlug(team) ? `"${team}"` : 'a value that is not a valid team slug';
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* The expected-team interlock (#548, the fix #292 proposed for #527 defect 1).
|
|
149
|
+
*
|
|
150
|
+
* `mx-agent start <team>` puts the team it was asked to start into the session
|
|
151
|
+
* environment as MX_COORD_EXPECT_TEAM (`lib/claude.ts`, `lib/agent-session.ts`,
|
|
152
|
+
* `lib/runtime/codex-adapter.ts`). That value comes from the command line, not
|
|
153
|
+
* from any file in the worktree, so it is independent of the marker. When it is
|
|
154
|
+
* set and non-empty and the marker names a different team, this returns the
|
|
155
|
+
* refusal lines. Otherwise it returns undefined and the caller behaves as before.
|
|
156
|
+
*
|
|
157
|
+
* WHAT THIS IS NOT. It does not choose the team a command acts as: the marker
|
|
158
|
+
* still names that team (MF-2, `lib/coordination-token.ts` header). It does not
|
|
159
|
+
* read CLAUDE_TEAM_NAME, the worktree name or any other heuristic. It can only
|
|
160
|
+
* refuse, so it cannot select a wrong team.
|
|
161
|
+
*
|
|
162
|
+
* Cases where it returns undefined, so today's handling applies unchanged:
|
|
163
|
+
* - MX_COORD_EXPECT_TEAM absent or empty;
|
|
164
|
+
* - no worktree located, or no marker, or a marker that is unreadable, empty or
|
|
165
|
+
* refused by `readTeamMarker` (each command already reports those itself);
|
|
166
|
+
* - the marker names the expected team.
|
|
167
|
+
*
|
|
168
|
+
* It reads the marker only. It reads no credential cache and requests nothing.
|
|
169
|
+
* `prepareClient` runs it before any credential resolution, which covers every
|
|
170
|
+
* queue command; `resolveTeam` and `runStatus` also run it, because escalate
|
|
171
|
+
* builds its `from` and status reads the cache without `prepareClient`. So a
|
|
172
|
+
* mismatch makes no token request and uses no cached or configured token.
|
|
173
|
+
*/
|
|
174
|
+
export function expectedTeamRefusal(env = process.env, locate) {
|
|
175
|
+
const expected = env[ENV_KEY_EXPECT_TEAM];
|
|
176
|
+
if (!expected)
|
|
177
|
+
return undefined;
|
|
178
|
+
let located;
|
|
179
|
+
let marker;
|
|
180
|
+
try {
|
|
181
|
+
located = locateCoordinationWorktree(env, locate);
|
|
182
|
+
if (!located.ok)
|
|
183
|
+
return undefined;
|
|
184
|
+
marker = readTeamMarker(located, locate);
|
|
185
|
+
}
|
|
186
|
+
catch {
|
|
187
|
+
return undefined;
|
|
188
|
+
}
|
|
189
|
+
if (marker.kind !== 'ok')
|
|
190
|
+
return undefined;
|
|
191
|
+
// `from` uses the trimmed line (readMarkerTeam) and the token path strips all
|
|
192
|
+
// whitespace (firstLineNoSpace). Both must equal the expectation.
|
|
193
|
+
const trimmed = marker.line.trim();
|
|
194
|
+
if (!trimmed)
|
|
195
|
+
return undefined;
|
|
196
|
+
if (trimmed === expected && marker.line.replace(/\s+/g, '') === expected)
|
|
197
|
+
return undefined;
|
|
198
|
+
const markerPath = sanitizeField(join(located.root, '.mx-coordination-team'));
|
|
199
|
+
const want = isValidProjectSlug(expected) ? expected : '<team>';
|
|
200
|
+
return [
|
|
201
|
+
`${EXPECTED_TEAM_MISMATCH_MARKER}: refusing to act as team ${shownTeam(trimmed)}. ` +
|
|
202
|
+
`The .mx-coordination-team marker at ${markerPath} names team ${shownTeam(trimmed)}, ` +
|
|
203
|
+
`but this session was started as team ${shownTeam(expected)} (${ENV_KEY_EXPECT_TEAM}, set by \`mx-agent start\`). ` +
|
|
204
|
+
'No credential was requested and no cached token was read.',
|
|
205
|
+
...expectedTeamRemedy(located.root, want, locate),
|
|
206
|
+
];
|
|
207
|
+
}
|
|
208
|
+
/**
|
|
209
|
+
* The remedy under the expected-team refusal, by whether git tracks the marker
|
|
210
|
+
* (red-team on PR #549). Asked with the same call `cwdMarkerRefusal` uses
|
|
211
|
+
* (`defaultTrackedCoordinationFiles`, or the injected `trackedFiles`), and only
|
|
212
|
+
* on the refusal path, so a matching marker runs no git.
|
|
213
|
+
*
|
|
214
|
+
* - Untracked: delete it and run `start`, which writes the marker only when the
|
|
215
|
+
* file is absent.
|
|
216
|
+
* - Tracked or staged: every worktree on the branch shares that one file.
|
|
217
|
+
* Deleting it and letting `start` write this team's name leaves the tracked
|
|
218
|
+
* file modified, and a later `commit -a` would give every worktree this
|
|
219
|
+
* team's name. So no delete line: point at the tracked-marker steps that
|
|
220
|
+
* `coordination status` prints from a plain terminal, where the marker is
|
|
221
|
+
* located from the current directory and `cwdMarkerRefusal` runs.
|
|
222
|
+
* - git could not say: the delete line is not printed either, because it is
|
|
223
|
+
* unsafe in the tracked case; the operator checks first.
|
|
224
|
+
*/
|
|
225
|
+
function expectedTeamRemedy(root, want, locate) {
|
|
226
|
+
let tracked;
|
|
227
|
+
try {
|
|
228
|
+
tracked = (locate?.trackedFiles ?? defaultTrackedCoordinationFiles)(root);
|
|
229
|
+
}
|
|
230
|
+
catch {
|
|
231
|
+
tracked = undefined;
|
|
232
|
+
}
|
|
233
|
+
const statusSteps = 'run `mx-agent coordination status` from a terminal that `mx-agent start` did not open, ' +
|
|
234
|
+
'with that worktree as the current directory, and follow the tracked-marker steps it prints';
|
|
235
|
+
if (tracked === undefined) {
|
|
236
|
+
return [
|
|
237
|
+
' git could not say whether the marker is tracked, so no fix is printed here. ' +
|
|
238
|
+
'Run `git ls-files -- .mx-coordination-team` in that worktree. ' +
|
|
239
|
+
`If it lists the file, every worktree on the branch shares it: ${statusSteps}. ` +
|
|
240
|
+
`If it lists nothing, delete the marker and run \`mx-agent start ${want}\`.`,
|
|
241
|
+
];
|
|
242
|
+
}
|
|
243
|
+
if (tracked.some((f) => f.toLowerCase() === '.mx-coordination-team')) {
|
|
244
|
+
return [
|
|
245
|
+
' The marker is tracked or staged in git, so every worktree on this branch shares that one file. ' +
|
|
246
|
+
`Writing this team's name into it would modify the shared file, and committing that ` +
|
|
247
|
+
`would give every worktree team "${want}". To fix it, ${statusSteps}.`,
|
|
248
|
+
];
|
|
249
|
+
}
|
|
250
|
+
return [
|
|
251
|
+
` To fix it, make that marker name team "${want}". If the marker is wrong, delete it and run ` +
|
|
252
|
+
`\`mx-agent start ${want}\`, which writes the marker only when the file is absent.`,
|
|
253
|
+
];
|
|
254
|
+
}
|
|
255
|
+
/**
|
|
256
|
+
* Print the expected-team refusal and exit 1, or return when there is none.
|
|
257
|
+
* Exit 1, not 2: the check ran and found a problem (fail-loud standard).
|
|
258
|
+
*/
|
|
259
|
+
function refuseOnExpectedTeamMismatch(locate) {
|
|
260
|
+
const lines = expectedTeamRefusal(process.env, locate);
|
|
261
|
+
if (!lines)
|
|
262
|
+
return;
|
|
263
|
+
for (const line of lines)
|
|
264
|
+
console.error(line);
|
|
265
|
+
process.exit(1);
|
|
266
|
+
}
|
|
134
267
|
/**
|
|
135
268
|
* Resolve the memory-mode product slug, failing CLOSED on an invalid
|
|
136
269
|
* explicitly-set value (KI-COORDMT-CLIENT-SLUG-VALIDATION). The default
|
|
@@ -384,7 +517,7 @@ export function withTokenRefresh(inner, rebuild, refresh, initialToken) {
|
|
|
384
517
|
* still goes through env — it is read by the session-start hook in another process,
|
|
385
518
|
* which is the whole point of it.
|
|
386
519
|
*/
|
|
387
|
-
export async function prepareClient(deps) {
|
|
520
|
+
export async function prepareClient(deps, opts = {}) {
|
|
388
521
|
if (deps?.client) {
|
|
389
522
|
// Provisioning is still skipped for an injected client, but the 401 recovery
|
|
390
523
|
// wrapper is NOT: it is the single path every command goes through, and a
|
|
@@ -396,6 +529,31 @@ export async function prepareClient(deps) {
|
|
|
396
529
|
const injected = deps.client;
|
|
397
530
|
return withTokenRefresh(injected, () => injected, deps.refreshToken);
|
|
398
531
|
}
|
|
532
|
+
// #548: every queue command reaches a credential through here, so the
|
|
533
|
+
// expected-team check runs here, before credential resolution of any kind (env,
|
|
534
|
+
// config, cache, Key Vault or the credential endpoint). It covers watch,
|
|
535
|
+
// respond, obligations, ack and history as well as brief and drain, and a
|
|
536
|
+
// future command cannot miss it. On a Key Vault project this is the only check:
|
|
537
|
+
// resolveIdentity's #220 interlock runs on the credential-endpoint branch only
|
|
538
|
+
// (lib/coordination-token.ts), so without it a wrong marker served another
|
|
539
|
+
// team's cached token (security review on PR #549, Should Fix).
|
|
540
|
+
//
|
|
541
|
+
// TWO OUTCOMES, BY CALLER. The coordination commands come through
|
|
542
|
+
// `commandClient` and exit 1, so the refusal is a failed command, never the
|
|
543
|
+
// memory-mode fall-back. The default, for every other caller, prints the same
|
|
544
|
+
// refusal and returns null. Three callers outside this file
|
|
545
|
+
// (commands/fleet-tmux.ts, lib/fleet-data.ts, commands/session.ts) rely on
|
|
546
|
+
// "returns null, never throws": exiting here would end a fleet view or turn
|
|
547
|
+
// `session pause`'s ok:false into a process exit. A future command that calls
|
|
548
|
+
// prepareClient directly still gets no client and a printed refusal.
|
|
549
|
+
const refusal = expectedTeamRefusal();
|
|
550
|
+
if (refusal) {
|
|
551
|
+
for (const line of refusal)
|
|
552
|
+
console.error(line);
|
|
553
|
+
if (opts.onWrongTeam === 'exit')
|
|
554
|
+
process.exit(1);
|
|
555
|
+
return null;
|
|
556
|
+
}
|
|
399
557
|
// SF-A never-crash contract: resolveCoordinationToken is documented never-throws,
|
|
400
558
|
// but its config read can still touch the filesystem (mkdirSync on an unwritable/
|
|
401
559
|
// read-only HOME → EACCES/EROFS). Keep the WHOLE resolve+build inside the
|
|
@@ -496,6 +654,13 @@ export async function prepareClient(deps) {
|
|
|
496
654
|
return null;
|
|
497
655
|
}
|
|
498
656
|
}
|
|
657
|
+
/**
|
|
658
|
+
* `prepareClient` for a coordination command (#548): a session started as one
|
|
659
|
+
* team exits 1 on a marker that names another, before any credential.
|
|
660
|
+
*/
|
|
661
|
+
function commandClient(deps) {
|
|
662
|
+
return prepareClient(deps, { onWrongTeam: 'exit' });
|
|
663
|
+
}
|
|
499
664
|
/**
|
|
500
665
|
* Opportunistically flush any queued-locally entries. Surfaces a flush FAILURE
|
|
501
666
|
* as a stderr warning (MAJOR-4) — never silent — but does not fail the primary
|
|
@@ -862,7 +1027,7 @@ export async function runEscalate(opts, deps) {
|
|
|
862
1027
|
}
|
|
863
1028
|
const team = resolveTeam(opts.team);
|
|
864
1029
|
const entry = { team, to: opts.to, priority: opts.priority, body, from: team };
|
|
865
|
-
const client = await
|
|
1030
|
+
const client = await commandClient(deps);
|
|
866
1031
|
if (!client) {
|
|
867
1032
|
// No token/URL could be provisioned (prepareClient already printed the reason).
|
|
868
1033
|
// Degrade to the local fallback so the message is never lost.
|
|
@@ -934,7 +1099,8 @@ export async function runDrain(opts, deps) {
|
|
|
934
1099
|
memoryModeQueueOnlyNote('drain');
|
|
935
1100
|
return; // exit 0 — no crash
|
|
936
1101
|
}
|
|
937
|
-
|
|
1102
|
+
// #548: commandClient runs the expected-team check before any credential.
|
|
1103
|
+
const client = await commandClient(deps);
|
|
938
1104
|
if (!client)
|
|
939
1105
|
return; // could not provision — fall back (prepareClient printed why)
|
|
940
1106
|
// Flush any queued-locally entries now that the service is reachable.
|
|
@@ -988,7 +1154,8 @@ export async function runBrief(opts = {}, deps) {
|
|
|
988
1154
|
if (resolveCoordinationMode() === 'memory') {
|
|
989
1155
|
return runBriefMemory(opts, deps);
|
|
990
1156
|
}
|
|
991
|
-
|
|
1157
|
+
// #548: commandClient runs the expected-team check before any credential.
|
|
1158
|
+
const client = await commandClient(deps);
|
|
992
1159
|
if (!client)
|
|
993
1160
|
return; // could not provision — fall back (prepareClient printed why)
|
|
994
1161
|
await opportunisticFlush(client);
|
|
@@ -1092,7 +1259,7 @@ export async function runWatch(opts = {}, deps) {
|
|
|
1092
1259
|
memoryModeQueueOnlyNote('watch');
|
|
1093
1260
|
return; // exit 0 — no crash
|
|
1094
1261
|
}
|
|
1095
|
-
const client = await
|
|
1262
|
+
const client = await commandClient(deps);
|
|
1096
1263
|
if (!client)
|
|
1097
1264
|
return; // could not provision — fall back (prepareClient printed why)
|
|
1098
1265
|
const intervalMs = opts.intervalMs ?? envInt('MX_COORD_PRIORITY_POLL_MS', 15_000);
|
|
@@ -1185,7 +1352,7 @@ export async function runRespond(opts, deps) {
|
|
|
1185
1352
|
console.error('Note: "open" and "acked" are set automatically by the system.');
|
|
1186
1353
|
process.exit(1);
|
|
1187
1354
|
}
|
|
1188
|
-
const client = await
|
|
1355
|
+
const client = await commandClient(deps);
|
|
1189
1356
|
if (!client)
|
|
1190
1357
|
return;
|
|
1191
1358
|
try {
|
|
@@ -1214,7 +1381,7 @@ export async function runObligations(deps) {
|
|
|
1214
1381
|
memoryModeQueueOnlyNote('obligations');
|
|
1215
1382
|
return;
|
|
1216
1383
|
}
|
|
1217
|
-
const client = await
|
|
1384
|
+
const client = await commandClient(deps);
|
|
1218
1385
|
if (!client)
|
|
1219
1386
|
return;
|
|
1220
1387
|
try {
|
|
@@ -1257,7 +1424,7 @@ export async function runAck(messageId, deps) {
|
|
|
1257
1424
|
memoryModeQueueOnlyNote('ack');
|
|
1258
1425
|
return; // exit 0 — no crash
|
|
1259
1426
|
}
|
|
1260
|
-
const client = await
|
|
1427
|
+
const client = await commandClient(deps);
|
|
1261
1428
|
if (!client)
|
|
1262
1429
|
return; // could not provision — fall back (prepareClient printed why)
|
|
1263
1430
|
await client.ack(messageId);
|
|
@@ -1340,7 +1507,7 @@ export async function runHistory(opts = {}, deps) {
|
|
|
1340
1507
|
memoryModeQueueOnlyNote('history');
|
|
1341
1508
|
return; // exit 0 — no crash
|
|
1342
1509
|
}
|
|
1343
|
-
const client = await
|
|
1510
|
+
const client = await commandClient(deps);
|
|
1344
1511
|
if (!client)
|
|
1345
1512
|
return; // could not provision — fall back (prepareClient printed why)
|
|
1346
1513
|
const collected = [];
|
|
@@ -2043,6 +2210,12 @@ function describeLiveFailure(err) {
|
|
|
2043
2210
|
* that hangs or throws is worse than one that says it could not tell.
|
|
2044
2211
|
*/
|
|
2045
2212
|
export async function runStatus(deps) {
|
|
2213
|
+
// 0. #548: a session started as one team does not report another team's
|
|
2214
|
+
// queue state. Refuses before the cache check and the registration check,
|
|
2215
|
+
// either of which can read or request a credential. Memory mode resolves no
|
|
2216
|
+
// credential and is unchanged.
|
|
2217
|
+
if (resolveCoordinationMode() !== 'memory')
|
|
2218
|
+
refuseOnExpectedTeamMismatch(deps?.locate);
|
|
2046
2219
|
// 1. Resolve project slug.
|
|
2047
2220
|
const projectSlug = resolveProductSlug();
|
|
2048
2221
|
// 2. Resolve team slug from the marker file. CLAUDE_WORKTREE_PATH first; in a
|