@stigmer/server 3.16.0 → 3.16.1-dev.20260917224426
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/boot/compose.d.ts +12 -0
- package/dist/boot/compose.d.ts.map +1 -1
- package/dist/boot/compose.js +2 -0
- package/dist/boot/compose.js.map +1 -1
- package/dist/domain/platform/controller.d.ts +7 -0
- package/dist/domain/platform/controller.d.ts.map +1 -1
- package/dist/domain/platform/controller.js +2 -3
- package/dist/domain/platform/controller.js.map +1 -1
- package/dist/domain/plugin/materialize/agent.d.ts +10 -1
- package/dist/domain/plugin/materialize/agent.d.ts.map +1 -1
- package/dist/domain/plugin/materialize/agent.js +35 -1
- package/dist/domain/plugin/materialize/agent.js.map +1 -1
- package/dist/domain/plugin/materialize/plan.d.ts.map +1 -1
- package/dist/domain/plugin/materialize/plan.js +1 -1
- package/dist/domain/plugin/materialize/plan.js.map +1 -1
- package/dist/domain/project/reconcile.d.ts.map +1 -1
- package/dist/domain/project/reconcile.js +14 -10
- package/dist/domain/project/reconcile.js.map +1 -1
- package/package.json +5 -5
- package/src/boot/compose.ts +14 -0
- package/src/domain/platform/__tests__/platform.test.ts +47 -1
- package/src/domain/platform/controller.ts +9 -3
- package/src/domain/plugin/__tests__/materialize.test.ts +60 -1
- package/src/domain/plugin/__tests__/plugin.test.ts +6 -0
- package/src/domain/plugin/materialize/agent.ts +38 -0
- package/src/domain/plugin/materialize/plan.ts +7 -1
- package/src/domain/project/__tests__/reconcile.test.ts +51 -5
- package/src/domain/project/reconcile.ts +20 -15
package/dist/boot/compose.d.ts
CHANGED
|
@@ -94,6 +94,18 @@ export interface ComposeOptions {
|
|
|
94
94
|
* conformance rosters.
|
|
95
95
|
*/
|
|
96
96
|
extensions?: ReadonlyArray<ServerExtension>;
|
|
97
|
+
/**
|
|
98
|
+
* The release this server reports through getServerInfo. Defaults to
|
|
99
|
+
* SERVER_VERSION: the esbuild define the all-in-one bundle stamps, or
|
|
100
|
+
* "dev" when unbundled. A composition that consumes @stigmer/server as a
|
|
101
|
+
* library runs no bundle and would otherwise report "dev" whatever
|
|
102
|
+
* release it installed, so it states the version of the package it
|
|
103
|
+
* composes (the installed package's own manifest is the honest source).
|
|
104
|
+
* A fact about the library the consumer installed, not about any
|
|
105
|
+
* extension unit — which is why it lives here and not on
|
|
106
|
+
* ServerExtension beside `edition`.
|
|
107
|
+
*/
|
|
108
|
+
version?: string;
|
|
97
109
|
/** Test seam forwarded to the model-registry upstream fetch. */
|
|
98
110
|
fetchImpl?: typeof fetch;
|
|
99
111
|
/** Test seam: bind an ephemeral port instead of config.grpcPort. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/boot/compose.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AA2BpE,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAIzE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAmCzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/boot/compose.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AA2BpE,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAIzE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAmCzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAiClE,OAAO,EAKL,aAAa,EAEd,MAAM,6BAA6B,CAAC;AA0BrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAWjE,OAAO,EAAE,YAAY,IAAI,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAW7G,OAAO,EAAE,WAAW,EAAyB,MAAM,wBAAwB,CAAC;AAQ5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,+EAA+E;IAC/E,KAAK,EAAE,KAAK,CAAC;IACb;;;;;;;;;OASG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB;;;;;OAKG;IACH,eAAe,EAAE,eAAe,CAAC;IACjC;;;;;OAKG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;IACrC;;;;OAIG;IACH,0BAA0B,EAAE,YAAY,CAAC;IACzC;;;;;OAKG;IACH,6BAA6B,EAAE,6BAA6B,CAAC;IAC7D;;;;;;;;;OASG;IACH,kBAAkB,EAAE,SAAS,CAAC;IAC9B;;;;;;;;OAQG;IACH,iBAAiB,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACnD;;;;;OAKG;IACH,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;IACxC,+EAA+E;IAC/E,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,kEAAkE;IAClE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC5C;;;;;;;;;;OAUG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,oEAAoE;IACpE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CAw5CzB"}
|
package/dist/boot/compose.js
CHANGED
|
@@ -84,6 +84,7 @@ import { registerOAuthAppServices } from "../domain/oauthapp/controller.js";
|
|
|
84
84
|
import { registerOrganizationServices } from "../domain/organization/controller.js";
|
|
85
85
|
import { registerMcpServerServices } from "../domain/mcpserver/controller.js";
|
|
86
86
|
import { registerPlatformServices } from "../domain/platform/controller.js";
|
|
87
|
+
import { SERVER_VERSION } from "../domain/platform/version.js";
|
|
87
88
|
import { registerProjectServices } from "../domain/project/controller.js";
|
|
88
89
|
import { registerSessionServices } from "../domain/session/controller.js";
|
|
89
90
|
import { registerPluginServices } from "../domain/plugin/controller.js";
|
|
@@ -1187,6 +1188,7 @@ export async function composeServer(options) {
|
|
|
1187
1188
|
temporalNamespace: config.temporalNamespace,
|
|
1188
1189
|
runnerAuthService: runnerCredentials,
|
|
1189
1190
|
edition: extensions.edition,
|
|
1191
|
+
version: options.version ?? SERVER_VERSION,
|
|
1190
1192
|
logger,
|
|
1191
1193
|
});
|
|
1192
1194
|
// Extension services register after the whole OSS set, inside the ONE
|
package/dist/boot/compose.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/boot/compose.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/boot/compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,13 @@ export interface PlatformControllerDeps {
|
|
|
66
66
|
* cloud composition answers `cloud` without forking this controller.
|
|
67
67
|
*/
|
|
68
68
|
readonly edition: ServerEdition;
|
|
69
|
+
/**
|
|
70
|
+
* The release reported beside the edition. The composition root resolves
|
|
71
|
+
* it (ComposeOptions.version, else SERVER_VERSION), so this controller
|
|
72
|
+
* never reads the build stamp itself: a library consumer with no bundle
|
|
73
|
+
* states its installed release and answers exactly as a bundle would.
|
|
74
|
+
*/
|
|
75
|
+
readonly version: string;
|
|
69
76
|
readonly logger: Logger;
|
|
70
77
|
}
|
|
71
78
|
/** Registers the platform query service on the router (routes stage). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/domain/platform/controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AAGzE,OAAO,EAKL,aAAa,EACd,MAAM,uDAAuD,CAAC;AAQ/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,gDAAgD,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/domain/platform/controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AAGzE,OAAO,EAKL,aAAa,EACd,MAAM,uDAAuD,CAAC;AAQ/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,gDAAgD,CAAC;AAGxD,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IACrD;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,yEAAyE;AACzE,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,sBAAsB,GAC3B,IAAI,CAQN"}
|
|
@@ -2,7 +2,6 @@ import { create } from "@bufbuild/protobuf";
|
|
|
2
2
|
import { GetRunnerBootstrapConfigOutputSchema, GetRunnerScopedTokenOutputSchema, GetServerInfoOutputSchema, PlatformQueryController, } from "@stigmer/protos/ai/stigmer/platform/v1/server_info_pb";
|
|
3
3
|
import { callerIdentityOf } from "../../pipeline/interceptors/auth.js";
|
|
4
4
|
import { TOKEN_TYPE_EXECUTION_SCOPED } from "../../runnerauth/runnerauth.js";
|
|
5
|
-
import { SERVER_VERSION } from "./version.js";
|
|
6
5
|
/** Registers the platform query service on the router (routes stage). */
|
|
7
6
|
export function registerPlatformServices(router, deps) {
|
|
8
7
|
router.service(PlatformQueryController, {
|
|
@@ -11,11 +10,11 @@ export function registerPlatformServices(router, deps) {
|
|
|
11
10
|
getRunnerScopedToken: (input, ctx) => getRunnerScopedToken(deps, input, ctx),
|
|
12
11
|
});
|
|
13
12
|
}
|
|
14
|
-
/** Go GetServerInfo: the server edition and
|
|
13
|
+
/** Go GetServerInfo: the server edition and release version. */
|
|
15
14
|
function getServerInfo(deps) {
|
|
16
15
|
return create(GetServerInfoOutputSchema, {
|
|
17
16
|
edition: deps.edition,
|
|
18
|
-
version:
|
|
17
|
+
version: deps.version,
|
|
19
18
|
});
|
|
20
19
|
}
|
|
21
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/domain/platform/controller.ts"],"names":[],"mappings":"AA0CA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EACL,oCAAoC,EACpC,gCAAgC,EAChC,yBAAyB,EACzB,uBAAuB,GAExB,MAAM,uDAAuD,CAAC;AAS/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAKvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/domain/platform/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { PluginPackage } from "@stigmer/plugin-package";
|
|
2
|
+
import type { EnvVarDeclaration } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/spec_pb";
|
|
2
3
|
import type { Agent } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/api_pb";
|
|
3
4
|
import type { PluginWarning } from "@stigmer/protos/ai/stigmer/agentic/plugin/v1/status_pb";
|
|
4
5
|
import type { PluginIdentity } from "./identity.js";
|
|
6
|
+
import type { PlannedMcpServer } from "./mcp-servers.js";
|
|
5
7
|
export interface PlannedAgent {
|
|
6
8
|
readonly name: string;
|
|
7
9
|
readonly slug: string;
|
|
@@ -9,5 +11,12 @@ export interface PlannedAgent {
|
|
|
9
11
|
}
|
|
10
12
|
/** Whether the plugin materialises an agent at all. */
|
|
11
13
|
export declare function carriesAgent(plugin: PluginPackage): boolean;
|
|
12
|
-
export declare function planAgent(plugin: PluginPackage, overlayAgent: Agent | undefined, identity: PluginIdentity, warnings: PluginWarning[]): PlannedAgent | undefined;
|
|
14
|
+
export declare function planAgent(plugin: PluginPackage, overlayAgent: Agent | undefined, mcpServers: readonly PlannedMcpServer[], identity: PluginIdentity, warnings: PluginWarning[]): PlannedAgent | undefined;
|
|
15
|
+
/**
|
|
16
|
+
* The variables the agent's tools need from the user: every server's
|
|
17
|
+
* declarations, minus each server's OAuth target. Two servers declaring
|
|
18
|
+
* one name share one declaration; the first server's wins, and the
|
|
19
|
+
* library already refuses a plugin whose variables disagree about a name.
|
|
20
|
+
*/
|
|
21
|
+
export declare function toolVariables(mcpServers: readonly PlannedMcpServer[]): Record<string, EnvVarDeclaration>;
|
|
13
22
|
//# sourceMappingURL=agent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/agent.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2DAA2D,CAAC;AAEnG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oDAAoD,CAAC;AAShF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AAU5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC;CAC1B;AAED,uDAAuD;AACvD,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAM3D;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,KAAK,GAAG,SAAS,EAC/B,UAAU,EAAE,SAAS,gBAAgB,EAAE,EACvC,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,aAAa,EAAE,GACxB,YAAY,GAAG,SAAS,CAyD1B;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,SAAS,gBAAgB,EAAE,GACtC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAYnC"}
|
|
@@ -14,6 +14,18 @@
|
|
|
14
14
|
* `mcp_server_usage`, every `agents/*.md` as a `sub_agent` with access to
|
|
15
15
|
* all the plugin's servers and the skills it asked for.
|
|
16
16
|
*
|
|
17
|
+
* The composed agent declares in `env` the union of its servers' variables,
|
|
18
|
+
* OAuth-managed target variables excluded. An execution filters its
|
|
19
|
+
* environment to the AGENT's declared keys, and every client's session
|
|
20
|
+
* start asks the user for the AGENT's declared keys, so an agent declaring
|
|
21
|
+
* nothing over a server declaring `${API_TOKEN}` is never asked for the
|
|
22
|
+
* token and fails at its first tool call. The declaration on the agent is
|
|
23
|
+
* what routes the user's values to the execution; the declaration on the
|
|
24
|
+
* server stays too (the connect flow and the runner's per-server filter
|
|
25
|
+
* read it there). An OAuth target is excluded because its value is injected
|
|
26
|
+
* from a managed environment, never asked of the user. An author's
|
|
27
|
+
* `agent.yaml` is taken as written: they chose what to declare.
|
|
28
|
+
*
|
|
17
29
|
* Model hints are recorded, never applied: a dialect's `model` becomes a
|
|
18
30
|
* status warning and the sub-agent runs on the session's model. The
|
|
19
31
|
* catalog seam exposes neither family nor cost tier, the runner drops a
|
|
@@ -39,7 +51,7 @@ export function carriesAgent(plugin) {
|
|
|
39
51
|
plugin.subAgents.length > 0 ||
|
|
40
52
|
plugin.overlay.agent !== undefined);
|
|
41
53
|
}
|
|
42
|
-
export function planAgent(plugin, overlayAgent, identity, warnings) {
|
|
54
|
+
export function planAgent(plugin, overlayAgent, mcpServers, identity, warnings) {
|
|
43
55
|
if (!carriesAgent(plugin)) {
|
|
44
56
|
return undefined;
|
|
45
57
|
}
|
|
@@ -60,6 +72,7 @@ export function planAgent(plugin, overlayAgent, identity, warnings) {
|
|
|
60
72
|
const spec = create(AgentSpecSchema, {
|
|
61
73
|
description: plugin.description ?? "",
|
|
62
74
|
instructions: renderDefaultAgentInstructions(plugin),
|
|
75
|
+
env: toolVariables(mcpServers),
|
|
63
76
|
skillRefs: [...skillSlugByName.values()].map((slug) => create(ApiResourceReferenceSchema, {
|
|
64
77
|
org: identity.org,
|
|
65
78
|
kind: ApiResourceKind.skill,
|
|
@@ -84,6 +97,27 @@ export function planAgent(plugin, overlayAgent, identity, warnings) {
|
|
|
84
97
|
}),
|
|
85
98
|
};
|
|
86
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* The variables the agent's tools need from the user: every server's
|
|
102
|
+
* declarations, minus each server's OAuth target. Two servers declaring
|
|
103
|
+
* one name share one declaration; the first server's wins, and the
|
|
104
|
+
* library already refuses a plugin whose variables disagree about a name.
|
|
105
|
+
*/
|
|
106
|
+
export function toolVariables(mcpServers) {
|
|
107
|
+
const declarations = {};
|
|
108
|
+
for (const server of mcpServers) {
|
|
109
|
+
const spec = server.resource.spec;
|
|
110
|
+
if (spec === undefined)
|
|
111
|
+
continue;
|
|
112
|
+
const oauthTarget = spec.auth?.targetEnvVar ?? "";
|
|
113
|
+
for (const [name, declaration] of Object.entries(spec.env)) {
|
|
114
|
+
if (name === oauthTarget || name in declarations)
|
|
115
|
+
continue;
|
|
116
|
+
declarations[name] = declaration;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return declarations;
|
|
120
|
+
}
|
|
87
121
|
function planSubAgent(subAgent, identity, serverSlugs, skillSlugByName, warnings) {
|
|
88
122
|
if (BUILT_IN_SUB_AGENT_NAMES.has(subAgent.name)) {
|
|
89
123
|
warnings.push(create(PluginWarningSchema, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/agent.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/plan.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC;IACzC,QAAQ,CAAC,UAAU,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAC3C,4EAA4E;IAC5E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;CAC7C;AAED,oFAAoF;AACpF,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,QAAQ,EAAE,aAAa,EAAE,GACxB,MAAM,CAgBR;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,GACd,mBAAmB,
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/plan.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC;IACzC,QAAQ,CAAC,UAAU,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAC3C,4EAA4E;IAC5E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;CAC7C;AAED,oFAAoF;AACpF,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,QAAQ,EAAE,aAAa,EAAE,GACxB,MAAM,CAgBR;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,GACd,mBAAmB,CAuDrB"}
|
|
@@ -50,7 +50,7 @@ export function planMaterialization(plugin, files, overlays, identity, message)
|
|
|
50
50
|
document.server,
|
|
51
51
|
document.resource,
|
|
52
52
|
])), identity);
|
|
53
|
-
const agent = planAgent(plugin, overlays.agent?.resource, identity, warnings);
|
|
53
|
+
const agent = planAgent(plugin, overlays.agent?.resource, mcpServers, identity, warnings);
|
|
54
54
|
const workflows = planWorkflows(overlays.workflows, identity);
|
|
55
55
|
const members = [
|
|
56
56
|
...skills.map((skill) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/plan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,qFAAqF,CAAC;AAEtH,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAe/C,oFAAoF;AACpF,MAAM,UAAU,UAAU,CACxB,OAA2B,EAC3B,QAAyB;IAEzB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,QAAQ,CAAC,IAAI,CACX,MAAM,CAAC,mBAAmB,EAAE;QAC1B,IAAI,EAAE,oBAAoB,CAAC,kBAAkB;QAC7C,OAAO,EACL,YAAY,OAAO,8DAA8D;YACjF,yDAAyD;KAC5D,CAAC,CACH,CAAC;IACF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAqB,EACrB,KAAkB,EAClB,QAAwB,EACxB,QAAwB,EACxB,OAAe;IAEf,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,CACX,MAAM,CAAC,mBAAmB,EAAE;YAC1B,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;YAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ,OAAO,CAAC,IAAI,+FAA+F;SAC5I,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,cAAc,CAC/B,MAAM,EACN,IAAI,GAAG,CACL,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpC,QAAQ,CAAC,MAAM;QACf,QAAQ,CAAC,QAAQ;KAClB,CAAC,CACH,EACD,QAAQ,CACT,CAAC;IACF,MAAM,KAAK,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/domain/plugin/materialize/plan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,qFAAqF,CAAC;AAEtH,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAe/C,oFAAoF;AACpF,MAAM,UAAU,UAAU,CACxB,OAA2B,EAC3B,QAAyB;IAEzB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,QAAQ,CAAC,IAAI,CACX,MAAM,CAAC,mBAAmB,EAAE;QAC1B,IAAI,EAAE,oBAAoB,CAAC,kBAAkB;QAC7C,OAAO,EACL,YAAY,OAAO,8DAA8D;YACjF,yDAAyD;KAC5D,CAAC,CACH,CAAC;IACF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAqB,EACrB,KAAkB,EAClB,QAAwB,EACxB,QAAwB,EACxB,OAAe;IAEf,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,CACX,MAAM,CAAC,mBAAmB,EAAE;YAC1B,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;YAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ,OAAO,CAAC,IAAI,+FAA+F;SAC5I,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,cAAc,CAC/B,MAAM,EACN,IAAI,GAAG,CACL,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpC,QAAQ,CAAC,MAAM;QACf,QAAQ,CAAC,QAAQ;KAClB,CAAC,CACH,EACD,QAAQ,CACT,CAAC;IACF,MAAM,KAAK,GAAG,SAAS,CACrB,MAAM,EACN,QAAQ,CAAC,KAAK,EAAE,QAAQ,EACxB,UAAU,EACV,QAAQ,EACR,QAAQ,CACT,CAAC;IACF,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAoB;QAC/B,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACxB,IAAI,EAAE,eAAe,CAAC,KAAK;YAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;QACH,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,eAAe,CAAC,UAAU;YAChC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAC,CAAC;QACH,GAAG,CAAC,KAAK,KAAK,SAAS;YACrB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1E,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,eAAe,CAAC,QAAQ;YAC9B,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAC;KACJ,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;AAC1E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../src/domain/project/reconcile.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,eAAe,EAAE,MAAM,qFAAqF,CAAC;AACtH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAEjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAErG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../src/domain/project/reconcile.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,eAAe,EAAE,MAAM,qFAAqF,CAAC;AACtH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAEjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAErG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC,8DAA8D;IAC9D,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,8DAA8D;IAC9D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,8BAA8B,EAAE,qBAG5C,CAAC;AAEF,4EAA4E;AAC5E,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,2DAA2D;AAC3D,MAAM,WAAW,oBAAoB;IACnC,yEAAyE;IACzE,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACpD;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,SAAS,CACP,eAAe,EAAE,aAAa,CAAC,oBAAoB,CAAC,EACpD,cAAc,EAAE,aAAa,CAAC,oBAAoB,CAAC,EACnD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,aAAa,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,yBAAyB,GAC9B,qBAAqB,CA+BvB;AAmHD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,oBAAoB,GAAG,MAAM,CAE9D;AAYD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,oBAAoB,GAC3B,qBAAqB,CAMvB"}
|
|
@@ -32,6 +32,7 @@ import { SkillSchema } from "@stigmer/protos/ai/stigmer/agentic/skill/v1/api_pb"
|
|
|
32
32
|
import { WorkflowSchema } from "@stigmer/protos/ai/stigmer/agentic/workflow/v1/api_pb";
|
|
33
33
|
import { ApiResourceKind } from "@stigmer/protos/ai/stigmer/commons/apiresource/apiresourcekind/api_resource_kind_pb";
|
|
34
34
|
import { ReconciliationSummarySchema } from "@stigmer/protos/ai/stigmer/tenancy/project/v1/status_pb";
|
|
35
|
+
import { findResourceBySlug } from "../../pipeline/steps/helpers.js";
|
|
35
36
|
import { metadataOf } from "../../pipeline/steps/shapes.js";
|
|
36
37
|
export const DEFAULT_RECONCILIATION_OPTIONS = {
|
|
37
38
|
pruneEnabled: true,
|
|
@@ -108,19 +109,22 @@ async function deleteOrphans(deps, orphans) {
|
|
|
108
109
|
return { removed, errors };
|
|
109
110
|
}
|
|
110
111
|
/**
|
|
111
|
-
* Resolves an orphan reference to its resource id
|
|
112
|
-
*
|
|
113
|
-
*
|
|
114
|
-
*
|
|
112
|
+
* Resolves an orphan reference to its resource id, within the org the
|
|
113
|
+
* reference names. Slugs are org-scoped identifiers: a local backend holds
|
|
114
|
+
* the `stigmer` system org beside the user's, a self-host holds many, and
|
|
115
|
+
* the same slug may exist in several. The Go port matched by slug alone and
|
|
116
|
+
* could prune another org's resource (stigmer/stigmer#1151); the CLI has
|
|
117
|
+
* always stamped `org` on every member reference, so scoping is a change
|
|
118
|
+
* of lookup, not of contract. A reference without an org (a project written
|
|
119
|
+
* before members carried one) keeps the unscoped match, the helper's
|
|
120
|
+
* documented empty-org arm.
|
|
115
121
|
*/
|
|
116
122
|
async function resolveResourceId(store, ref) {
|
|
117
123
|
const schema = schemaForKind(ref.kind);
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
catch (cause) {
|
|
123
|
-
throw new Error(`resource ${kindName(ref.kind)}/${ref.slug} not found: ${cause instanceof Error ? cause.message : String(cause)}`, { cause });
|
|
124
|
+
const resource = await findResourceBySlug(store, ref.kind, schema, ref.slug, ref.org);
|
|
125
|
+
if (resource === undefined) {
|
|
126
|
+
const where = ref.org === "" ? "" : ` in org '${ref.org}'`;
|
|
127
|
+
throw new Error(`resource ${kindName(ref.kind)}/${ref.slug} not found${where}`);
|
|
124
128
|
}
|
|
125
129
|
const id = metadataOf(resource)?.id ?? "";
|
|
126
130
|
if (id === "") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/domain/project/reconcile.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/domain/project/reconcile.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stigmer/server",
|
|
3
|
-
"version": "3.16.
|
|
3
|
+
"version": "3.16.1-dev.20260917224426",
|
|
4
4
|
"description": "The Stigmer OSS control plane as a composable library: composeServer, the extension registry and the driver seams a composition builds on. The self-contained deployable of the same server is @stigmer/server-slim.",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -62,10 +62,10 @@
|
|
|
62
62
|
"@connectrpc/connect-node": "^2.0.0",
|
|
63
63
|
"@kubernetes/client-node": "2.0.0",
|
|
64
64
|
"@opentelemetry/api": "^1.9.0",
|
|
65
|
-
"@stigmer/plugin-package": "3.16.
|
|
66
|
-
"@stigmer/protos": "3.16.
|
|
67
|
-
"@stigmer/temporal-codecs": "3.16.
|
|
68
|
-
"@stigmer/zip-structure": "3.16.
|
|
65
|
+
"@stigmer/plugin-package": "3.16.1-dev.20260917224426",
|
|
66
|
+
"@stigmer/protos": "3.16.1-dev.20260917224426",
|
|
67
|
+
"@stigmer/temporal-codecs": "3.16.1-dev.20260917224426",
|
|
68
|
+
"@stigmer/zip-structure": "3.16.1-dev.20260917224426",
|
|
69
69
|
"@temporalio/activity": "1.16.2",
|
|
70
70
|
"@temporalio/client": "1.16.2",
|
|
71
71
|
"@temporalio/common": "1.16.2",
|
package/src/boot/compose.ts
CHANGED
|
@@ -108,6 +108,7 @@ import { registerOAuthAppServices } from "../domain/oauthapp/controller.js";
|
|
|
108
108
|
import { registerOrganizationServices } from "../domain/organization/controller.js";
|
|
109
109
|
import { registerMcpServerServices } from "../domain/mcpserver/controller.js";
|
|
110
110
|
import { registerPlatformServices } from "../domain/platform/controller.js";
|
|
111
|
+
import { SERVER_VERSION } from "../domain/platform/version.js";
|
|
111
112
|
import { registerProjectServices } from "../domain/project/controller.js";
|
|
112
113
|
import { registerSessionServices } from "../domain/session/controller.js";
|
|
113
114
|
import { registerPluginServices } from "../domain/plugin/controller.js";
|
|
@@ -282,6 +283,18 @@ export interface ComposeOptions {
|
|
|
282
283
|
* conformance rosters.
|
|
283
284
|
*/
|
|
284
285
|
extensions?: ReadonlyArray<ServerExtension>;
|
|
286
|
+
/**
|
|
287
|
+
* The release this server reports through getServerInfo. Defaults to
|
|
288
|
+
* SERVER_VERSION: the esbuild define the all-in-one bundle stamps, or
|
|
289
|
+
* "dev" when unbundled. A composition that consumes @stigmer/server as a
|
|
290
|
+
* library runs no bundle and would otherwise report "dev" whatever
|
|
291
|
+
* release it installed, so it states the version of the package it
|
|
292
|
+
* composes (the installed package's own manifest is the honest source).
|
|
293
|
+
* A fact about the library the consumer installed, not about any
|
|
294
|
+
* extension unit — which is why it lives here and not on
|
|
295
|
+
* ServerExtension beside `edition`.
|
|
296
|
+
*/
|
|
297
|
+
version?: string;
|
|
285
298
|
/** Test seam forwarded to the model-registry upstream fetch. */
|
|
286
299
|
fetchImpl?: typeof fetch;
|
|
287
300
|
/** Test seam: bind an ephemeral port instead of config.grpcPort. */
|
|
@@ -1472,6 +1485,7 @@ export async function composeServer(
|
|
|
1472
1485
|
temporalNamespace: config.temporalNamespace,
|
|
1473
1486
|
runnerAuthService: runnerCredentials,
|
|
1474
1487
|
edition: extensions.edition,
|
|
1488
|
+
version: options.version ?? SERVER_VERSION,
|
|
1475
1489
|
logger,
|
|
1476
1490
|
});
|
|
1477
1491
|
// Extension services register after the whole OSS set, inside the ONE
|
|
@@ -14,7 +14,10 @@
|
|
|
14
14
|
* executioncontext decrypt lane uses, bound to exactly the named
|
|
15
15
|
* execution id;
|
|
16
16
|
* - getRunnerBootstrapConfig echoes the configured Temporal coordinates
|
|
17
|
-
* with the token fields empty (minting a proxy token is cloud-only)
|
|
17
|
+
* with the token fields empty (minting a proxy token is cloud-only);
|
|
18
|
+
* - getServerInfo reports the build stamp by default and the release a
|
|
19
|
+
* library consumer states through ComposeOptions.version otherwise
|
|
20
|
+
* (stigmer#1168: unbundled, the stamp is always "dev").
|
|
18
21
|
*/
|
|
19
22
|
import { mkdtempSync, rmSync } from "node:fs";
|
|
20
23
|
import { tmpdir } from "node:os";
|
|
@@ -178,6 +181,48 @@ describe("platform domain (composed server)", () => {
|
|
|
178
181
|
});
|
|
179
182
|
});
|
|
180
183
|
|
|
184
|
+
describe("platform domain (composed with a stated version)", () => {
|
|
185
|
+
let server: ComposedServer;
|
|
186
|
+
let client: PlatformClient;
|
|
187
|
+
let dir: string;
|
|
188
|
+
|
|
189
|
+
beforeAll(async () => {
|
|
190
|
+
dir = mkdtempSync(path.join(tmpdir(), "platform-domain-version-test-"));
|
|
191
|
+
vi.stubEnv("STIGMER_ENCRYPTION_KEY", ENC_KEY.toString("base64"));
|
|
192
|
+
server = await composeServer({
|
|
193
|
+
config: loadConfig({
|
|
194
|
+
STIGMER_MODEL_REGISTRY_REFRESH: "off",
|
|
195
|
+
DB_PATH: path.join(dir, "stigmer.db"),
|
|
196
|
+
ARTIFACT_LOCAL_BASE_PATH: path.join(dir, "artifacts"),
|
|
197
|
+
}),
|
|
198
|
+
logger: silentLogger,
|
|
199
|
+
version: "3.99.0",
|
|
200
|
+
portOverride: 0,
|
|
201
|
+
host: "127.0.0.1",
|
|
202
|
+
});
|
|
203
|
+
const port = await server.start();
|
|
204
|
+
client = createClient(
|
|
205
|
+
PlatformQueryController,
|
|
206
|
+
createGrpcTransport({ baseUrl: `http://127.0.0.1:${port}` }),
|
|
207
|
+
);
|
|
208
|
+
});
|
|
209
|
+
|
|
210
|
+
afterAll(async () => {
|
|
211
|
+
await server.shutdown();
|
|
212
|
+
rmSync(dir, { recursive: true, force: true });
|
|
213
|
+
vi.unstubAllEnvs();
|
|
214
|
+
});
|
|
215
|
+
|
|
216
|
+
it("getServerInfo reports the composition's stated release, not the build stamp", async () => {
|
|
217
|
+
// A library consumer (the cloud composition) runs no bundle, so the
|
|
218
|
+
// define is never stamped for it; ComposeOptions.version is how it
|
|
219
|
+
// states the release it installed. Edition is untouched by it.
|
|
220
|
+
const info = await client.getServerInfo({});
|
|
221
|
+
expect(info.version).toBe("3.99.0");
|
|
222
|
+
expect(info.edition).toBe(ServerEdition.oss);
|
|
223
|
+
});
|
|
224
|
+
});
|
|
225
|
+
|
|
181
226
|
describe("platform domain (keyless runner-token service)", () => {
|
|
182
227
|
it("a keyless service answers not-minted — fail-soft, never an error", async () => {
|
|
183
228
|
const transport = createRouterTransport((router) => {
|
|
@@ -188,6 +233,7 @@ describe("platform domain (keyless runner-token service)", () => {
|
|
|
188
233
|
RunnerAuthService.create(undefined),
|
|
189
234
|
),
|
|
190
235
|
edition: ServerEdition.oss,
|
|
236
|
+
version: "dev",
|
|
191
237
|
logger: silentLogger,
|
|
192
238
|
});
|
|
193
239
|
});
|
|
@@ -63,7 +63,6 @@ import type {
|
|
|
63
63
|
RunnerScopedTokenRequest,
|
|
64
64
|
} from "../../runnerauth/runner-credential-provider.js";
|
|
65
65
|
import { TOKEN_TYPE_EXECUTION_SCOPED } from "../../runnerauth/runnerauth.js";
|
|
66
|
-
import { SERVER_VERSION } from "./version.js";
|
|
67
66
|
|
|
68
67
|
export interface PlatformControllerDeps {
|
|
69
68
|
/**
|
|
@@ -88,6 +87,13 @@ export interface PlatformControllerDeps {
|
|
|
88
87
|
* cloud composition answers `cloud` without forking this controller.
|
|
89
88
|
*/
|
|
90
89
|
readonly edition: ServerEdition;
|
|
90
|
+
/**
|
|
91
|
+
* The release reported beside the edition. The composition root resolves
|
|
92
|
+
* it (ComposeOptions.version, else SERVER_VERSION), so this controller
|
|
93
|
+
* never reads the build stamp itself: a library consumer with no bundle
|
|
94
|
+
* states its installed release and answers exactly as a bundle would.
|
|
95
|
+
*/
|
|
96
|
+
readonly version: string;
|
|
91
97
|
readonly logger: Logger;
|
|
92
98
|
}
|
|
93
99
|
|
|
@@ -105,11 +111,11 @@ export function registerPlatformServices(
|
|
|
105
111
|
});
|
|
106
112
|
}
|
|
107
113
|
|
|
108
|
-
/** Go GetServerInfo: the server edition and
|
|
114
|
+
/** Go GetServerInfo: the server edition and release version. */
|
|
109
115
|
function getServerInfo(deps: PlatformControllerDeps): GetServerInfoOutput {
|
|
110
116
|
return create(GetServerInfoOutputSchema, {
|
|
111
117
|
edition: deps.edition,
|
|
112
|
-
version:
|
|
118
|
+
version: deps.version,
|
|
113
119
|
});
|
|
114
120
|
}
|
|
115
121
|
|
|
@@ -7,7 +7,9 @@
|
|
|
7
7
|
* agent, the `mcpServers` key-to-slug rule, a skill archive rooted at its
|
|
8
8
|
* SKILL.md with the plugin's labels on the request, a version the tag
|
|
9
9
|
* pattern rejects becoming a warning, an overlay that redefines the
|
|
10
|
-
* transport refused,
|
|
10
|
+
* transport refused, the composed agent declaring its tools' variables
|
|
11
|
+
* (OAuth targets excluded, an authored agent left as written), and the
|
|
12
|
+
* convergence and drop rules over members.
|
|
11
13
|
*/
|
|
12
14
|
import { describe, expect, it } from "vitest";
|
|
13
15
|
|
|
@@ -19,8 +21,11 @@ import type { PluginPackage } from "@stigmer/plugin-package";
|
|
|
19
21
|
import { cursorPlugin, openPlugin } from "@stigmer/plugin-package/testing";
|
|
20
22
|
import type { PluginFixture } from "@stigmer/plugin-package/testing";
|
|
21
23
|
import { create } from "@bufbuild/protobuf";
|
|
24
|
+
import { AgentSchema } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/api_pb";
|
|
25
|
+
import { AgentSpecSchema } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb";
|
|
22
26
|
import { McpServerSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/api_pb";
|
|
23
27
|
import {
|
|
28
|
+
McpServerAuthSchema,
|
|
24
29
|
McpServerSpecSchema,
|
|
25
30
|
StdioServerConfigSchema,
|
|
26
31
|
} from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/spec_pb";
|
|
@@ -224,6 +229,60 @@ describe("planMaterialization", () => {
|
|
|
224
229
|
expect(builtPlan.skills[0]!.request.tag).toBe("");
|
|
225
230
|
});
|
|
226
231
|
|
|
232
|
+
it("declares the servers' variables on the composed agent so a session asks for them", () => {
|
|
233
|
+
expect(plan.agent!.resource.spec?.env).toEqual({
|
|
234
|
+
GITHUB_TOKEN: expect.objectContaining({ isSecret: true, optional: false }),
|
|
235
|
+
});
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
it("leaves an OAuth-managed target out of the agent's declarations", () => {
|
|
239
|
+
const overlay = create(McpServerSchema, {
|
|
240
|
+
spec: create(McpServerSpecSchema, {
|
|
241
|
+
auth: create(McpServerAuthSchema, { targetEnvVar: "GITHUB_TOKEN" }),
|
|
242
|
+
}),
|
|
243
|
+
});
|
|
244
|
+
const withOAuth = planMaterialization(
|
|
245
|
+
pkg,
|
|
246
|
+
inMemoryPluginFiles(thermos),
|
|
247
|
+
{
|
|
248
|
+
workflows: [],
|
|
249
|
+
mcpServers: [
|
|
250
|
+
{
|
|
251
|
+
path: "ai.stigmer/mcp-servers/my_github.yaml",
|
|
252
|
+
server: "my_github",
|
|
253
|
+
resource: overlay,
|
|
254
|
+
},
|
|
255
|
+
],
|
|
256
|
+
},
|
|
257
|
+
IDENTITY,
|
|
258
|
+
"",
|
|
259
|
+
);
|
|
260
|
+
// The server still declares it (the connect flow reads it there); the
|
|
261
|
+
// agent does not, because the value comes from a managed environment.
|
|
262
|
+
expect(withOAuth.mcpServers[0]!.resource.spec?.env).toHaveProperty("GITHUB_TOKEN");
|
|
263
|
+
expect(withOAuth.agent!.resource.spec?.env).toEqual({});
|
|
264
|
+
});
|
|
265
|
+
|
|
266
|
+
it("takes an authored agent as written, declarations included", () => {
|
|
267
|
+
const authored = create(AgentSchema, {
|
|
268
|
+
spec: create(AgentSpecSchema, {
|
|
269
|
+
instructions: "The author's own instructions for this agent.",
|
|
270
|
+
}),
|
|
271
|
+
});
|
|
272
|
+
const withOverlay = planMaterialization(
|
|
273
|
+
pkg,
|
|
274
|
+
inMemoryPluginFiles(thermos),
|
|
275
|
+
{
|
|
276
|
+
agent: { path: "ai.stigmer/agent.yaml", resource: authored },
|
|
277
|
+
workflows: [],
|
|
278
|
+
mcpServers: [],
|
|
279
|
+
},
|
|
280
|
+
IDENTITY,
|
|
281
|
+
"",
|
|
282
|
+
);
|
|
283
|
+
expect(withOverlay.agent!.resource.spec?.env).toEqual({});
|
|
284
|
+
});
|
|
285
|
+
|
|
227
286
|
it("refuses a server overlay that redefines the transport", () => {
|
|
228
287
|
const overlay = create(McpServerSchema, {
|
|
229
288
|
spec: create(McpServerSpecSchema, {
|
|
@@ -296,6 +296,12 @@ describe("Plugin push — materialisation", () => {
|
|
|
296
296
|
isSecret: true,
|
|
297
297
|
optional: false,
|
|
298
298
|
});
|
|
299
|
+
// The agent declares the same variable, which is what makes a session
|
|
300
|
+
// ask for it and the execution's least-privilege filter pass it.
|
|
301
|
+
expect(agent.spec?.env["GITHUB_TOKEN"]).toMatchObject({
|
|
302
|
+
isSecret: true,
|
|
303
|
+
optional: false,
|
|
304
|
+
});
|
|
299
305
|
});
|
|
300
306
|
|
|
301
307
|
it("installs an MCP-only plugin as its servers and no agent", async () => {
|
|
@@ -14,6 +14,18 @@
|
|
|
14
14
|
* `mcp_server_usage`, every `agents/*.md` as a `sub_agent` with access to
|
|
15
15
|
* all the plugin's servers and the skills it asked for.
|
|
16
16
|
*
|
|
17
|
+
* The composed agent declares in `env` the union of its servers' variables,
|
|
18
|
+
* OAuth-managed target variables excluded. An execution filters its
|
|
19
|
+
* environment to the AGENT's declared keys, and every client's session
|
|
20
|
+
* start asks the user for the AGENT's declared keys, so an agent declaring
|
|
21
|
+
* nothing over a server declaring `${API_TOKEN}` is never asked for the
|
|
22
|
+
* token and fails at its first tool call. The declaration on the agent is
|
|
23
|
+
* what routes the user's values to the execution; the declaration on the
|
|
24
|
+
* server stays too (the connect flow and the runner's per-server filter
|
|
25
|
+
* read it there). An OAuth target is excluded because its value is injected
|
|
26
|
+
* from a managed environment, never asked of the user. An author's
|
|
27
|
+
* `agent.yaml` is taken as written: they chose what to declare.
|
|
28
|
+
*
|
|
17
29
|
* Model hints are recorded, never applied: a dialect's `model` becomes a
|
|
18
30
|
* status warning and the sub-agent runs on the session's model. The
|
|
19
31
|
* catalog seam exposes neither family nor cost tier, the runner drops a
|
|
@@ -25,6 +37,7 @@
|
|
|
25
37
|
import { create } from "@bufbuild/protobuf";
|
|
26
38
|
|
|
27
39
|
import type { PluginPackage, PluginSubAgent } from "@stigmer/plugin-package";
|
|
40
|
+
import type { EnvVarDeclaration } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/spec_pb";
|
|
28
41
|
import { AgentSchema } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/api_pb";
|
|
29
42
|
import type { Agent } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/api_pb";
|
|
30
43
|
import {
|
|
@@ -47,6 +60,7 @@ import { renderDefaultAgentInstructions } from "./default-agent-instructions.js"
|
|
|
47
60
|
import { memberMetadata } from "./identity.js";
|
|
48
61
|
import type { PluginIdentity } from "./identity.js";
|
|
49
62
|
import { mcpServerSlugOf } from "./mcp-servers.js";
|
|
63
|
+
import type { PlannedMcpServer } from "./mcp-servers.js";
|
|
50
64
|
import { skillSlugOf } from "./skills.js";
|
|
51
65
|
|
|
52
66
|
export interface PlannedAgent {
|
|
@@ -67,6 +81,7 @@ export function carriesAgent(plugin: PluginPackage): boolean {
|
|
|
67
81
|
export function planAgent(
|
|
68
82
|
plugin: PluginPackage,
|
|
69
83
|
overlayAgent: Agent | undefined,
|
|
84
|
+
mcpServers: readonly PlannedMcpServer[],
|
|
70
85
|
identity: PluginIdentity,
|
|
71
86
|
warnings: PluginWarning[],
|
|
72
87
|
): PlannedAgent | undefined {
|
|
@@ -95,6 +110,7 @@ export function planAgent(
|
|
|
95
110
|
const spec = create(AgentSpecSchema, {
|
|
96
111
|
description: plugin.description ?? "",
|
|
97
112
|
instructions: renderDefaultAgentInstructions(plugin),
|
|
113
|
+
env: toolVariables(mcpServers),
|
|
98
114
|
skillRefs: [...skillSlugByName.values()].map((slug) =>
|
|
99
115
|
create(ApiResourceReferenceSchema, {
|
|
100
116
|
org: identity.org,
|
|
@@ -127,6 +143,28 @@ export function planAgent(
|
|
|
127
143
|
};
|
|
128
144
|
}
|
|
129
145
|
|
|
146
|
+
/**
|
|
147
|
+
* The variables the agent's tools need from the user: every server's
|
|
148
|
+
* declarations, minus each server's OAuth target. Two servers declaring
|
|
149
|
+
* one name share one declaration; the first server's wins, and the
|
|
150
|
+
* library already refuses a plugin whose variables disagree about a name.
|
|
151
|
+
*/
|
|
152
|
+
export function toolVariables(
|
|
153
|
+
mcpServers: readonly PlannedMcpServer[],
|
|
154
|
+
): Record<string, EnvVarDeclaration> {
|
|
155
|
+
const declarations: Record<string, EnvVarDeclaration> = {};
|
|
156
|
+
for (const server of mcpServers) {
|
|
157
|
+
const spec = server.resource.spec;
|
|
158
|
+
if (spec === undefined) continue;
|
|
159
|
+
const oauthTarget = spec.auth?.targetEnvVar ?? "";
|
|
160
|
+
for (const [name, declaration] of Object.entries(spec.env)) {
|
|
161
|
+
if (name === oauthTarget || name in declarations) continue;
|
|
162
|
+
declarations[name] = declaration;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return declarations;
|
|
166
|
+
}
|
|
167
|
+
|
|
130
168
|
function planSubAgent(
|
|
131
169
|
subAgent: PluginSubAgent,
|
|
132
170
|
identity: PluginIdentity,
|
|
@@ -96,7 +96,13 @@ export function planMaterialization(
|
|
|
96
96
|
),
|
|
97
97
|
identity,
|
|
98
98
|
);
|
|
99
|
-
const agent = planAgent(
|
|
99
|
+
const agent = planAgent(
|
|
100
|
+
plugin,
|
|
101
|
+
overlays.agent?.resource,
|
|
102
|
+
mcpServers,
|
|
103
|
+
identity,
|
|
104
|
+
warnings,
|
|
105
|
+
);
|
|
100
106
|
const workflows = planWorkflows(overlays.workflows, identity);
|
|
101
107
|
|
|
102
108
|
const members: PlannedMember[] = [
|
|
@@ -237,10 +237,12 @@ describe("orphan deletion (Go service_test.go)", () => {
|
|
|
237
237
|
]);
|
|
238
238
|
});
|
|
239
239
|
|
|
240
|
-
it("orphan lookup is
|
|
241
|
-
// Seeded under org "local"; the orphan
|
|
242
|
-
//
|
|
243
|
-
//
|
|
240
|
+
it("orphan lookup is scoped to the reference's org: another org's same-slug resource is never touched", async () => {
|
|
241
|
+
// Slugs are org-scoped identifiers. Seeded under org "local"; the orphan
|
|
242
|
+
// reference names a DIFFERENT org, so it must not resolve to this row.
|
|
243
|
+
// (The Go port matched by slug alone; on a backend with a system org
|
|
244
|
+
// beside the user's, a prune could then delete the wrong org's
|
|
245
|
+
// resource — stigmer/stigmer#1151.)
|
|
244
246
|
await seedAgent("agent-id-x", "cross-org-agent");
|
|
245
247
|
const deleter = new RecordingDeleter();
|
|
246
248
|
const previous = [
|
|
@@ -251,9 +253,53 @@ describe("orphan deletion (Go service_test.go)", () => {
|
|
|
251
253
|
}),
|
|
252
254
|
];
|
|
253
255
|
const result = await service(deleter).reconcile(previous, [], DEFAULT_RECONCILIATION_OPTIONS);
|
|
256
|
+
expect(result.removed).toHaveLength(0);
|
|
257
|
+
expect(result.errors).toHaveLength(1);
|
|
258
|
+
expect(result.errors[0]?.resourceKey).toBe("agent:cross-org-agent");
|
|
259
|
+
expect(result.errors[0]?.message).toBe("failed to resolve resource for deletion");
|
|
260
|
+
expect(deleter.calls).toHaveLength(0);
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
it("orphan lookup picks the reference's org when two orgs hold the slug", async () => {
|
|
264
|
+
await seedAgent("agent-id-local", "shared-slug");
|
|
265
|
+
await store.saveResource(
|
|
266
|
+
ApiResourceKind.agent,
|
|
267
|
+
"agent-id-other",
|
|
268
|
+
AgentSchema,
|
|
269
|
+
create(AgentSchema, {
|
|
270
|
+
apiVersion: "agentic.stigmer.ai/v1",
|
|
271
|
+
kind: "Agent",
|
|
272
|
+
metadata: { id: "agent-id-other", name: "shared-slug", slug: "shared-slug", org: "another-org" },
|
|
273
|
+
}),
|
|
274
|
+
);
|
|
275
|
+
const deleter = new RecordingDeleter();
|
|
276
|
+
const previous = [
|
|
277
|
+
create(ApiResourceReferenceSchema, {
|
|
278
|
+
org: "another-org",
|
|
279
|
+
kind: ApiResourceKind.agent,
|
|
280
|
+
slug: "shared-slug",
|
|
281
|
+
}),
|
|
282
|
+
];
|
|
283
|
+
const result = await service(deleter).reconcile(previous, [], DEFAULT_RECONCILIATION_OPTIONS);
|
|
284
|
+
expect(result.removed).toHaveLength(1);
|
|
285
|
+
expect(deleter.calls).toEqual([
|
|
286
|
+
{ kind: ApiResourceKind.agent, resourceId: "agent-id-other" },
|
|
287
|
+
]);
|
|
288
|
+
});
|
|
289
|
+
|
|
290
|
+
it("a reference without an org keeps the unscoped lookup (a pre-scoping client's project)", async () => {
|
|
291
|
+
await seedAgent("agent-id-y", "legacy-agent");
|
|
292
|
+
const deleter = new RecordingDeleter();
|
|
293
|
+
const previous = [
|
|
294
|
+
create(ApiResourceReferenceSchema, {
|
|
295
|
+
kind: ApiResourceKind.agent,
|
|
296
|
+
slug: "legacy-agent",
|
|
297
|
+
}),
|
|
298
|
+
];
|
|
299
|
+
const result = await service(deleter).reconcile(previous, [], DEFAULT_RECONCILIATION_OPTIONS);
|
|
254
300
|
expect(result.removed).toHaveLength(1);
|
|
255
301
|
expect(deleter.calls).toEqual([
|
|
256
|
-
{ kind: ApiResourceKind.agent, resourceId: "agent-id-
|
|
302
|
+
{ kind: ApiResourceKind.agent, resourceId: "agent-id-y" },
|
|
257
303
|
]);
|
|
258
304
|
});
|
|
259
305
|
|
|
@@ -37,6 +37,7 @@ import { ReconciliationSummarySchema } from "@stigmer/protos/ai/stigmer/tenancy/
|
|
|
37
37
|
import type { ReconciliationSummary } from "@stigmer/protos/ai/stigmer/tenancy/project/v1/status_pb";
|
|
38
38
|
|
|
39
39
|
import type { Logger } from "../../boot/logger.js";
|
|
40
|
+
import { findResourceBySlug } from "../../pipeline/steps/helpers.js";
|
|
40
41
|
import { metadataOf } from "../../pipeline/steps/shapes.js";
|
|
41
42
|
import type { Store } from "../../store/interface.js";
|
|
42
43
|
|
|
@@ -205,28 +206,32 @@ async function deleteOrphans(
|
|
|
205
206
|
}
|
|
206
207
|
|
|
207
208
|
/**
|
|
208
|
-
* Resolves an orphan reference to its resource id
|
|
209
|
-
*
|
|
210
|
-
*
|
|
211
|
-
*
|
|
209
|
+
* Resolves an orphan reference to its resource id, within the org the
|
|
210
|
+
* reference names. Slugs are org-scoped identifiers: a local backend holds
|
|
211
|
+
* the `stigmer` system org beside the user's, a self-host holds many, and
|
|
212
|
+
* the same slug may exist in several. The Go port matched by slug alone and
|
|
213
|
+
* could prune another org's resource (stigmer/stigmer#1151); the CLI has
|
|
214
|
+
* always stamped `org` on every member reference, so scoping is a change
|
|
215
|
+
* of lookup, not of contract. A reference without an org (a project written
|
|
216
|
+
* before members carried one) keeps the unscoped match, the helper's
|
|
217
|
+
* documented empty-org arm.
|
|
212
218
|
*/
|
|
213
219
|
async function resolveResourceId(
|
|
214
220
|
store: Store,
|
|
215
221
|
ref: ApiResourceReference,
|
|
216
222
|
): Promise<string> {
|
|
217
223
|
const schema = schemaForKind(ref.kind);
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
224
|
+
const resource = await findResourceBySlug(
|
|
225
|
+
store,
|
|
226
|
+
ref.kind,
|
|
227
|
+
schema,
|
|
228
|
+
ref.slug,
|
|
229
|
+
ref.org,
|
|
230
|
+
);
|
|
231
|
+
if (resource === undefined) {
|
|
232
|
+
const where = ref.org === "" ? "" : ` in org '${ref.org}'`;
|
|
227
233
|
throw new Error(
|
|
228
|
-
`resource ${kindName(ref.kind)}/${ref.slug} not found
|
|
229
|
-
{ cause },
|
|
234
|
+
`resource ${kindName(ref.kind)}/${ref.slug} not found${where}`,
|
|
230
235
|
);
|
|
231
236
|
}
|
|
232
237
|
|