@spinabot/brigade 1.24.0 → 1.24.2
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/agents/claude-cli/catalog.d.ts +19 -4
- package/dist/agents/claude-cli/catalog.d.ts.map +1 -1
- package/dist/agents/claude-cli/catalog.js +27 -7
- package/dist/agents/claude-cli/catalog.js.map +1 -1
- package/dist/agents/claude-cli/models-live.d.ts +13 -0
- package/dist/agents/claude-cli/models-live.d.ts.map +1 -0
- package/dist/agents/claude-cli/models-live.js +88 -0
- package/dist/agents/claude-cli/models-live.js.map +1 -0
- package/dist/agents/claude-cli/register.d.ts +10 -2
- package/dist/agents/claude-cli/register.d.ts.map +1 -1
- package/dist/agents/claude-cli/register.js +21 -4
- package/dist/agents/claude-cli/register.js.map +1 -1
- package/dist/agents/claude-cli/spawn.d.ts +7 -0
- package/dist/agents/claude-cli/spawn.d.ts.map +1 -1
- package/dist/agents/claude-cli/spawn.js +19 -3
- package/dist/agents/claude-cli/spawn.js.map +1 -1
- package/dist/agents/claude-cli/stream.d.ts.map +1 -1
- package/dist/agents/claude-cli/stream.js +6 -2
- package/dist/agents/claude-cli/stream.js.map +1 -1
- package/dist/buildstamp.json +1 -1
- package/dist/core/server.js +5 -2
- package/dist/core/server.js.map +1 -1
- package/dist/providers/catalog.js +2 -2
- package/dist/providers/catalog.js.map +1 -1
- package/dist/ui/onboarding.d.ts.map +1 -1
- package/dist/ui/onboarding.js +9 -5
- package/dist/ui/onboarding.js.map +1 -1
- package/package.json +1 -1
|
@@ -82,10 +82,25 @@ export interface BuildArgsInput {
|
|
|
82
82
|
conversational?: boolean;
|
|
83
83
|
}
|
|
84
84
|
/**
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
88
|
-
*
|
|
85
|
+
* Compose the full system-prompt TEXT for a turn (Brigade's assembled persona +
|
|
86
|
+
* the conversational nudge). Returned as a string so the caller can deliver it
|
|
87
|
+
* via a FILE (`--append-system-prompt-file`) — Brigade's system prompt is tens
|
|
88
|
+
* of KB (persona + skills + tools + memory), which blows the OS command-line
|
|
89
|
+
* length limit if passed as an argv string (Windows `spawn ENAMETOOLONG`).
|
|
90
|
+
* Returns "" when there's nothing to append.
|
|
91
|
+
*/
|
|
92
|
+
export declare function composeClaudeCliSystemPrompt(input: {
|
|
93
|
+
systemPrompt?: string;
|
|
94
|
+
conversational?: boolean;
|
|
95
|
+
}): string;
|
|
96
|
+
/**
|
|
97
|
+
* Assemble the argv (excluding the leading command) for a fresh turn.
|
|
98
|
+
* Order: base flags → `--model <m>` → tool policy. The system prompt is NOT put
|
|
99
|
+
* on argv — it's delivered by the spawner via `--append-system-prompt-file`
|
|
100
|
+
* (see spawn.ts) to avoid the OS command-line length limit — and the user
|
|
101
|
+
* prompt is delivered on STDIN. So argv stays tiny + constant.
|
|
89
102
|
*/
|
|
90
103
|
export declare function buildClaudeCliArgs(input: BuildArgsInput): string[];
|
|
104
|
+
/** The flag the spawner uses to deliver the composed system prompt from a file. */
|
|
105
|
+
export declare const CLAUDE_CLI_SYSTEM_PROMPT_FILE_FLAG = "--append-system-prompt-file";
|
|
91
106
|
//# sourceMappingURL=catalog.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/catalog.ts"],"names":[],"mappings":"AAaA,6EAA6E;AAC7E,eAAO,MAAM,cAAc,eAAe,CAAC;AAC3C,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAMhD;AAeD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,GAAG,SAAS,CAsB/D;AAED,oDAAoD;AACpD,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/catalog.ts"],"names":[],"mappings":"AAaA,6EAA6E;AAC7E,eAAO,MAAM,cAAc,eAAe,CAAC;AAC3C,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAMhD;AAeD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,GAAG,SAAS,CAsB/D;AAED,oDAAoD;AACpD,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CAClB;AAOD,eAAO,MAAM,iBAAiB,EAAE,SAAS,iBAAiB,EAQhD,CAAC;AAEX,oFAAoF;AACpF,eAAO,MAAM,wBAAwB,sBAAsB,CAAC;AAO5D,eAAO,MAAM,uBAAuB,kDAAkD,CAAC;AAcvF,oEAAoE;AACpE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAK5D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAS1D;AAUD,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EA2CjD,CAAC;AAMF,eAAO,MAAM,wBAAwB,yCAAyC,CAAC;AAE/E;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,GAAE,MAAM,CAAC,UAAwB,EACxC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,MAAM,CAAC,UAAU,CAQnB;AAsCD,MAAM,WAAW,cAAc;IAC9B,6EAA6E;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB,GAAG,MAAM,CAMT;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,EAAE,CAMlE;AAED,mFAAmF;AACnF,eAAO,MAAM,kCAAkC,gCAAgC,CAAC"}
|
|
@@ -78,7 +78,14 @@ export function resolveBundledClaudeBinary() {
|
|
|
78
78
|
export function __resetBundledClaudeCache() {
|
|
79
79
|
bundledClaudeCache = undefined;
|
|
80
80
|
}
|
|
81
|
+
// Static FALLBACK catalog — used only when live discovery (models-live.ts,
|
|
82
|
+
// which queries the account's real `/v1/models`) is unavailable. Kept roughly
|
|
83
|
+
// current so an offline picker still offers sensible choices, but the live
|
|
84
|
+
// fetch is the source of truth and will surface anything newer (it's what puts
|
|
85
|
+
// Fable 5 / Sonnet 5 in front of the operator the moment their account has it).
|
|
81
86
|
export const CLAUDE_CLI_MODELS = [
|
|
87
|
+
{ id: "claude-sonnet-5", name: "Claude Sonnet 5 (subscription)", cliModel: "claude-sonnet-5", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
|
|
88
|
+
{ id: "claude-fable-5", name: "Claude Fable 5 (subscription)", cliModel: "claude-fable-5", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
|
|
82
89
|
{ id: "claude-opus-4-8", name: "Claude Opus 4.8 (subscription)", cliModel: "claude-opus-4-8", reasoning: true, contextWindow: 200_000, maxTokens: 32_000 },
|
|
83
90
|
{ id: "claude-opus-4-7", name: "Claude Opus 4.7 (subscription)", cliModel: "claude-opus-4-7", reasoning: true, contextWindow: 200_000, maxTokens: 32_000 },
|
|
84
91
|
{ id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6 (subscription)", cliModel: "claude-sonnet-4-6", reasoning: true, contextWindow: 200_000, maxTokens: 64_000 },
|
|
@@ -241,10 +248,24 @@ const CLAUDE_CLI_DENY_TOOLS = "Bash Edit Write MultiEdit NotebookEdit WebFetch W
|
|
|
241
248
|
const CLAUDE_CLI_SYSTEM_SUFFIX = "You are answering as part of an ongoing conversation. Respond directly in prose; " +
|
|
242
249
|
"do not use tools or act on the local filesystem — everything you need is in this conversation.";
|
|
243
250
|
/**
|
|
244
|
-
*
|
|
245
|
-
*
|
|
246
|
-
*
|
|
247
|
-
*
|
|
251
|
+
* Compose the full system-prompt TEXT for a turn (Brigade's assembled persona +
|
|
252
|
+
* the conversational nudge). Returned as a string so the caller can deliver it
|
|
253
|
+
* via a FILE (`--append-system-prompt-file`) — Brigade's system prompt is tens
|
|
254
|
+
* of KB (persona + skills + tools + memory), which blows the OS command-line
|
|
255
|
+
* length limit if passed as an argv string (Windows `spawn ENAMETOOLONG`).
|
|
256
|
+
* Returns "" when there's nothing to append.
|
|
257
|
+
*/
|
|
258
|
+
export function composeClaudeCliSystemPrompt(input) {
|
|
259
|
+
const conversational = input.conversational !== false;
|
|
260
|
+
const parts = [input.systemPrompt?.trim(), conversational ? CLAUDE_CLI_SYSTEM_SUFFIX : ""].filter((p) => !!p && p.length > 0);
|
|
261
|
+
return parts.join("\n\n");
|
|
262
|
+
}
|
|
263
|
+
/**
|
|
264
|
+
* Assemble the argv (excluding the leading command) for a fresh turn.
|
|
265
|
+
* Order: base flags → `--model <m>` → tool policy. The system prompt is NOT put
|
|
266
|
+
* on argv — it's delivered by the spawner via `--append-system-prompt-file`
|
|
267
|
+
* (see spawn.ts) to avoid the OS command-line length limit — and the user
|
|
268
|
+
* prompt is delivered on STDIN. So argv stays tiny + constant.
|
|
248
269
|
*/
|
|
249
270
|
export function buildClaudeCliArgs(input) {
|
|
250
271
|
const args = [...CLAUDE_CLI_BASE_ARGS];
|
|
@@ -252,9 +273,8 @@ export function buildClaudeCliArgs(input) {
|
|
|
252
273
|
const conversational = input.conversational !== false;
|
|
253
274
|
if (conversational)
|
|
254
275
|
args.push("--disallowedTools", CLAUDE_CLI_DENY_TOOLS);
|
|
255
|
-
const sysParts = [input.systemPrompt?.trim(), conversational ? CLAUDE_CLI_SYSTEM_SUFFIX : ""].filter((p) => !!p && p.length > 0);
|
|
256
|
-
if (sysParts.length > 0)
|
|
257
|
-
args.push("--append-system-prompt", sysParts.join("\n\n"));
|
|
258
276
|
return args;
|
|
259
277
|
}
|
|
278
|
+
/** The flag the spawner uses to deliver the composed system prompt from a file. */
|
|
279
|
+
export const CLAUDE_CLI_SYSTEM_PROMPT_FILE_FLAG = "--append-system-prompt-file";
|
|
260
280
|
//# sourceMappingURL=catalog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/catalog.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Fetch the account's live model ids, newest-first as the API returns them.
|
|
3
|
+
* Cached for `CACHE_TTL_MS`. Any failure (no token, expired token, network,
|
|
4
|
+
* non-200) falls back to the static catalog ids — so a caller always gets a
|
|
5
|
+
* usable, non-empty list. `force` bypasses the cache.
|
|
6
|
+
*/
|
|
7
|
+
export declare function fetchClaudeCliModelIds(opts?: {
|
|
8
|
+
force?: boolean;
|
|
9
|
+
nowMs?: number;
|
|
10
|
+
}): Promise<string[]>;
|
|
11
|
+
/** Test-only cache reset. */
|
|
12
|
+
export declare function __resetClaudeCliModelsCache(): void;
|
|
13
|
+
//# sourceMappingURL=models-live.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"models-live.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/models-live.ts"],"names":[],"mappings":"AA4CA;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAkC9G;AAED,6BAA6B;AAC7B,wBAAgB,2BAA2B,IAAI,IAAI,CAElD"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
// Realtime model discovery for the claude-cli backend.
|
|
2
|
+
//
|
|
3
|
+
// The hardcoded `CLAUDE_CLI_MODELS` catalog goes stale the moment Anthropic
|
|
4
|
+
// ships a new model (it was missing Fable 5 / Sonnet 5). This module fetches
|
|
5
|
+
// the account's CURRENT model list from Anthropic's `/v1/models` endpoint using
|
|
6
|
+
// the subscription's own OAuth access token (the same token the `claude` binary
|
|
7
|
+
// holds), so the onboarding picker + `/model` list always reflect what the
|
|
8
|
+
// subscription can actually run. Best-effort + cached: on any failure it falls
|
|
9
|
+
// back to the static catalog, so discovery is a pure upgrade — never a
|
|
10
|
+
// regression.
|
|
11
|
+
import { readClaudeCliLogin } from "../../integrations/cli-login.js";
|
|
12
|
+
import { CLAUDE_CLI_MODELS } from "./catalog.js";
|
|
13
|
+
import { readBrigadeClaudeCredential } from "./claude-config.js";
|
|
14
|
+
const MODELS_URL = "https://api.anthropic.com/v1/models?limit=100";
|
|
15
|
+
const CACHE_TTL_MS = 5 * 60 * 1000;
|
|
16
|
+
const FETCH_TIMEOUT_MS = 6_000;
|
|
17
|
+
let cache;
|
|
18
|
+
/** The static fallback ids (the catalog snapshot). */
|
|
19
|
+
function staticModelIds() {
|
|
20
|
+
return CLAUDE_CLI_MODELS.map((m) => m.id);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Read a usable Claude access token for the models call. Prefers Brigade's
|
|
24
|
+
* managed grant, then the operator's own `~/.claude` login. Returns undefined
|
|
25
|
+
* when neither is present (→ caller uses the static list).
|
|
26
|
+
*/
|
|
27
|
+
function readAccessToken() {
|
|
28
|
+
const managed = readBrigadeClaudeCredential();
|
|
29
|
+
if (managed?.accessToken)
|
|
30
|
+
return managed.accessToken;
|
|
31
|
+
const own = readClaudeCliLogin();
|
|
32
|
+
if (own?.type === "oauth" && own.access)
|
|
33
|
+
return own.access;
|
|
34
|
+
if (own?.type === "token" && own.token)
|
|
35
|
+
return own.token;
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Fetch the account's live model ids, newest-first as the API returns them.
|
|
40
|
+
* Cached for `CACHE_TTL_MS`. Any failure (no token, expired token, network,
|
|
41
|
+
* non-200) falls back to the static catalog ids — so a caller always gets a
|
|
42
|
+
* usable, non-empty list. `force` bypasses the cache.
|
|
43
|
+
*/
|
|
44
|
+
export async function fetchClaudeCliModelIds(opts = {}) {
|
|
45
|
+
const now = opts.nowMs ?? Date.now();
|
|
46
|
+
if (!opts.force && cache && now - cache.atMs < CACHE_TTL_MS)
|
|
47
|
+
return cache.ids;
|
|
48
|
+
const token = readAccessToken();
|
|
49
|
+
if (!token)
|
|
50
|
+
return staticModelIds();
|
|
51
|
+
try {
|
|
52
|
+
const res = await fetch(MODELS_URL, {
|
|
53
|
+
headers: {
|
|
54
|
+
authorization: `Bearer ${token}`,
|
|
55
|
+
"anthropic-version": "2023-06-01",
|
|
56
|
+
"anthropic-beta": "oauth-2025-04-20",
|
|
57
|
+
"user-agent": "claude-cli/latest",
|
|
58
|
+
"x-app": "cli",
|
|
59
|
+
accept: "application/json",
|
|
60
|
+
},
|
|
61
|
+
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
|
|
62
|
+
});
|
|
63
|
+
if (!res.ok)
|
|
64
|
+
return staticModelIds();
|
|
65
|
+
const body = (await res.json());
|
|
66
|
+
const ids = (body.data ?? [])
|
|
67
|
+
.map((m) => (typeof m.id === "string" ? m.id : ""))
|
|
68
|
+
.filter((id) => id.startsWith("claude-"));
|
|
69
|
+
if (ids.length === 0)
|
|
70
|
+
return staticModelIds();
|
|
71
|
+
// Merge: live ids first (current), then any static id the API omitted, so a
|
|
72
|
+
// catalogued default never vanishes from the picker.
|
|
73
|
+
const seen = new Set(ids);
|
|
74
|
+
for (const s of staticModelIds())
|
|
75
|
+
if (!seen.has(s))
|
|
76
|
+
ids.push(s);
|
|
77
|
+
cache = { atMs: now, ids };
|
|
78
|
+
return ids;
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
return staticModelIds();
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
/** Test-only cache reset. */
|
|
85
|
+
export function __resetClaudeCliModelsCache() {
|
|
86
|
+
cache = undefined;
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=models-live.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"models-live.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/models-live.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,17 @@ export declare function synthClaudeCliModel(modelId: string): SynthClaudeCliMode
|
|
|
24
24
|
/** True when a provider id routes to the claude-cli backend. */
|
|
25
25
|
export declare function isClaudeCliProvider(provider: string | undefined): boolean;
|
|
26
26
|
/**
|
|
27
|
-
* The catalogued claude-cli models as Pi `Model` objects, for
|
|
28
|
-
* gateway's `/model` list
|
|
27
|
+
* The catalogued claude-cli models as Pi `Model` objects (static fallback), for
|
|
28
|
+
* merging into the gateway's `/model` list. Callers should gate on
|
|
29
29
|
* `isClaudeCliAvailable()` first — advertise it only when the binary exists.
|
|
30
30
|
*/
|
|
31
31
|
export declare function listClaudeCliModels(): SynthClaudeCliModel[];
|
|
32
|
+
/**
|
|
33
|
+
* Like `listClaudeCliModels` but resolves the account's LIVE model set from
|
|
34
|
+
* Anthropic's `/v1/models` (via the subscription token) so the picker reflects
|
|
35
|
+
* exactly what the subscription can run — including models newer than the
|
|
36
|
+
* static catalog (Fable 5, Sonnet 5, …). Falls back to the static list on any
|
|
37
|
+
* failure. Async; call from the gateway's already-async `list-models`.
|
|
38
|
+
*/
|
|
39
|
+
export declare function listClaudeCliModelsLive(): Promise<SynthClaudeCliModel[]>;
|
|
32
40
|
//# sourceMappingURL=register.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/register.ts"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,IAAI,OAAO,CAetD;AAED,iFAAiF;AACjF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC3D,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACZ,CAAC;AAIF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,
|
|
1
|
+
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/register.ts"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,IAAI,OAAO,CAetD;AAED,iFAAiF;AACjF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC3D,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACZ,CAAC;AAIF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAoBxE;AAED,gEAAgE;AAChE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEzE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,mBAAmB,EAAE,CAE3D;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAI9E"}
|
|
@@ -45,8 +45,13 @@ export function synthClaudeCliModel(modelId) {
|
|
|
45
45
|
id,
|
|
46
46
|
name: known?.name ?? `${id} (subscription)`,
|
|
47
47
|
api: CLAUDE_CLI_API,
|
|
48
|
-
//
|
|
49
|
-
|
|
48
|
+
// The transport is a subprocess, not an HTTP endpoint — but a `baseUrl`
|
|
49
|
+
// MUST still be present + a string: Pi's provider-attribution runs on
|
|
50
|
+
// every model (`model.provider === "openrouter" || model.baseUrl.includes(
|
|
51
|
+
// …)`) and crashes with "Cannot read properties of undefined (reading
|
|
52
|
+
// 'includes')" on a missing baseUrl. This placeholder is never dialed.
|
|
53
|
+
baseUrl: "https://api.anthropic.com",
|
|
54
|
+
reasoning: known?.reasoning ?? /opus|sonnet|fable/i.test(id),
|
|
50
55
|
input: ["text"],
|
|
51
56
|
cost: { ...ZERO_COST },
|
|
52
57
|
contextWindow: known?.contextWindow ?? 200_000,
|
|
@@ -58,11 +63,23 @@ export function isClaudeCliProvider(provider) {
|
|
|
58
63
|
return (provider ?? "").trim().toLowerCase() === CLAUDE_CLI_PROVIDER;
|
|
59
64
|
}
|
|
60
65
|
/**
|
|
61
|
-
* The catalogued claude-cli models as Pi `Model` objects, for
|
|
62
|
-
* gateway's `/model` list
|
|
66
|
+
* The catalogued claude-cli models as Pi `Model` objects (static fallback), for
|
|
67
|
+
* merging into the gateway's `/model` list. Callers should gate on
|
|
63
68
|
* `isClaudeCliAvailable()` first — advertise it only when the binary exists.
|
|
64
69
|
*/
|
|
65
70
|
export function listClaudeCliModels() {
|
|
66
71
|
return CLAUDE_CLI_MODELS.map((m) => synthClaudeCliModel(m.id));
|
|
67
72
|
}
|
|
73
|
+
/**
|
|
74
|
+
* Like `listClaudeCliModels` but resolves the account's LIVE model set from
|
|
75
|
+
* Anthropic's `/v1/models` (via the subscription token) so the picker reflects
|
|
76
|
+
* exactly what the subscription can run — including models newer than the
|
|
77
|
+
* static catalog (Fable 5, Sonnet 5, …). Falls back to the static list on any
|
|
78
|
+
* failure. Async; call from the gateway's already-async `list-models`.
|
|
79
|
+
*/
|
|
80
|
+
export async function listClaudeCliModelsLive() {
|
|
81
|
+
const { fetchClaudeCliModelIds } = await import("./models-live.js");
|
|
82
|
+
const ids = await fetchClaudeCliModelIds();
|
|
83
|
+
return ids.map((id) => synthClaudeCliModel(id));
|
|
84
|
+
}
|
|
68
85
|
//# sourceMappingURL=register.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/register.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,4EAA4E;AAC5E,+EAA+E;AAC/E,yEAAyE;AACzE,0EAA0E;AAE1E,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5E,OAAO,EACN,cAAc,EACd,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B;IAC3C,IAAI,cAAc,CAAC,cAAc,CAAC;QAAE,OAAO,KAAK,CAAC;IACjD,MAAM,QAAQ,GAAa,uBAAuB,EAAE,CAAC;IACrD,mBAAmB,CAClB;QACC,GAAG,EAAE,cAAc;QACnB,sEAAsE;QACtE,kEAAkE;QAClE,oCAAoC;QACpC,MAAM,EAAE,QAAiB;QACzB,YAAY,EAAE,QAAiB;KAC/B,EACD,kBAAkB,CAClB,CAAC;IACF,OAAO,IAAI,CAAC;AACb,CAAC;AASD,MAAM,SAAS,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAW,CAAC;AAEhF;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IAClD,MAAM,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC;IACrE,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACrF,OAAO;QACN,QAAQ,EAAE,mBAAmB;QAC7B,EAAE;QACF,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,GAAG,EAAE,iBAAiB;QAC3C,GAAG,EAAE,cAAc;QACnB,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/register.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,4EAA4E;AAC5E,+EAA+E;AAC/E,yEAAyE;AACzE,0EAA0E;AAE1E,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5E,OAAO,EACN,cAAc,EACd,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B;IAC3C,IAAI,cAAc,CAAC,cAAc,CAAC;QAAE,OAAO,KAAK,CAAC;IACjD,MAAM,QAAQ,GAAa,uBAAuB,EAAE,CAAC;IACrD,mBAAmB,CAClB;QACC,GAAG,EAAE,cAAc;QACnB,sEAAsE;QACtE,kEAAkE;QAClE,oCAAoC;QACpC,MAAM,EAAE,QAAiB;QACzB,YAAY,EAAE,QAAiB;KAC/B,EACD,kBAAkB,CAClB,CAAC;IACF,OAAO,IAAI,CAAC;AACb,CAAC;AASD,MAAM,SAAS,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAW,CAAC;AAEhF;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IAClD,MAAM,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC;IACrE,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACrF,OAAO;QACN,QAAQ,EAAE,mBAAmB;QAC7B,EAAE;QACF,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,GAAG,EAAE,iBAAiB;QAC3C,GAAG,EAAE,cAAc;QACnB,wEAAwE;QACxE,sEAAsE;QACtE,2EAA2E;QAC3E,sEAAsE;QACtE,uEAAuE;QACvE,OAAO,EAAE,2BAA2B;QACpC,SAAS,EAAE,KAAK,EAAE,SAAS,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5D,KAAK,EAAE,CAAC,MAAM,CAAyB;QACvC,IAAI,EAAE,EAAE,GAAG,SAAS,EAAE;QACtB,aAAa,EAAE,KAAK,EAAE,aAAa,IAAI,OAAO;QAC9C,SAAS,EAAE,KAAK,EAAE,SAAS,IAAI,MAAM;KACrC,CAAC;AACH,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,mBAAmB,CAAC,QAA4B;IAC/D,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,mBAAmB,CAAC;AACtE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IAClC,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC5C,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACpE,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAC3C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -14,6 +14,13 @@ export interface SpawnClaudeCliArgs {
|
|
|
14
14
|
args: string[];
|
|
15
15
|
/** Prompt delivered on stdin (the whole serialized conversation). */
|
|
16
16
|
stdin: string;
|
|
17
|
+
/**
|
|
18
|
+
* Composed system prompt. Written to a temp file inside the isolated cwd and
|
|
19
|
+
* passed via `--append-system-prompt-file` — NEVER on argv, so a large
|
|
20
|
+
* Brigade system prompt can't trip the OS command-line length limit
|
|
21
|
+
* (`spawn ENAMETOOLONG` on Windows). Omitted/empty ⇒ no system-prompt flag.
|
|
22
|
+
*/
|
|
23
|
+
systemPrompt?: string;
|
|
17
24
|
/** External cancel (turn abort). Aborting SIGKILLs the child. */
|
|
18
25
|
signal?: AbortSignal;
|
|
19
26
|
noOutputTimeoutMs?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/spawn.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/spawn.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAWhF,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,SAAU,CAAC;AACvD,kEAAkE;AAClE,eAAO,MAAM,6BAA6B,SAAU,CAAC;AAErD,MAAM,WAAW,kBAAkB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,qEAAqE;IACrE,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iEAAiE;IACjE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CACvB;AAED,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAElF,MAAM,WAAW,kBAAkB;IAClC,4EAA4E;IAC5E,MAAM,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IACvC,gFAAgF;IAChF,IAAI,EAAE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,eAAe,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,kBAAkB,CAsK3E"}
|
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
// that hard-kills a wedged process. Kept separate from `stream.ts` so the
|
|
4
4
|
// Pi-event mapping and the OS-process concerns test independently.
|
|
5
5
|
import { spawn } from "node:child_process";
|
|
6
|
-
import { mkdtempSync, rmSync } from "node:fs";
|
|
6
|
+
import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
7
7
|
import { tmpdir } from "node:os";
|
|
8
8
|
import path from "node:path";
|
|
9
|
-
import { buildClaudeCliEnv, resolveClaudeCliCommand } from "./catalog.js";
|
|
9
|
+
import { buildClaudeCliEnv, CLAUDE_CLI_SYSTEM_PROMPT_FILE_FLAG, resolveClaudeCliCommand, } from "./catalog.js";
|
|
10
10
|
import { hasBrigadeClaudeLogin, resolveBrigadeClaudeConfigDir } from "./claude-config.js";
|
|
11
11
|
import { parseClaudeCliLine } from "./stream-json.js";
|
|
12
12
|
/**
|
|
@@ -43,7 +43,23 @@ export function spawnClaudeCli(args) {
|
|
|
43
43
|
// operator's personal ~/.claude. Absent it, leave CLAUDE_CONFIG_DIR unset so
|
|
44
44
|
// the binary uses its default (the operator's own login).
|
|
45
45
|
const configDir = hasBrigadeClaudeLogin() ? resolveBrigadeClaudeConfigDir() : undefined;
|
|
46
|
-
|
|
46
|
+
// Deliver the (potentially large) system prompt via a FILE, not argv — this
|
|
47
|
+
// keeps argv tiny and dodges `spawn ENAMETOOLONG`. Written into the throwaway
|
|
48
|
+
// cwd, so it's removed with it on exit.
|
|
49
|
+
const finalArgs = [...args.args];
|
|
50
|
+
const sys = args.systemPrompt?.trim();
|
|
51
|
+
if (sys && sys.length > 0) {
|
|
52
|
+
try {
|
|
53
|
+
const sysFile = path.join(cwd, "system-prompt.txt");
|
|
54
|
+
writeFileSync(sysFile, sys, "utf8");
|
|
55
|
+
finalArgs.push(CLAUDE_CLI_SYSTEM_PROMPT_FILE_FLAG, sysFile);
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
/* couldn't write the file — proceed without the appended prompt rather
|
|
59
|
+
than fail the turn (the CLI still has its own default identity). */
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const child = doSpawn(command, finalArgs, {
|
|
47
63
|
cwd,
|
|
48
64
|
env: buildClaudeCliEnv(process.env, { configDir }),
|
|
49
65
|
stdio: ["pipe", "pipe", "pipe"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/spawn.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,8EAA8E;AAC9E,0EAA0E;AAC1E,mEAAmE;AAEnE,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/stream.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../src/agents/claude-cli/stream.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAQ9D,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAWrE,UAAU,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAqBD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,MAAM,CA2B1E;AA8DD,MAAM,WAAW,2BAA2B;IAC3C,kCAAkC;IAClC,OAAO,CAAC,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;CACxC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,GAAE,2BAAgC,GAAG,QAAQ,CAqPxF"}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
// `ollama-native/stream.ts` (one stable per-turn timestamp; start → text/
|
|
12
12
|
// thinking deltas → done | error).
|
|
13
13
|
import { createAssistantMessageEventStream, } from "@earendil-works/pi-ai";
|
|
14
|
-
import { buildClaudeCliArgs, CLAUDE_CLI_API, CLAUDE_CLI_PROVIDER } from "./catalog.js";
|
|
14
|
+
import { buildClaudeCliArgs, composeClaudeCliSystemPrompt, CLAUDE_CLI_API, CLAUDE_CLI_PROVIDER, } from "./catalog.js";
|
|
15
15
|
import { spawnClaudeCli } from "./spawn.js";
|
|
16
16
|
import { classifyResultFrame, foldUsage, } from "./stream-json.js";
|
|
17
17
|
/** Flatten a Pi content value (string | blocks[]) to plain text. */
|
|
@@ -252,10 +252,14 @@ export function createClaudeCliStreamFn(opts = {}) {
|
|
|
252
252
|
try {
|
|
253
253
|
const ctx = (context ?? {});
|
|
254
254
|
const prompt = serializeConversationPrompt(ctx.messages ?? []);
|
|
255
|
-
const args = buildClaudeCliArgs({ modelId: model.id
|
|
255
|
+
const args = buildClaudeCliArgs({ modelId: model.id });
|
|
256
|
+
// System prompt goes via a file (not argv) — see spawn.ts. Composed
|
|
257
|
+
// here so the conversational nudge is included.
|
|
258
|
+
const systemPrompt = composeClaudeCliSystemPrompt({ systemPrompt: ctx.systemPrompt });
|
|
256
259
|
handle = spawnClaudeCli({
|
|
257
260
|
args,
|
|
258
261
|
stdin: prompt,
|
|
262
|
+
systemPrompt,
|
|
259
263
|
signal: options?.signal,
|
|
260
264
|
spawnFn: opts.spawnFn,
|
|
261
265
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/stream.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/agents/claude-cli/stream.ts"],"names":[],"mappings":"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"}
|
package/dist/buildstamp.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"builtAt":
|
|
1
|
+
{"builtAt":1783230739281,"head":"d4009868d20aa3dd28e01ba219f468d8991e70df","version":"1.24.2"}
|
package/dist/core/server.js
CHANGED
|
@@ -68,7 +68,7 @@ import { clearChannelMetaRegistry, registerChannelMeta } from "../agents/channel
|
|
|
68
68
|
import { makeOpQueue, withTimeout } from "./extension-lifecycle.js";
|
|
69
69
|
import { resolveModelNeverMiss } from "../agents/model-resolution.js";
|
|
70
70
|
import { isClaudeCliAvailable } from "../agents/claude-cli/availability.js";
|
|
71
|
-
import { listClaudeCliModels } from "../agents/claude-cli/register.js";
|
|
71
|
+
import { listClaudeCliModels, listClaudeCliModelsLive } from "../agents/claude-cli/register.js";
|
|
72
72
|
import { getCachedSubscriptionModels, listOpenRouterModels, prefetchSubscriptionModels, } from "../integrations/provider-discovery.js";
|
|
73
73
|
import { onAgentEvent } from "../agents/agent-event-bus.js";
|
|
74
74
|
import { InMemoryApprovalBridge, setActiveApprovalBridge, } from "../agents/approval-bridge.js";
|
|
@@ -3006,7 +3006,10 @@ async function continueBoot(args) {
|
|
|
3006
3006
|
// so merge them explicitly; registry entries win on id collision.
|
|
3007
3007
|
if (isClaudeCliAvailable()) {
|
|
3008
3008
|
const seenCli = new Set(merged.map((m) => `${m.provider}/${m.id}`));
|
|
3009
|
-
|
|
3009
|
+
// Live model set from the account's `/v1/models` (Fable 5, Sonnet 5,
|
|
3010
|
+
// …); falls back to the static catalog internally on any failure.
|
|
3011
|
+
const cliModels = await listClaudeCliModelsLive().catch(() => listClaudeCliModels());
|
|
3012
|
+
for (const cm of cliModels) {
|
|
3010
3013
|
if (!seenCli.has(`${cm.provider}/${cm.id}`))
|
|
3011
3014
|
merged.push(cm);
|
|
3012
3015
|
}
|