Merge remote-tracking branch 'origin/master' into opt/win-ssache

scripts/dev.mjs

@@ -440,6 +440,7 @@ function buildDevStackSnapshot(runner, updatedAt = new Date().toISOString()) {
 
   return {
     schemaVersion: 2,
+    instanceId: runner.instanceId,
     command: runner.command ?? 'all',
     repoRoot,
     database: runner.options.database,
@@ -465,6 +466,12 @@ function buildDevStackServiceSnapshot(runner, serviceName, updatedAt) {
       : null;
 
   return {
+    repoRoot,
+    instanceId: runner.instanceId,
+    dataDir:
+      serviceName === 'spacetime'
+        ? resolve(runner.options.spacetimeDataDir)
+        : null,
     status,
     pid:
       childPid ??
@@ -1229,6 +1236,9 @@ class DevRunner {
   constructor(options, baseEnv = process.env, explicitOptions = new Set()) {
     this.options = options;
     this.baseEnv = { ...baseEnv };
+    this.instanceId = `dev-${process.pid}-${randomBytes(12).toString('hex')}`;
+    this.baseEnv.GENARRATIVE_DEV_STACK_INSTANCE_ID = this.instanceId;
+    this.baseEnv.GENARRATIVE_DEV_STACK_REPO_ROOT = repoRoot;
     this.spacetimeApiToken = String(
       this.baseEnv.GENARRATIVE_SPACETIME_TOKEN ?? '',
     ).trim();