@mastra/factory 0.24.0-alpha.9 → 0.25.0-alpha.0

package/dist/work-item-branch.js

@@ -28,35 +28,60 @@ function workItemThreadTitle(item) {
 	return `${item.source === "github-pr" ? "PR" : item.source === "gitlab-pr" ? "MR" : "Issue"} #${number}: ${item.title}`;
 }
 /**
+* The last twelve alphanumerics of a work item id: the per-item suffix that keeps
+* provider numbers from colliding across the repositories of one factory. Issue
+* #13 exists in every repository, and a factory's sessions are unique per
+* user and branch across all of its repositories, so a branch named by the
+* number alone can only be held once per factory.
+*/
+function itemSuffix(id) {
+	return id.toLowerCase().replace(/[^a-z0-9]+/g, "").slice(-12);
+}
+/**
 * The git branch an item's runs and sessions share, one grammar for both sides
 * of the wire: the dispatcher names autonomous run branches with it and the
 * board opens card sessions on it, so both converge on one checkout per item.
-* Cards without a provider identity (manual, Slack) and cards whose metadata
-* lost their identifier fall back to the id-derived branch.
+* Provider numbers are only unique within a repository, so GitHub and GitLab
+* branches carry the item suffix as well. Cards without a provider identity
+* (manual, Slack) and cards whose metadata lost their identifier fall back to
+* the id-derived branch.
 */
 function workItemBranch(item) {
 	const metadata = item.metadata ?? {};
 	const providerNumber = workItemNumber(item);
-	if (providerNumber !== void 0 && (item.source === "github-issue" || item.source === "github-pr")) return item.source === "github-issue" ? `factory/issue-${providerNumber}` : `factory/pr-${providerNumber}`;
+	if (providerNumber !== void 0 && (item.source === "github-issue" || item.source === "github-pr")) {
+		const suffix = itemSuffix(item.id);
+		const kind = item.source === "github-issue" ? "issue" : "pr";
+		return suffix ? `factory/${kind}-${providerNumber}-${suffix}` : `factory/${kind}-${providerNumber}`;
+	}
 	if ((item.source === "linear-issue" || item.source === "jira-issue" || item.source === "incidentio-follow-up") && typeof metadata.identifier === "string") {
 		const identifier = metadata.identifier.trim();
 		if (identifier) return `factory/${item.source === "linear-issue" ? "linear" : item.source === "jira-issue" ? "jira" : "incidentio"}-${identifier.toLowerCase()}`;
 	}
 	if (item.source === "gitlab-pr" && providerNumber !== void 0) {
-		const uniqueSuffix = item.id.toLowerCase().replace(/[^a-z0-9]+/g, "").slice(-12);
+		const uniqueSuffix = itemSuffix(item.id);
 		if (uniqueSuffix) return `factory/gitlab-mr-${providerNumber}-${uniqueSuffix}`;
 	}
 	if (item.source === "gitlab-issue" && typeof metadata.identifier === "string") {
 		const identifier = metadata.identifier.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-");
-		const uniqueSuffix = item.id.toLowerCase().replace(/[^a-z0-9]+/g, "").slice(-12);
+		const uniqueSuffix = itemSuffix(item.id);
 		if (identifier && uniqueSuffix) return `factory/gitlab-${identifier.slice(0, 60)}-${uniqueSuffix}`;
 	}
 	return `factory/item-${item.id}`;
 }
