executor 1.2.4-beta.1 → 1.2.4-beta.3

package/README.md

@@ -349,6 +349,7 @@ If you are exploring the repo, these are the directories that matter most:
 - One-time npm setup: either configure npm trusted publishing for `RhysSullivan/executor` with the workflow file `.github/workflows/publish-executor-package.yml`, or add a GitHub Actions secret named `NPM_TOKEN` that can publish the `executor` package.
 - Stable releases use a normal semver like `1.2.3` and publish to npm under `latest`.
 - Beta releases use a prerelease semver like `1.3.0-beta.1` and publish to npm under `beta`.
+- When a release should become an upgrade test fixture, capture a real workspace snapshot with `bun run fixture:release:capture -- ...` and commit it under [`packages/platform/control-plane/src/runtime/__fixtures__`](./packages/platform/control-plane/src/runtime/__fixtures__/README.md).
 
 ## Project status
 

package/bin/executor.mjs

@@ -324424,7 +324424,23 @@ var LocalSourceArtifactSchema = Struct({
   revision: StoredSourceCatalogRevisionRecordSchema,
   snapshot: CatalogSnapshotV1Schema
 });
-var decodeLocalSourceArtifact = decodeUnknownSync(Union2(LocalSourceArtifactSchema, LegacyLocalSourceArtifactSchema));
+var ReadableLegacyLocalSourceArtifactSchema = Struct({
+  version: Literal2(LEGACY_LOCAL_SOURCE_ARTIFACT_VERSION),
+  sourceId: SourceIdSchema,
+  catalogId: SourceCatalogIdSchema,
+  generatedAt: TimestampMsSchema,
+  revision: StoredSourceCatalogRevisionRecordSchema,
+  snapshot: Unknown
+});
+var ReadableLocalSourceArtifactSchema = Struct({
+  version: Literal2(LOCAL_SOURCE_ARTIFACT_VERSION),
+  sourceId: SourceIdSchema,
+  catalogId: SourceCatalogIdSchema,
+  generatedAt: TimestampMsSchema,
+  revision: StoredSourceCatalogRevisionRecordSchema,
+  snapshot: Unknown
+});
+var decodeReadableLocalSourceArtifactOption = decodeUnknownOption(parseJson(Union2(ReadableLocalSourceArtifactSchema, ReadableLegacyLocalSourceArtifactSchema)));
 var normalizeLocalSourceArtifact = (artifact) => artifact.version === LOCAL_SOURCE_ARTIFACT_VERSION ? artifact : {
   ...artifact,
   version: LOCAL_SOURCE_ARTIFACT_VERSION
@@ -324480,6 +324496,13 @@ var hydrateArtifactSourceDocuments = (input) => {
 };
 var snapshotHash = (snapshot2) => contentHash(JSON.stringify(snapshot2));
 var importMetadataHash = (snapshot2) => contentHash(JSON.stringify(snapshot2.import));
+var decodeCatalogSnapshotV1Option = (snapshot2) => {
+  try {
+    return decodeCatalogSnapshotV1(snapshot2);
+  } catch {
+    return null;
+  }
+};
 var buildLocalSourceArtifact = (input) => {
   const catalogId = stableSourceCatalogId(input.source);
   const generatedAt = Date.now();
@@ -324512,16 +324535,21 @@ var readLocalSourceArtifact = (input) => gen2(function* () {
   }
   const readPath = path4;
   const content = yield* fs.readFileString(readPath, "utf8").pipe(mapError2(mapFileSystemError2(readPath, "read source artifact")));
-  const artifact = yield* try_3({
-    try: () => decodeLocalSourceArtifact(JSON.parse(content)),
-    catch: (cause2) => new LocalSourceArtifactDecodeError({
-      message: `Invalid local source artifact at ${readPath}: ${unknownLocalErrorDetails(cause2)}`,
-      path: readPath,
-      details: unknownLocalErrorDetails(cause2)
-    })
-  }).pipe(map16(normalizeLocalSourceArtifact));
+  const decodedArtifact = decodeReadableLocalSourceArtifactOption(content);
+  if (isNone2(decodedArtifact)) {
+    return null;
+  }
+  const artifact = normalizeLocalSourceArtifact(decodedArtifact.value);
+  const snapshot2 = decodeCatalogSnapshotV1Option(artifact.snapshot);
+  if (snapshot2 === null) {
+    return null;
+  }
+  const decodedSnapshotArtifact = {
+    ...artifact,
+    snapshot: snapshot2
+  };
   const rawDocuments = {};
-  for (const documentId of Object.keys(artifact.snapshot.catalog.documents)) {
+  for (const documentId of Object.keys(decodedSnapshotArtifact.snapshot.catalog.documents)) {
     const sourceDocumentPath = localSourceDocumentPath({
       context: input.context,
       sourceId: input.sourceId,
@@ -324533,26 +324561,19 @@ var readLocalSourceArtifact = (input) => gen2(function* () {
     }
     const sourceContent = yield* fs.readFileString(sourceDocumentPath, "utf8").pipe(mapError2(mapFileSystemError2(sourceDocumentPath, "read source document")));
     rawDocuments[documentId] = {
-      sourceKind: artifact.snapshot.import.sourceKind,
+      sourceKind: decodedSnapshotArtifact.snapshot.import.sourceKind,
       kind: "source_document",
       value: sourceContent
     };
   }
   const hydratedArtifact = Object.keys(rawDocuments).length > 0 ? hydrateArtifactSourceDocuments({
-    artifact,
+    artifact: decodedSnapshotArtifact,
     rawDocuments
-  }) : artifact;
-  return yield* try_3({
-    try: () => ({
-      ...hydratedArtifact,
-      snapshot: decodeCatalogSnapshotV1(hydratedArtifact.snapshot)
-    }),
-    catch: (cause2) => new LocalSourceArtifactDecodeError({
-      message: `Invalid IR snapshot in local source artifact at ${readPath}: ${unknownLocalErrorDetails(cause2)}`,
-      path: readPath,
-      details: unknownLocalErrorDetails(cause2)
-    })
-  });
+  }) : decodedSnapshotArtifact;
+  return {
+    ...hydratedArtifact,
+    snapshot: hydratedArtifact.snapshot
+  };
 });
 var writeLocalSourceArtifact = (input) => gen2(function* () {
   const fs = yield* exports_FileSystem.FileSystem;
@@ -364561,6 +364582,38 @@ var createLocalControlPlanePersistence = (context7, fileSystem) => ({
   close: async () => {}
 });
 
+// packages/platform/control-plane/src/runtime/catalog/source/reconcile.ts
+var shouldReconcileSource = (source2) => source2.enabled && source2.status === "connected" && getSourceAdapterForSource(source2).catalogKind !== "internal";
+var reconcileMissingSourceCatalogArtifacts = (input) => gen2(function* () {
+  const runtimeLocalWorkspace = yield* RuntimeLocalWorkspaceService;
+  const sourceStore = yield* RuntimeSourceStoreService;
+  const sourceArtifactStore = yield* SourceArtifactStore;
+  const sourceCatalogSync = yield* RuntimeSourceCatalogSyncService;
+  const sources = yield* sourceStore.loadSourcesInWorkspace(input.workspaceId, {
+    actorAccountId: input.actorAccountId
+  });
+  for (const source2 of sources) {
+    if (!shouldReconcileSource(source2)) {
+      continue;
+    }
+    const artifact = yield* sourceArtifactStore.read({
+      context: runtimeLocalWorkspace.context,
+      sourceId: source2.id
+    });
+    if (artifact !== null) {
+      continue;
+    }
+    yield* sourceCatalogSync.sync({
+      source: source2,
+      actorAccountId: input.actorAccountId
+    }).pipe(catchAll2(() => _void));
+  }
+}).pipe(withSpan2("source.catalog.reconcile_missing", {
+  attributes: {
+    "executor.workspace.id": input.workspaceId
+  }
+}));
+
 // packages/platform/control-plane/src/runtime/execution/state.ts
 class ResumeUnsupportedError extends TaggedError("ResumeUnsupportedError") {
 }
@@ -364631,6 +364684,10 @@ var createControlPlaneRuntime = (options9) => gen2(function* () {
   });
   const managedRuntime = make85(concreteRuntimeLayer);
   yield* managedRuntime.runtimeEffect;
+  yield* reconcileMissingSourceCatalogArtifacts({
+    workspaceId: localInstallation.workspaceId,
+    actorAccountId: localInstallation.accountId
+  }).pipe(provide2(managedRuntime), catchAll2(() => _void));
   return {
     persistence,
     localInstallation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.2.4-beta.1",
+  "version": "1.2.4-beta.3",
   "description": "Local AI executor with a CLI, local API server, and web UI.",
   "keywords": [
     "executor",

package/resources/web/assets/{highlighted-body-TPN3WLV5-mDJLgy5k.js → highlighted-body-TPN3WLV5-DT4fZZjE.js}

@@ -1 +1 @@
-import{r,R as c,M as p,B as x}from"./mermaid-O7DHMXV3-DLDVSK79.js";import{j as d}from"./index-CRuElBS1.js";var R=({code:i,language:e,raw:t,className:g,startLine:u,...m})=>{let{shikiTheme:o}=r.useContext(c),a=p(),[n,s]=r.useState(t);return r.useEffect(()=>{if(!a){s(t);return}let l=a.highlight({code:i,language:e,themes:o},h=>{s(h)});l&&s(l)},[i,e,o,a,t]),d.jsx(x,{className:g,language:e,result:n,startLine:u,...m})};export{R as HighlightedCodeBlockBody};
+import{r,R as c,M as p,B as x}from"./mermaid-O7DHMXV3-B7TAupVN.js";import{j as d}from"./index-CRuElBS1.js";var R=({code:i,language:e,raw:t,className:g,startLine:u,...m})=>{let{shikiTheme:o}=r.useContext(c),a=p(),[n,s]=r.useState(t);return r.useEffect(()=>{if(!a){s(t);return}let l=a.highlight({code:i,language:e,themes:o},h=>{s(h)});l&&s(l)},[i,e,o,a,t]),d.jsx(x,{className:g,language:e,result:n,startLine:u,...m})};export{R as HighlightedCodeBlockBody};