@mastra/factory 0.26.0 → 0.27.0-alpha.1
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/README.md +10 -0
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +7 -3
- package/dist/factory.js.map +1 -1
- package/dist/integrations/gitlab/default-rules.d.ts +1 -1
- package/dist/integrations/gitlab/default-rules.d.ts.map +1 -1
- package/dist/integrations/incidentio/default-rules.d.ts +0 -1
- package/dist/integrations/incidentio/default-rules.d.ts.map +1 -1
- package/dist/integrations/incidentio/default-rules.js +0 -2
- package/dist/integrations/incidentio/default-rules.js.map +1 -1
- package/dist/integrations/incidentio/rules.d.ts.map +1 -1
- package/dist/integrations/incidentio/rules.js +2 -27
- package/dist/integrations/incidentio/rules.js.map +1 -1
- package/dist/integrations/jira/default-rules.d.ts +0 -1
- package/dist/integrations/jira/default-rules.d.ts.map +1 -1
- package/dist/integrations/jira/default-rules.js +0 -2
- package/dist/integrations/jira/default-rules.js.map +1 -1
- package/dist/integrations/jira/routes.d.ts +1 -1
- package/dist/integrations/jira/routes.d.ts.map +1 -1
- package/dist/integrations/jira/routes.js +6 -3
- package/dist/integrations/jira/routes.js.map +1 -1
- package/dist/integrations/jira/rules.d.ts.map +1 -1
- package/dist/integrations/jira/rules.js +2 -22
- package/dist/integrations/jira/rules.js.map +1 -1
- package/dist/integrations/linear/default-rules.d.ts +0 -1
- package/dist/integrations/linear/default-rules.d.ts.map +1 -1
- package/dist/integrations/linear/default-rules.js +0 -2
- package/dist/integrations/linear/default-rules.js.map +1 -1
- package/dist/integrations/linear/routes.d.ts +1 -1
- package/dist/integrations/linear/routes.d.ts.map +1 -1
- package/dist/integrations/linear/routes.js +13 -15
- package/dist/integrations/linear/routes.js.map +1 -1
- package/dist/integrations/linear/rules.d.ts.map +1 -1
- package/dist/integrations/linear/rules.js +2 -23
- package/dist/integrations/linear/rules.js.map +1 -1
- package/dist/integrations/platform/jira/routes.d.ts +1 -1
- package/dist/integrations/platform/jira/routes.d.ts.map +1 -1
- package/dist/integrations/platform/jira/routes.js +6 -3
- package/dist/integrations/platform/jira/routes.js.map +1 -1
- package/dist/routes/contracts.d.ts +54 -1
- package/dist/routes/contracts.d.ts.map +1 -1
- package/dist/routes/contracts.js +54 -1
- package/dist/routes/contracts.js.map +1 -1
- package/dist/routes/knowledge.d.ts +12 -228
- package/dist/routes/knowledge.d.ts.map +1 -1
- package/dist/routes/knowledge.js +207 -1045
- package/dist/routes/knowledge.js.map +1 -1
- package/dist/routes/skills.d.ts +9 -0
- package/dist/routes/skills.d.ts.map +1 -1
- package/dist/routes/skills.js +145 -4
- package/dist/routes/skills.js.map +1 -1
- package/dist/routes/surface.d.ts +2 -0
- package/dist/routes/surface.d.ts.map +1 -1
- package/dist/routes/surface.js +7 -5
- package/dist/routes/surface.js.map +1 -1
- package/dist/rules/dispatcher.d.ts.map +1 -1
- package/dist/rules/dispatcher.js +24 -45
- package/dist/rules/dispatcher.js.map +1 -1
- package/dist/rules/processor.d.ts.map +1 -1
- package/dist/rules/processor.js +1 -0
- package/dist/rules/processor.js.map +1 -1
- package/dist/rules/types.d.ts +0 -7
- package/dist/rules/types.d.ts.map +1 -1
- package/dist/rules/types.js.map +1 -1
- package/dist/rules/validation.d.ts.map +1 -1
- package/dist/rules/validation.js +0 -2
- package/dist/rules/validation.js.map +1 -1
- package/dist/session/org-seed.d.ts +1 -1
- package/dist/session/org-seed.js.map +1 -1
- package/dist/skills/catalog.d.ts +28 -3
- package/dist/skills/catalog.d.ts.map +1 -1
- package/dist/skills/catalog.js +51 -8
- package/dist/skills/catalog.js.map +1 -1
- package/dist/storage/domains/audit/actions.d.ts +1 -0
- package/dist/storage/domains/audit/actions.d.ts.map +1 -1
- package/dist/storage/domains/audit/actions.js +2 -1
- package/dist/storage/domains/audit/actions.js.map +1 -1
- package/dist/storage/domains/skill-overrides/base.d.ts +56 -0
- package/dist/storage/domains/skill-overrides/base.d.ts.map +1 -0
- package/dist/storage/domains/skill-overrides/base.js +157 -0
- package/dist/storage/domains/skill-overrides/base.js.map +1 -0
- package/dist/storage/domains/work-items/base.d.ts +0 -34
- package/dist/storage/domains/work-items/base.d.ts.map +1 -1
- package/dist/storage/domains/work-items/base.js +10 -139
- package/dist/storage/domains/work-items/base.js.map +1 -1
- package/dist/workspace.d.ts +13 -1
- package/dist/workspace.d.ts.map +1 -1
- package/dist/workspace.js +94 -17
- package/dist/workspace.js.map +1 -1
- package/package.json +9 -9
- package/dist/integrations/incidentio/claim.d.ts +0 -8
- package/dist/integrations/incidentio/claim.d.ts.map +0 -1
- package/dist/integrations/incidentio/claim.js +0 -13
- package/dist/integrations/incidentio/claim.js.map +0 -1
- package/dist/integrations/jira/claim.d.ts +0 -21
- package/dist/integrations/jira/claim.d.ts.map +0 -1
- package/dist/integrations/jira/claim.js +0 -37
- package/dist/integrations/jira/claim.js.map +0 -1
- package/dist/integrations/linear/claim.d.ts +0 -8
- package/dist/integrations/linear/claim.d.ts.map +0 -1
- package/dist/integrations/linear/claim.js +0 -13
- package/dist/integrations/linear/claim.js.map +0 -1
package/dist/workspace.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import type { RepositoryAccess, VersionControl } from './capabilities/version-co
|
|
|
7
7
|
import type { GithubIntegration } from './integrations/github/integration.js';
|
|
8
8
|
import type { FactorySandboxContext } from './sandbox/session-sandbox.js';
|
|
9
9
|
import type { FactoryProject, FactoryProjectsStorage } from './storage/domains/projects/base.js';
|
|
10
|
+
import type { SkillOverridesStorage } from './storage/domains/skill-overrides/base.js';
|
|
10
11
|
import type { SourceControlStorageHandle } from './storage/domains/source-control/base.js';
|
|
11
12
|
import type { WorkItemsStorage } from './storage/domains/work-items/base.js';
|
|
12
13
|
export declare const BUNDLED_FACTORY_SKILLS_PATH: string;
|
|
@@ -33,16 +34,25 @@ export declare const REVIEW_ONLY_FACTORY_SKILLS: Set<string>;
|
|
|
33
34
|
* The source still checks the live binding, so this never widens access.
|
|
34
35
|
*/
|
|
35
36
|
export declare function rescanFactorySkills(skills: NonNullable<Workspace['skills']>): Promise<void>;
|
|
37
|
+
/** A project's edited SKILL.md, served in place of the original's. */
|
|
38
|
+
export interface FactorySkillOverride {
|
|
39
|
+
content: string;
|
|
40
|
+
updatedAt: Date;
|
|
41
|
+
}
|
|
36
42
|
export declare class FactorySkillSource implements SkillSource {
|
|
37
43
|
#private;
|
|
38
44
|
readonly fallback: SkillSource;
|
|
39
45
|
/** Evaluated per call because a session's bound role changes across stages. */
|
|
40
46
|
readonly isReviewSession: () => Promise<boolean>;
|
|
47
|
+
/** The session project's edited SKILL.md files by skill name; read per call so saves and reverts apply on the next scan. */
|
|
48
|
+
readonly skillOverrides: () => Promise<ReadonlyMap<string, FactorySkillOverride>>;
|
|
41
49
|
constructor(fallback: SkillSource, fallbackSkillRoots: string[], localSkillsPath?: string | undefined,
|
|
42
50
|
/** Evaluated per call because a session's bound role changes across stages. */
|
|
43
51
|
isReviewSession?: () => Promise<boolean>,
|
|
44
52
|
/** Skills passed as `MastraFactory({ skills })`; they win over local and bundled skills of the same name. */
|
|
45
|
-
codeSkills?: readonly InlineSkill[]
|
|
53
|
+
codeSkills?: readonly InlineSkill[],
|
|
54
|
+
/** The session project's edited SKILL.md files by skill name; read per call so saves and reverts apply on the next scan. */
|
|
55
|
+
skillOverrides?: () => Promise<ReadonlyMap<string, FactorySkillOverride>>);
|
|
46
56
|
exists(skillPath: string): Promise<boolean>;
|
|
47
57
|
stat(skillPath: string): Promise<SkillSourceStat>;
|
|
48
58
|
readFile(skillPath: string): Promise<string | Buffer>;
|
|
@@ -85,6 +95,8 @@ export interface CreateWorkspaceFactoryOptions {
|
|
|
85
95
|
workspaceRegistry?: FactoryWorkspaceRegistry;
|
|
86
96
|
/** App skills from `MastraFactory({ skills })`, served on the Factory skill mount. */
|
|
87
97
|
skills?: readonly InlineSkill[];
|
|
98
|
+
/** Per-project SKILL.md edits served over the Factory skills of each session's project. */
|
|
99
|
+
skillOverrides?: Pick<SkillOverridesStorage, 'ensureReady' | 'revision' | 'snapshot'>;
|
|
88
100
|
}
|
|
89
101
|
type WorkspaceUnregister = () => Promise<void> | void;
|
|
90
102
|
/** Tracks dynamic Factory workspaces by persisted session id for retirement. */
|
package/dist/workspace.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,mCAAmC,CAAC;AAKtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAoB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EACV,cAAc,EAEd,WAAW,EACX,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAE1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AA6B9E,OAAO,KAAK,EAAE,qBAAqB,EAA4C,MAAM,8BAA8B,CAAC;AAQpH,OAAO,KAAK,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjG,OAAO,KAAK,EAAwB,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACjH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAO7E,eAAO,MAAM,2BAA2B,QAQQ,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,GAAE,MAAsB,GAAG,MAAM,GAAG,SAAS,CAY7F;AACD,eAAO,MAAM,oBAAoB,QAAgF,CAAC;AAClH,eAAO,MAAM,mBAAmB,aAU9B,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,0BAA0B,aAMrC,CAAC;AASH;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CASjG;AAsCD,qBAAa,kBAAmB,YAAW,WAAW;;IAOlD,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAG9B,+EAA+E;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"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"}
|
package/dist/workspace.js
CHANGED
|
@@ -112,16 +112,19 @@ var CodeSkillSource = class {
|
|
|
112
112
|
return this.#inline.readdir(this.#inlinePath(relativePath));
|
|
113
113
|
}
|
|
114
114
|
};
|
|
115
|
+
const NO_SKILL_OVERRIDES = /* @__PURE__ */ new Map();
|
|
115
116
|
var FactorySkillSource = class {
|
|
116
117
|
fallback;
|
|
117
118
|
isReviewSession;
|
|
119
|
+
skillOverrides;
|
|
118
120
|
#bundledSource = new LocalSkillSource({ basePath: BUNDLED_FACTORY_SKILLS_PATH });
|
|
119
121
|
#localSource;
|
|
120
122
|
#codeSource;
|
|
121
123
|
#fallbackSkillRoots;
|
|
122
|
-
constructor(fallback, fallbackSkillRoots, localSkillsPath = resolveLocalFactorySkillsPath(), isReviewSession = () => Promise.resolve(true), codeSkills = []) {
|
|
124
|
+
constructor(fallback, fallbackSkillRoots, localSkillsPath = resolveLocalFactorySkillsPath(), isReviewSession = () => Promise.resolve(true), codeSkills = [], skillOverrides = () => Promise.resolve(NO_SKILL_OVERRIDES)) {
|
|
123
125
|
this.fallback = fallback;
|
|
124
126
|
this.isReviewSession = isReviewSession;
|
|
127
|
+
this.skillOverrides = skillOverrides;
|
|
125
128
|
this.#localSource = localSkillsPath ? new LocalSkillSource({ basePath: localSkillsPath }) : void 0;
|
|
126
129
|
this.#codeSource = codeSkills.length > 0 ? new CodeSkillSource(codeSkills) : void 0;
|
|
127
130
|
this.#fallbackSkillRoots = new Set(fallbackSkillRoots.map((skillPath) => path.normalize(skillPath)));
|
|
@@ -150,6 +153,16 @@ var FactorySkillSource = class {
|
|
|
150
153
|
if (this.#localSource && await this.#localSource.exists(relativePath)) return this.#localSource;
|
|
151
154
|
return this.#bundledSource;
|
|
152
155
|
}
|
|
156
|
+
/**
|
|
157
|
+
* The edit replacing this path, when it is a skill's SKILL.md. Only the instructions are
|
|
158
|
+
* edited; the skill's other files still come from its layer. `exists` and `readdir` never
|
|
159
|
+
* consult edits, so an edit whose skill was removed from the app is never discovered.
|
|
160
|
+
*/
|
|
161
|
+
async #overrideFor(relativePath) {
|
|
162
|
+
const [skillName, file, ...rest] = relativePath.split(path.sep);
|
|
163
|
+
if (!skillName || file !== "SKILL.md" || rest.length > 0) return void 0;
|
|
164
|
+
return (await this.skillOverrides()).get(skillName);
|
|
165
|
+
}
|
|
153
166
|
async exists(skillPath) {
|
|
154
167
|
if (!this.#isFactoryPath(skillPath)) return this.fallback.exists(skillPath);
|
|
155
168
|
const relative = this.#factoryPath(skillPath);
|
|
@@ -162,12 +175,22 @@ var FactorySkillSource = class {
|
|
|
162
175
|
if (!this.#isFactoryPath(skillPath)) return this.fallback.stat(skillPath);
|
|
163
176
|
const relative = this.#factoryPath(skillPath);
|
|
164
177
|
if (await this.#isHiddenReviewPath(relative)) throw skillSourceEnoent(skillPath);
|
|
178
|
+
const override = await this.#overrideFor(relative);
|
|
179
|
+
if (override) return {
|
|
180
|
+
name: "SKILL.md",
|
|
181
|
+
type: "file",
|
|
182
|
+
size: Buffer.byteLength(override.content),
|
|
183
|
+
createdAt: override.updatedAt,
|
|
184
|
+
modifiedAt: override.updatedAt
|
|
185
|
+
};
|
|
165
186
|
return (await this.#layerFor(relative)).stat(relative);
|
|
166
187
|
}
|
|
167
188
|
async readFile(skillPath) {
|
|
168
189
|
if (!this.#isFactoryPath(skillPath)) return this.fallback.readFile(skillPath);
|
|
169
190
|
const relative = this.#factoryPath(skillPath);
|
|
170
191
|
if (await this.#isHiddenReviewPath(relative)) throw skillSourceEnoent(skillPath);
|
|
192
|
+
const override = await this.#overrideFor(relative);
|
|
193
|
+
if (override) return override.content;
|
|
171
194
|
return (await this.#layerFor(relative)).readFile(relative);
|
|
172
195
|
}
|
|
173
196
|
async readdir(skillPath) {
|
|
@@ -258,11 +281,11 @@ var UnmaterializedAwareSkillSource = class {
|
|
|
258
281
|
return this.fallback.realpath ? this.fallback.realpath(skillPath) : Promise.resolve(skillPath);
|
|
259
282
|
}
|
|
260
283
|
};
|
|
261
|
-
function createFactorySkillExtension(isReviewSession, codeSkills) {
|
|
284
|
+
function createFactorySkillExtension(isReviewSession, codeSkills, skillOverrides) {
|
|
262
285
|
return {
|
|
263
286
|
id: "web-factory",
|
|
264
287
|
paths: [FACTORY_SKILLS_MOUNT],
|
|
265
|
-
createSource: (fallback, fallbackSkillRoots) => new FactorySkillSource(fallback, fallbackSkillRoots, resolveLocalFactorySkillsPath(), isReviewSession, codeSkills)
|
|
288
|
+
createSource: (fallback, fallbackSkillRoots) => new FactorySkillSource(fallback, fallbackSkillRoots, resolveLocalFactorySkillsPath(), isReviewSession, codeSkills, skillOverrides)
|
|
266
289
|
};
|
|
267
290
|
}
|
|
268
291
|
function isActiveReviewBinding(runBinding, orgId) {
|
|
@@ -404,7 +427,7 @@ function environmentSandboxContext(environment, options) {
|
|
|
404
427
|
};
|
|
405
428
|
}
|
|
406
429
|
function createWorkspaceFactory(options = {}) {
|
|
407
|
-
const { sandbox: sandboxConfig, github, projects, workItems } = options;
|
|
430
|
+
const { sandbox: sandboxConfig, github, projects, workItems, skillOverrides } = options;
|
|
408
431
|
const sourceControls = options.sourceControls ?? (github ? [{
|
|
409
432
|
id: github.id,
|
|
410
433
|
versionControl: github.versionControl,
|
|
@@ -416,9 +439,12 @@ function createWorkspaceFactory(options = {}) {
|
|
|
416
439
|
const githubTokenInjectors = /* @__PURE__ */ new Map();
|
|
417
440
|
const githubTokenReconciliations = /* @__PURE__ */ new Map();
|
|
418
441
|
const constructedWorkspaces = /* @__PURE__ */ new Map();
|
|
419
|
-
const
|
|
442
|
+
const skillCacheState = /* @__PURE__ */ new Map();
|
|
420
443
|
const skillCacheRefreshes = /* @__PURE__ */ new Map();
|
|
421
444
|
const skillReviewChecks = /* @__PURE__ */ new Map();
|
|
445
|
+
const skillOverrideStates = /* @__PURE__ */ new Map();
|
|
446
|
+
const UNREAD_SKILL_OVERRIDES = -1;
|
|
447
|
+
const skillCacheKey = (isReview, revision) => `${isReview ? "review" : "work"}@${revision}`;
|
|
422
448
|
const resolve = async ({ requestContext, mastra, skillExtension }) => {
|
|
423
449
|
const ctx = requestContext.get("controller");
|
|
424
450
|
const resolvedSession = ctx?.sessionId ? await resolveSourceControlSession(sourceControls, ctx.sessionId) : null;
|
|
@@ -619,11 +645,51 @@ function createWorkspaceFactory(options = {}) {
|
|
|
619
645
|
return false;
|
|
620
646
|
}
|
|
621
647
|
};
|
|
622
|
-
const effectiveSkillExtension = skillExtension ?? createFactorySkillExtension(() => (skillReviewChecks.get(workspaceId) ?? isReviewSession)(), options.skills ?? []);
|
|
648
|
+
const effectiveSkillExtension = skillExtension ?? createFactorySkillExtension(() => (skillReviewChecks.get(workspaceId) ?? isReviewSession)(), options.skills ?? [], async () => (await (skillOverrideStates.get(workspaceId) ?? loadSkillOverrides())).overrides);
|
|
623
649
|
const extensionId = effectiveSkillExtension ? `-${effectiveSkillExtension.id}` : "";
|
|
624
650
|
const workspaceId = `${WORKSPACE_ID_PREFIX}-${projectRepository.id}-${session.id}${extensionId}`;
|
|
625
651
|
const workspaceGeneration = workspaceRegistry.generation(session.sessionId);
|
|
626
652
|
if (!skillExtension) skillReviewChecks.set(workspaceId, isReviewSession);
|
|
653
|
+
const overrideScope = skillOverrides && !skillExtension ? {
|
|
654
|
+
orgId: session.orgId,
|
|
655
|
+
projectId: connection.factoryProjectId
|
|
656
|
+
} : void 0;
|
|
657
|
+
const readOverrides = async (read) => {
|
|
658
|
+
try {
|
|
659
|
+
await skillOverrides.ensureReady();
|
|
660
|
+
return await read();
|
|
661
|
+
} catch (error) {
|
|
662
|
+
console.warn("[Mastra Factory] Could not read project skill edits; serving the original skills", {
|
|
663
|
+
factoryProjectId: connection.factoryProjectId,
|
|
664
|
+
error
|
|
665
|
+
});
|
|
666
|
+
return;
|
|
667
|
+
}
|
|
668
|
+
};
|
|
669
|
+
const currentOverrideRevision = async () => overrideScope ? await readOverrides(() => skillOverrides.revision(overrideScope)) ?? UNREAD_SKILL_OVERRIDES : 0;
|
|
670
|
+
const loadSkillOverrides = () => {
|
|
671
|
+
const loading = (async () => {
|
|
672
|
+
if (!overrideScope) return {
|
|
673
|
+
revision: 0,
|
|
674
|
+
overrides: NO_SKILL_OVERRIDES
|
|
675
|
+
};
|
|
676
|
+
const snapshot = await readOverrides(() => skillOverrides.snapshot(overrideScope));
|
|
677
|
+
if (!snapshot) return {
|
|
678
|
+
revision: UNREAD_SKILL_OVERRIDES,
|
|
679
|
+
overrides: NO_SKILL_OVERRIDES
|
|
680
|
+
};
|
|
681
|
+
return {
|
|
682
|
+
revision: snapshot.revision,
|
|
683
|
+
overrides: new Map(snapshot.overrides.map((o) => [o.skillName, {
|
|
684
|
+
content: o.content,
|
|
685
|
+
updatedAt: o.updatedAt
|
|
686
|
+
}]))
|
|
687
|
+
};
|
|
688
|
+
})();
|
|
689
|
+
skillOverrideStates.set(workspaceId, loading);
|
|
690
|
+
return loading;
|
|
691
|
+
};
|
|
692
|
+
const loadedOverrideRevision = async () => (await skillOverrideStates.get(workspaceId))?.revision;
|
|
627
693
|
const configDir = DEFAULT_CONFIG_DIR;
|
|
628
694
|
const getRepositoryAccess = () => sourceControl.versionControl.getRepositoryAccess({
|
|
629
695
|
orgId: session.orgId,
|
|
@@ -737,7 +803,7 @@ function createWorkspaceFactory(options = {}) {
|
|
|
737
803
|
if (evicted && githubTokenInjectors.get(workspaceId) === registered) {
|
|
738
804
|
githubTokenInjectors.delete(workspaceId);
|
|
739
805
|
constructedWorkspaces.delete(workspaceId);
|
|
740
|
-
|
|
806
|
+
skillCacheState.delete(workspaceId);
|
|
741
807
|
}
|
|
742
808
|
}
|
|
743
809
|
throw error;
|
|
@@ -760,31 +826,40 @@ function createWorkspaceFactory(options = {}) {
|
|
|
760
826
|
if (!outside) return false;
|
|
761
827
|
await outside;
|
|
762
828
|
if (rescannedOutsideResolver.get(existing.skills) === outside) rescannedOutsideResolver.delete(existing.skills);
|
|
763
|
-
|
|
829
|
+
skillCacheState.delete(workspaceId);
|
|
764
830
|
return true;
|
|
765
831
|
};
|
|
766
832
|
await consumeOutsideRescan();
|
|
767
|
-
|
|
833
|
+
const readTarget = async () => {
|
|
834
|
+
const [isReview, revision] = await Promise.all([isReviewSession(), currentOverrideRevision()]);
|
|
835
|
+
return {
|
|
836
|
+
isReview,
|
|
837
|
+
revision
|
|
838
|
+
};
|
|
839
|
+
};
|
|
840
|
+
let target = await readTarget();
|
|
768
841
|
for (;;) {
|
|
769
842
|
const inFlight = skillCacheRefreshes.get(workspaceId);
|
|
770
843
|
if (inFlight) {
|
|
771
844
|
await inFlight;
|
|
772
|
-
|
|
845
|
+
target = await readTarget();
|
|
773
846
|
continue;
|
|
774
847
|
}
|
|
775
848
|
if (await consumeOutsideRescan()) {
|
|
776
|
-
|
|
849
|
+
target = await readTarget();
|
|
777
850
|
continue;
|
|
778
851
|
}
|
|
779
|
-
if (
|
|
780
|
-
const
|
|
852
|
+
if (skillCacheState.get(workspaceId) === skillCacheKey(target.isReview, target.revision)) break;
|
|
853
|
+
const { isReview, revision } = target;
|
|
781
854
|
const pending = (async () => {
|
|
855
|
+
const served = await loadedOverrideRevision() === revision ? revision : (await loadSkillOverrides()).revision;
|
|
782
856
|
await existing.skills?.refresh();
|
|
783
|
-
|
|
857
|
+
skillCacheState.set(workspaceId, skillCacheKey(isReview, served));
|
|
858
|
+
return served;
|
|
784
859
|
})().finally(() => skillCacheRefreshes.delete(workspaceId));
|
|
785
860
|
skillCacheRefreshes.set(workspaceId, pending);
|
|
786
|
-
await pending;
|
|
787
|
-
|
|
861
|
+
if (await pending === UNREAD_SKILL_OVERRIDES) break;
|
|
862
|
+
target = await readTarget();
|
|
788
863
|
}
|
|
789
864
|
}
|
|
790
865
|
return reconcileRegisteredWorkspace(existing);
|
|
@@ -1054,11 +1129,13 @@ function createWorkspaceFactory(options = {}) {
|
|
|
1054
1129
|
});
|
|
1055
1130
|
mastra?.addWorkspace(workspace, workspaceId, { source: "mastra" });
|
|
1056
1131
|
constructedWorkspaces.set(workspaceId, workspace);
|
|
1132
|
+
skillOverrideStates.delete(workspaceId);
|
|
1057
1133
|
if (!await workspaceRegistry.register(session.sessionId, workspaceId, workspaceGeneration, async () => {
|
|
1058
1134
|
githubTokenInjectors.delete(workspaceId);
|
|
1059
1135
|
constructedWorkspaces.delete(workspaceId);
|
|
1060
|
-
|
|
1136
|
+
skillCacheState.delete(workspaceId);
|
|
1061
1137
|
skillReviewChecks.delete(workspaceId);
|
|
1138
|
+
skillOverrideStates.delete(workspaceId);
|
|
1062
1139
|
evictSessionSandbox(session.id);
|
|
1063
1140
|
clearSessionEnvironment(session.sessionId);
|
|
1064
1141
|
await mastra?.removeWorkspace?.(workspaceId);
|