-/** The pull request a `factory/pr-<number>` branch was named after, the inverse of {@link workItemBranch}. */
+/** The pre-suffix GitHub branch, for reusing sessions opened before card names were unique. */
+function legacyGithubWorkItemBranch(branch) {
+	return /^(factory\/(?:issue|pr)-[1-9]\d*)-[a-z0-9]{1,12}$/.exec(branch)?.[1];
+}
+/**
+* The pull request a `factory/pr-<number>-<item suffix>` branch was named after, the
+* inverse of {@link workItemBranch}. Branches from before the suffix (`factory/pr-<number>`)
+* still parse so existing checkouts can resolve their PR.
+*/
 function pullRequestNumberFromBranch(branch) {
-	const match = /^factory\/pr-([1-9]\d*)$/.exec(branch);
-	return match ? Number(match[1]) : void 0;
+	const match = /^factory\/pr-([1-9]\d*)(?:-[a-z0-9]{1,12})?$/.exec(branch);
+	const number = match ? Number(match[1]) : void 0;
+	return number !== void 0 && Number.isSafeInteger(number) ? number : void 0;
 }
 /** The GitLab MR IID encoded in Factory's collision-resistant review branch. */
 function mergeRequestNumberFromBranch(branch) {
@@ -65,6 +90,6 @@ function mergeRequestNumberFromBranch(branch) {
 	return number !== void 0 && Number.isSafeInteger(number) ? number : void 0;
 }
 //#endregion
-export { mergeRequestNumberFromBranch, pullRequestNumberFromBranch, workItemBranch, workItemBranchSource, workItemNumber, workItemThreadTitle };
+export { legacyGithubWorkItemBranch, mergeRequestNumberFromBranch, pullRequestNumberFromBranch, workItemBranch, workItemBranchSource, workItemNumber, workItemThreadTitle };
 
 //# sourceMappingURL=work-item-branch.js.map

package/dist/work-item-branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-item-branch.js","names":[],"sources":["../src/work-item-branch.ts"],"sourcesContent":["import type { ExternalWorkItemSource } from './storage/domains/work-items/base.js';\n\n/**\n * Where a card came from, in the vocabulary branch naming reads. Server rows\n * map their `externalSource` into this with {@link workItemBranchSource}; the\n * board's own `WorkItem['source']` is already this union.\n */\nexport type WorkItemBranchSource =\n  | 'github-issue'\n  | 'github-pr'\n  | 'gitlab-issue'\n  | 'gitlab-pr'\n  | 'linear-issue'\n  | 'jira-issue'\n  | 'incidentio-follow-up'\n  | 'slack-thread'\n  | 'manual';\n\nexport interface WorkItemBranchInput {\n  id: string;\n  source: WorkItemBranchSource;\n  metadata?: Record<string, unknown> | null;\n}\n\n/** Map a stored item's provenance onto the source vocabulary branch naming reads. */\nexport function workItemBranchSource(externalSource: ExternalWorkItemSource | null | undefined): WorkItemBranchSource {\n  if (!externalSource) return 'manual';\n  if (externalSource.integrationId === 'linear') return 'linear-issue';\n  if (externalSource.integrationId === 'gitlab') {\n    return externalSource.type === 'pull-request' ? 'gitlab-pr' : 'gitlab-issue';\n  }\n  if (externalSource.integrationId === 'jira') return 'jira-issue';\n  if (externalSource.integrationId === 'incidentio') return 'incidentio-follow-up';\n  // Only GitHub, GitLab, Linear, Jira, and incident.io carry provider identities; anything\n  // else (a Slack thread, say) is a plain work item rather than a mislabeled GitHub issue.\n  if (externalSource.integrationId !== 'github') return 'manual';\n  return externalSource.type === 'pull-request' ? 'github-pr' : 'github-issue';\n}\n\nfunction branchNumber(metadata: Record<string, unknown>, key: string): number | undefined {\n  const value = metadata[key] ?? metadata.number;\n  return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : undefined;\n}\n\n/** The provider number a GitHub card carries — the `#12` its runs and thread titles name it by. */\nexport function workItemNumber(item: Pick<WorkItemBranchInput, 'source' | 'metadata'>): number | undefined {\n  const metadata = item.metadata ?? {};\n  if (item.source === 'github-issue') return branchNumber(metadata, 'githubIssueNumber');\n  if (item.source === 'github-pr') return branchNumber(metadata, 'githubPullRequestNumber');\n  if (item.source === 'gitlab-issue') return branchNumber(metadata, 'gitlabIssueIid');\n  if (item.source === 'gitlab-pr') return branchNumber(metadata, 'gitlabMergeRequestIid');\n  return;\n}\n\n/** How a card names its thread: a Linear title already opens with its identifier, a GitHub card gets its number here. */\nexport function workItemThreadTitle(\n  item: Pick<WorkItemBranchInput, 'source' | 'metadata'> & { title: string },\n): string {\n  const number = workItemNumber(item);\n  if (number === undefined) return item.title;\n  const kind = item.source === 'github-pr' ? 'PR' : item.source === 'gitlab-pr' ? 'MR' : 'Issue';\n  return `${kind} #${number}: ${item.title}`;\n}\n\n/**\n * The git branch an item's runs and sessions share, one grammar for both sides\n * of the wire: the dispatcher names autonomous run branches with it and the\n * board opens card sessions on it, so both converge on one checkout per item.\n * Cards without a provider identity (manual, Slack) and cards whose metadata\n * lost their identifier fall back to the id-derived branch.\n */\nexport function workItemBranch(item: WorkItemBranchInput): string {\n  const metadata = item.metadata ?? {};\n  const providerNumber = workItemNumber(item);\n  if (providerNumber !== undefined && (item.source === 'github-issue' || item.source === 'github-pr')) {\n    return item.source === 'github-issue' ? `factory/issue-${providerNumber}` : `factory/pr-${providerNumber}`;\n  }\n  if (\n    (item.source === 'linear-issue' || item.source === 'jira-issue' || item.source === 'incidentio-follow-up') &&\n    typeof metadata.identifier === 'string'\n  ) {\n    const identifier = metadata.identifier.trim();\n    if (identifier) {\n      const provider = item.source === 'linear-issue' ? 'linear' : item.source === 'jira-issue' ? 'jira' : 'incidentio';\n      return `factory/${provider}-${identifier.toLowerCase()}`;\n    }\n  }\n  if (item.source === 'gitlab-pr' && providerNumber !== undefined) {\n    const uniqueSuffix = item.id\n      .toLowerCase()\n      .replace(/[^a-z0-9]+/g, '')\n      .slice(-12);\n    if (uniqueSuffix) return `factory/gitlab-mr-${providerNumber}-${uniqueSuffix}`;\n  }\n  if (item.source === 'gitlab-issue' && typeof metadata.identifier === 'string') {\n    const identifier = metadata.identifier\n      .trim()\n      .toLowerCase()\n      .replace(/[^a-z0-9._-]+/g, '-');\n    const uniqueSuffix = item.id\n      .toLowerCase()\n      .replace(/[^a-z0-9]+/g, '')\n      .slice(-12);\n    if (identifier && uniqueSuffix) return `factory/gitlab-${identifier.slice(0, 60)}-${uniqueSuffix}`;\n  }\n  return `factory/item-${item.id}`;\n}\n\n/** The pull request a `factory/pr-<number>` branch was named after, the inverse of {@link workItemBranch}. */\nexport function pullRequestNumberFromBranch(branch: string): number | undefined {\n  const match = /^factory\\/pr-([1-9]\\d*)$/.exec(branch);\n  return match ? Number(match[1]) : undefined;\n}\n\n/** The GitLab MR IID encoded in Factory's collision-resistant review branch. */\nexport function mergeRequestNumberFromBranch(branch: string): number | undefined {\n  const match = /^factory\\/gitlab-mr-([1-9]\\d*)-[a-z0-9]{1,12}$/.exec(branch);\n  const number = match ? Number(match[1]) : undefined;\n  return number !== undefined && Number.isSafeInteger(number) ? number : undefined;\n}\n"],"mappings":";;AAyBA,SAAgB,qBAAqB,gBAAiF;CACpH,IAAI,CAAC,gBAAgB,OAAO;CAC5B,IAAI,eAAe,kBAAkB,UAAU,OAAO;CACtD,IAAI,eAAe,kBAAkB,UACnC,OAAO,eAAe,SAAS,iBAAiB,cAAc;CAEhE,IAAI,eAAe,kBAAkB,QAAQ,OAAO;CACpD,IAAI,eAAe,kBAAkB,cAAc,OAAO;CAG1D,IAAI,eAAe,kBAAkB,UAAU,OAAO;CACtD,OAAO,eAAe,SAAS,iBAAiB,cAAc;AAChE;AAEA,SAAS,aAAa,UAAmC,KAAiC;CACxF,MAAM,QAAQ,SAAS,QAAQ,SAAS;CACxC,OAAO,OAAO,UAAU,YAAY,OAAO,UAAU,KAAK,KAAK,QAAQ,IAAI,QAAQ,KAAA;AACrF;;AAGA,SAAgB,eAAe,MAA4E;CACzG,MAAM,WAAW,KAAK,YAAY,CAAC;CACnC,IAAI,KAAK,WAAW,gBAAgB,OAAO,aAAa,UAAU,mBAAmB;CACrF,IAAI,KAAK,WAAW,aAAa,OAAO,aAAa,UAAU,yBAAyB;CACxF,IAAI,KAAK,WAAW,gBAAgB,OAAO,aAAa,UAAU,gBAAgB;CAClF,IAAI,KAAK,WAAW,aAAa,OAAO,aAAa,UAAU,uBAAuB;AAExF;;AAGA,SAAgB,oBACd,MACQ;CACR,MAAM,SAAS,eAAe,IAAI;CAClC,IAAI,WAAW,KAAA,GAAW,OAAO,KAAK;CAEtC,OAAO,GADM,KAAK,WAAW,cAAc,OAAO,KAAK,WAAW,cAAc,OAAO,QACxE,IAAI,OAAO,IAAI,KAAK;AACrC;;;;;;;;AASA,SAAgB,eAAe,MAAmC;CAChE,MAAM,WAAW,KAAK,YAAY,CAAC;CACnC,MAAM,iBAAiB,eAAe,IAAI;CAC1C,IAAI,mBAAmB,KAAA,MAAc,KAAK,WAAW,kBAAkB,KAAK,WAAW,cACrF,OAAO,KAAK,WAAW,iBAAiB,iBAAiB,mBAAmB,cAAc;CAE5F,KACG,KAAK,WAAW,kBAAkB,KAAK,WAAW,gBAAgB,KAAK,WAAW,2BACnF,OAAO,SAAS,eAAe,UAC/B;EACA,MAAM,aAAa,SAAS,WAAW,KAAK;EAC5C,IAAI,YAEF,OAAO,WADU,KAAK,WAAW,iBAAiB,WAAW,KAAK,WAAW,eAAe,SAAS,aAC1E,GAAG,WAAW,YAAY;CAEzD;CACA,IAAI,KAAK,WAAW,eAAe,mBAAmB,KAAA,GAAW;EAC/D,MAAM,eAAe,KAAK,GACvB,YAAY,CAAC,CACb,QAAQ,eAAe,EAAE,CAAC,CAC1B,MAAM,GAAG;EACZ,IAAI,cAAc,OAAO,qBAAqB,eAAe,GAAG;CAClE;CACA,IAAI,KAAK,WAAW,kBAAkB,OAAO,SAAS,eAAe,UAAU;EAC7E,MAAM,aAAa,SAAS,WACzB,KAAK,CAAC,CACN,YAAY,CAAC,CACb,QAAQ,kBAAkB,GAAG;EAChC,MAAM,eAAe,KAAK,GACvB,YAAY,CAAC,CACb,QAAQ,eAAe,EAAE,CAAC,CAC1B,MAAM,GAAG;EACZ,IAAI,cAAc,cAAc,OAAO,kBAAkB,WAAW,MAAM,GAAG,EAAE,EAAE,GAAG;CACtF;CACA,OAAO,gBAAgB,KAAK;AAC9B;;AAGA,SAAgB,4BAA4B,QAAoC;CAC9E,MAAM,QAAQ,2BAA2B,KAAK,MAAM;CACpD,OAAO,QAAQ,OAAO,MAAM,EAAE,IAAI,KAAA;AACpC;;AAGA,SAAgB,6BAA6B,QAAoC;CAC/E,MAAM,QAAQ,iDAAiD,KAAK,MAAM;CAC1E,MAAM,SAAS,QAAQ,OAAO,MAAM,EAAE,IAAI,KAAA;CAC1C,OAAO,WAAW,KAAA,KAAa,OAAO,cAAc,MAAM,IAAI,SAAS,KAAA;AACzE"}
+{"version":3,"file":"work-item-branch.js","names":[],"sources":["../src/work-item-branch.ts"],"sourcesContent":["import type { ExternalWorkItemSource } from './storage/domains/work-items/base.js';\n\n/**\n * Where a card came from, in the vocabulary branch naming reads. Server rows\n * map their `externalSource` into this with {@link workItemBranchSource}; the\n * board's own `WorkItem['source']` is already this union.\n */\nexport type WorkItemBranchSource =\n  | 'github-issue'\n  | 'github-pr'\n  | 'gitlab-issue'\n  | 'gitlab-pr'\n  | 'linear-issue'\n  | 'jira-issue'\n  | 'incidentio-follow-up'\n  | 'slack-thread'\n  | 'manual';\n\nexport interface WorkItemBranchInput {\n  id: string;\n  source: WorkItemBranchSource;\n  metadata?: Record<string, unknown> | null;\n}\n\n/** Map a stored item's provenance onto the source vocabulary branch naming reads. */\nexport function workItemBranchSource(externalSource: ExternalWorkItemSource | null | undefined): WorkItemBranchSource {\n  if (!externalSource) return 'manual';\n  if (externalSource.integrationId === 'linear') return 'linear-issue';\n  if (externalSource.integrationId === 'gitlab') {\n    return externalSource.type === 'pull-request' ? 'gitlab-pr' : 'gitlab-issue';\n  }\n  if (externalSource.integrationId === 'jira') return 'jira-issue';\n  if (externalSource.integrationId === 'incidentio') return 'incidentio-follow-up';\n  // Only GitHub, GitLab, Linear, Jira, and incident.io carry provider identities; anything\n  // else (a Slack thread, say) is a plain work item rather than a mislabeled GitHub issue.\n  if (externalSource.integrationId !== 'github') return 'manual';\n  return externalSource.type === 'pull-request' ? 'github-pr' : 'github-issue';\n}\n\nfunction branchNumber(metadata: Record<string, unknown>, key: string): number | undefined {\n  const value = metadata[key] ?? metadata.number;\n  return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : undefined;\n}\n\n/** The provider number a GitHub card carries — the `#12` its runs and thread titles name it by. */\nexport function workItemNumber(item: Pick<WorkItemBranchInput, 'source' | 'metadata'>): number | undefined {\n  const metadata = item.metadata ?? {};\n  if (item.source === 'github-issue') return branchNumber(metadata, 'githubIssueNumber');\n  if (item.source === 'github-pr') return branchNumber(metadata, 'githubPullRequestNumber');\n  if (item.source === 'gitlab-issue') return branchNumber(metadata, 'gitlabIssueIid');\n  if (item.source === 'gitlab-pr') return branchNumber(metadata, 'gitlabMergeRequestIid');\n  return;\n}\n\n/** How a card names its thread: a Linear title already opens with its identifier, a GitHub card gets its number here. */\nexport function workItemThreadTitle(\n  item: Pick<WorkItemBranchInput, 'source' | 'metadata'> & { title: string },\n): string {\n  const number = workItemNumber(item);\n  if (number === undefined) return item.title;\n  const kind = item.source === 'github-pr' ? 'PR' : item.source === 'gitlab-pr' ? 'MR' : 'Issue';\n  return `${kind} #${number}: ${item.title}`;\n}\n\n/**\n * The last twelve alphanumerics of a work item id: the per-item suffix that keeps\n * provider numbers from colliding across the repositories of one factory. Issue\n * #13 exists in every repository, and a factory's sessions are unique per\n * user and branch across all of its repositories, so a branch named by the\n * number alone can only be held once per factory.\n */\nfunction itemSuffix(id: string): string {\n  return id\n    .toLowerCase()\n    .replace(/[^a-z0-9]+/g, '')\n    .slice(-12);\n}\n\n/**\n * The git branch an item's runs and sessions share, one grammar for both sides\n * of the wire: the dispatcher names autonomous run branches with it and the\n * board opens card sessions on it, so both converge on one checkout per item.\n * Provider numbers are only unique within a repository, so GitHub and GitLab\n * branches carry the item suffix as well. Cards without a provider identity\n * (manual, Slack) and cards whose metadata lost their identifier fall back to\n * the id-derived branch.\n */\nexport function workItemBranch(item: WorkItemBranchInput): string {\n  const metadata = item.metadata ?? {};\n  const providerNumber = workItemNumber(item);\n  if (providerNumber !== undefined && (item.source === 'github-issue' || item.source === 'github-pr')) {\n    const suffix = itemSuffix(item.id);\n    const kind = item.source === 'github-issue' ? 'issue' : 'pr';\n    return suffix ? `factory/${kind}-${providerNumber}-${suffix}` : `factory/${kind}-${providerNumber}`;\n  }\n  if (\n    (item.source === 'linear-issue' || item.source === 'jira-issue' || item.source === 'incidentio-follow-up') &&\n    typeof metadata.identifier === 'string'\n  ) {\n    const identifier = metadata.identifier.trim();\n    if (identifier) {\n      const provider = item.source === 'linear-issue' ? 'linear' : item.source === 'jira-issue' ? 'jira' : 'incidentio';\n      return `factory/${provider}-${identifier.toLowerCase()}`;\n    }\n  }\n  if (item.source === 'gitlab-pr' && providerNumber !== undefined) {\n    const uniqueSuffix = itemSuffix(item.id);\n    if (uniqueSuffix) return `factory/gitlab-mr-${providerNumber}-${uniqueSuffix}`;\n  }\n  if (item.source === 'gitlab-issue' && typeof metadata.identifier === 'string') {\n    const identifier = metadata.identifier\n      .trim()\n      .toLowerCase()\n      .replace(/[^a-z0-9._-]+/g, '-');\n    const uniqueSuffix = itemSuffix(item.id);\n    if (identifier && uniqueSuffix) return `factory/gitlab-${identifier.slice(0, 60)}-${uniqueSuffix}`;\n  }\n  return `factory/item-${item.id}`;\n}\n\n/** The pre-suffix GitHub branch, for reusing sessions opened before card names were unique. */\nexport function legacyGithubWorkItemBranch(branch: string): string | undefined {\n  const match = /^(factory\\/(?:issue|pr)-[1-9]\\d*)-[a-z0-9]{1,12}$/.exec(branch);\n  return match?.[1];\n}\n\n/**\n * The pull request a `factory/pr-<number>-<item suffix>` branch was named after, the\n * inverse of {@link workItemBranch}. Branches from before the suffix (`factory/pr-<number>`)\n * still parse so existing checkouts can resolve their PR.\n */\nexport function pullRequestNumberFromBranch(branch: string): number | undefined {\n  const match = /^factory\\/pr-([1-9]\\d*)(?:-[a-z0-9]{1,12})?$/.exec(branch);\n  const number = match ? Number(match[1]) : undefined;\n  return number !== undefined && Number.isSafeInteger(number) ? number : undefined;\n}\n\n/** The GitLab MR IID encoded in Factory's collision-resistant review branch. */\nexport function mergeRequestNumberFromBranch(branch: string): number | undefined {\n  const match = /^factory\\/gitlab-mr-([1-9]\\d*)-[a-z0-9]{1,12}$/.exec(branch);\n  const number = match ? Number(match[1]) : undefined;\n  return number !== undefined && Number.isSafeInteger(number) ? number : undefined;\n}\n"],"mappings":"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"}

package/dist/workspace.d.ts

@@ -14,11 +14,15 @@ export declare const BUNDLED_FACTORY_SKILLS_PATH: string;
  * addition to the bundled skills so projects can add (or override) Factory
  * skills without patching the installed package. Candidates cover the cwd
  * variants the dev server runs with (`repo root`, `--dir src/mastra` which
- * runs with cwd `src/mastra/public`).
+ * runs with cwd `src/mastra/public`), then the platform build output when
+ * the server runs from its parent directory.
  */
 export declare function resolveLocalFactorySkillsPath(cwd?: string): string | undefined;
 export declare const FACTORY_SKILL_NAMES: Set<string>;
-/** Review skills only sessions with an active review run binding may discover or load. */
+/**
+ * Review skills only sessions with an active review run binding, or unbound
+ * side sessions a user session started, may discover or load.
+ */
 export declare const REVIEW_ONLY_FACTORY_SKILLS: Set<string>;
 /**
  * Rescan a session's skill cache so a role gained after the cache was built
@@ -69,7 +73,7 @@ export interface CreateWorkspaceFactoryOptions {
     /** Work-items storage used to resolve the session's run-binding role, so
      * review-board sessions get the reviewer PAT as `GH_TOKEN`. Optional —
      * without it every session uses the default (worker) PAT. */
-    workItems?: Pick<WorkItemsStorage, 'findActiveRunBindingForSession'>;
+    workItems?: Pick<WorkItemsStorage, 'findActiveRunBindingForSession' | 'hasRunBindingForSession'>;
     /** Projects storage used to resolve a session's project environment. */
     projects?: Pick<FactoryProjectsStorage, 'get'>;
     /** Runtime workspace/token registrations invalidated when a session retires. */

package/dist/workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"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"}

package/dist/workspace.js

@@ -26,13 +26,15 @@ const BUNDLED_FACTORY_SKILLS_PATH = [bundledFactorySkillsPath, join(bundleDirect
 * addition to the bundled skills so projects can add (or override) Factory
 * skills without patching the installed package. Candidates cover the cwd
 * variants the dev server runs with (`repo root`, `--dir src/mastra` which
-* runs with cwd `src/mastra/public`).
+* runs with cwd `src/mastra/public`), then the platform build output when
+* the server runs from its parent directory.
 */
 function resolveLocalFactorySkillsPath(cwd = process.cwd()) {
 	return [
 		join(cwd, "src", "mastra", "public", "factory-skills"),
 		join(cwd, "public", "factory-skills"),
-		join(cwd, "factory-skills")
+		join(cwd, "factory-skills"),
+		join(cwd, "output", "factory-skills")
 	].find((candidate) => path.normalize(candidate) !== path.normalize(BUNDLED_FACTORY_SKILLS_PATH) && existsSync(candidate));
 }
 const FACTORY_SKILLS_MOUNT = path.resolve(path.parse(process.cwd()).root, "__mastracode_factory_skills__");
@@ -47,7 +49,10 @@ const FACTORY_SKILL_NAMES = /* @__PURE__ */ new Set([
 	"factory-self-review",
 	"factory-triage"
 ]);
-/** Review skills only sessions with an active review run binding may discover or load. */
+/**
+* Review skills only sessions with an active review run binding, or unbound
+* side sessions a user session started, may discover or load.
+*/
 const REVIEW_ONLY_FACTORY_SKILLS = /* @__PURE__ */ new Set([
 	"factory-gitlab-rereview",
 	"factory-gitlab-review",
@@ -363,7 +368,7 @@ function createWorkspaceFactory(options = {}) {
 	const skillReviewChecks = /* @__PURE__ */ new Map();
 	const resolve = async ({ requestContext, mastra, skillExtension }) => {
 		const ctx = requestContext.get("controller");
-		const resolvedSession = ctx?.resourceId ? await resolveSourceControlSession(sourceControls, ctx.resourceId) : null;
+		const resolvedSession = ctx?.sessionId ? await resolveSourceControlSession(sourceControls, ctx.sessionId) : null;
 		const session = resolvedSession?.session ?? null;
 		const sourceControl = resolvedSession?.provider;
 		if (!session || !sourceControl) return;
@@ -532,11 +537,18 @@ function createWorkspaceFactory(options = {}) {
 				sessionId: session.sessionId
 			});
 			if (!binding || !ctx?.threadId) return binding;
-			return binding.threadId === ctx.threadId && binding.resourceId === ctx.resourceId ? binding : null;
+			return binding.threadId === ctx.threadId && binding.sessionId === ctx.sessionId ? binding : null;
 		};
 		const isReviewSession = async () => {
 			if (!workItems) return false;
 			try {
+				if (session.originSessionId) {
+					if (!await workItems.hasRunBindingForSession({
+						orgId: session.orgId,
+						factoryProjectId: connection.factoryProjectId,
+						sessionId: session.sessionId
+					})) return true;
+				}
 				return isActiveReviewBinding(await findSessionBinding(), session.orgId);
 			} catch {
 				return false;
@@ -902,17 +914,19 @@ function createWorkspaceFactory(options = {}) {
 				}
 				inFlight = void 0;
 				const workspaceCommand = environment.workspaceSetupCommand;
-				if (workspaceCommand && !gate.workspace.setupDone) if (hasFailedSetupCommand(session.id, `workspace:${workspaceCommand}`)) console.warn("[Mastra Factory] Skipping workspace setup command that already failed this session", {
-					orgId: session.orgId,
-					sessionId: session.sessionId
-				});
-				else try {
-					await timedPhase("workspace.setup(workspace)", () => runSetupCommand(target, gate.root, workspaceCommand));
-					await gate.workspace.markSetupDone();
-				} catch (error) {
-					if (!(error instanceof SetupCommandError)) throw error;
-					recordFailedSetupCommand(session.id, `workspace:${workspaceCommand}`);
-					throw new SetupCommandError(`${error.message}. The sandbox stays usable: the workspace setup command is skipped for the rest of the session. Retry your command, then fix it in the environment settings or run it manually.`, error.code);
+				if (workspaceCommand && !gate.workspace.setupDone) {
+					if (hasFailedSetupCommand(session.id, `workspace:${workspaceCommand}`)) console.warn("[Mastra Factory] Skipping workspace setup command that already failed this session", {
+						orgId: session.orgId,
+						sessionId: session.sessionId
+					});
+					else try {
+						await timedPhase("workspace.setup(workspace)", () => runSetupCommand(target, gate.root, workspaceCommand));
+						await gate.workspace.markSetupDone();
+					} catch (error) {
+						if (!(error instanceof SetupCommandError)) throw error;
+						recordFailedSetupCommand(session.id, `workspace:${workspaceCommand}`);
+						throw new SetupCommandError(`${error.message}. The sandbox stays usable: the workspace setup command is skipped for the rest of the session. Retry your command, then fix it in the environment settings or run it manually.`, error.code);
+					}
 				}
 			} finally {
 				record();
@@ -962,13 +976,14 @@ function createWorkspaceFactory(options = {}) {
 		];
 		const projectSkillPaths = checkoutDirs ? checkoutDirs.flatMap((dir) => skillRoots.map((skillPath) => path.posix.join(dir, skillPath))) : skillRoots;
 		const guardedSkillFallback = new UnmaterializedAwareSkillSource(filesystem, () => sessionEntry.sandbox.status === "running");
+		const skillPaths = [...effectiveSkillExtension?.paths ?? [], ...projectSkillPaths];
 		const workspace = new Workspace({
 			id: workspaceId,
 			name: "Mastra Code Factory Session Workspace",
 			filesystem,
 			sandbox: sessionSandbox,
 			tools: MASTRACODE_WORKSPACE_TOOLS,
-			skills: [...effectiveSkillExtension?.paths ?? [], ...projectSkillPaths],
+			skills: skillPaths,
 			skillSource: effectiveSkillExtension?.createSource(guardedSkillFallback, projectSkillPaths) ?? guardedSkillFallback
 		});
 		mastra?.addWorkspace(workspace, workspaceId, { source: "mastra" });