@spotpatch/dev-server 0.9.0 → 0.10.1

package/README.md

@@ -8,6 +8,8 @@ Applications should install a framework adapter such as [`@spotpatch/vite`](http
 
 The service is development-only. Production adapters must omit it together with all private endpoints and source-registration state.
 
+`createDevelopmentSession` owns the common AI, read-only Ask, external handoff and middleware lifecycle for Vite, Next and Astro. Frameworks inject bridge/validation/source-projection factories, retain their own transports, and call the idempotent `close()` on shutdown. Astro source imports remain subject to the same registry, path and read-budget authorization.
+
 Requires Node.js `>=20.19.0`.
 
 ## 简体中文

package/dist/index.cjs

@@ -39,6 +39,7 @@ __export(index_exports, {
   createAgentJobManager: () => createAgentJobManager,
   createConfiguredKeyAskExecutors: () => createConfiguredKeyAskExecutors,
   createContextualAskManager: () => createContextualAskManager,
+  createDevelopmentSession: () => createDevelopmentSession,
   createExternalHandoffService: () => createExternalHandoffService,
   createIntegrationFileChange: () => createIntegrationFileChange,
   createRuntimeAiConfig: () => createRuntimeAiConfig,
@@ -1087,6 +1088,7 @@ var import_node_path = __toESM(require("path"), 1);
 var import_shared5 = require("@spotpatch/shared");
 var import_external_agent_node2 = require("@spotpatch/shared/external-agent-node");
 async function syncDirectory(directory) {
+  if (process.platform === "win32") return;
   const handle = await (0, import_promises.open)(directory, "r");
   try {
     await handle.sync();
@@ -1136,14 +1138,11 @@ async function publishExternalHandoffDescriptor(options) {
     } finally {
       await handle.close();
     }
+    await (0, import_external_agent_node2.initializePrivateExternalHandoffFile)(temporary);
     await (0, import_promises.rename)(temporary, destination);
     temporaryExists = false;
     published = true;
-    const status = await (0, import_promises.lstat)(destination);
-    const uid = process.getuid?.();
-    if (!status.isFile() || status.isSymbolicLink() || uid === void 0 || status.uid !== uid || (status.mode & 63) !== 0) {
-      throw new Error("SpotPatch external Agent descriptor is not private.");
-    }
+    const status = await (0, import_external_agent_node2.assertPrivateExternalHandoffPath)(destination, "file");
     descriptorIdentity = Object.freeze({ device: status.dev, inode: status.ino });
     await syncDirectory(directory);
   } catch (error) {
@@ -2457,14 +2456,14 @@ async function resolveProjectOptions(input) {
       "SpotPatch trustedFastMode cannot be combined with applyMode auto."
     );
   }
-  const checks = await resolveProjectValidationChecks({
+  const checks = await (input.resolveValidationChecks ?? resolveProjectValidationChecks)({
     appRoot: input.appRoot,
     checks: resolved.ai.execution.checks,
     timeoutMs: resolved.ai.execution.limits.checkTimeoutMs
   });
   if (!Object.values(checks).some((check) => check.required)) {
     throw new RangeError(
-      "SpotPatch trustedFastMode requires a configured required check or a local TypeScript project with tsconfig.json."
+      "SpotPatch trustedFastMode requires a configured required check or an available framework-compatible local project check."
     );
   }
   const ai = Object.freeze({
@@ -2578,6 +2577,7 @@ var import_node_path5 = __toESM(require("path"), 1);
 var import_shared10 = require("@spotpatch/shared");
 var import_oxc_parser = require("oxc-parser");
 var SOURCE_EXTENSIONS = Object.freeze([
+  ".astro",
   ".ts",
   ".tsx",
   ".js",
@@ -2886,7 +2886,8 @@ async function captureAskReadSnapshot(options) {
       content: read.content
     });
     captured.push(entry);
-    for (const specifier of localSpecifiers(candidate.absolutePath, read.content)) {
+    const specifiers = options.resolveSourceImports?.(candidate.absolutePath, read.content) ?? localSpecifiers(candidate.absolutePath, read.content);
+    for (const specifier of specifiers.filter((value) => value.startsWith("."))) {
       options.signal?.throwIfAborted();
       for (const importPath of importCandidates(candidate.absolutePath, specifier)) {
         if (capturedPaths.has(importPath)) continue;
@@ -3022,6 +3023,7 @@ function fingerprint(request) {
     JSON.stringify({
       envelope: request.envelope,
       executorId: request.executorId,
+      model: request.model,
       providerDataConsent: request.providerDataConsent
     })
   ).digest("hex");
@@ -3312,7 +3314,8 @@ function createContextualAskManager(options) {
         registry: options.registry,
         selection: job.request.envelope.selection,
         signal: job.controller.signal,
-        createHandleId: dependencies.createId
+        createHandleId: dependencies.createId,
+        ...options.resolveSourceImports === void 0 ? {} : { resolveSourceImports: options.resolveSourceImports }
       });
       if (job.controller.signal.aborted) {
         captured.dispose();
@@ -3326,6 +3329,7 @@ function createContextualAskManager(options) {
         job.executor.execute(
           {
             jobId: job.id,
+            ...job.request.model === void 0 ? {} : { model: job.request.model },
             envelope: job.request.envelope,
             grant: captured.grant,
             snapshot: instrumentSnapshot(job, captured.snapshot, () => {
@@ -3445,6 +3449,9 @@ function createContextualAskManager(options) {
             )
           );
           if (isClosed()) throw new ContextualAskError("ASK_DISABLED");
+          if (request.model !== void 0 && !capability.models?.includes(request.model)) {
+            throw new ContextualAskError("ASK_EXECUTOR_UNAVAILABLE");
+          }
           if (capability.executorId !== executor.executorId || capability.state !== "ready" || !capability.readOnlyProven) {
             throw new ContextualAskError("ASK_EXECUTOR_UNAVAILABLE");
           }
@@ -3461,7 +3468,11 @@ function createContextualAskManager(options) {
             createdAt,
             events: [],
             executor,
-            executorCapability: capability,
+            executorCapability: request.model === void 0 ? capability : {
+              ...capability,
+              requestedModelLabel: request.model,
+              effectiveModelLabel: request.model
+            },
             fingerprint: requestFingerprint,
             id: dependencies.createId(),
             lease,
@@ -4070,6 +4081,7 @@ function nearbyContext(options) {
   });
 }
 function extractCodeContext(options) {
+  if (options.language === "astro") return nearbyContext(options);
   const component = findComponentSpan(options);
   if (component !== void 0) {
     const range = componentRange(options.source, component);
@@ -4093,7 +4105,7 @@ function extractCodeContext(options) {
 var import_promises5 = require("fs/promises");
 var import_node_path6 = __toESM(require("path"), 1);
 var import_shared13 = require("@spotpatch/shared");
-var ALLOWED_EXTENSIONS = /* @__PURE__ */ new Set([".jsx", ".tsx"]);
+var ALLOWED_EXTENSIONS = /* @__PURE__ */ new Set([".jsx", ".tsx", ".astro"]);
 function isMissingFileError(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
@@ -4179,7 +4191,7 @@ async function readSourceContext(options) {
     source,
     sourcePath,
     relativePath: toDisplayPath(await (0, import_promises6.realpath)(options.root), sourcePath),
-    language: extension === ".tsx" ? "tsx" : "jsx",
+    language: extension === ".astro" ? "astro" : extension === ".tsx" ? "tsx" : "jsx",
     line: options.request.line,
     column: options.request.column,
     maxLines: Math.min(options.request.maxLines, options.maxLines),
@@ -4209,7 +4221,7 @@ function compactSourceRef(source) {
   });
 }
 async function authorizeSourceRef(source, registry, root) {
-  const markerOrigin = source.origin === "jsx-host" || source.origin === "dom-ancestor";
+  const markerOrigin = source.origin === "jsx-host" || source.origin === "astro-host" || source.origin === "dom-ancestor";
   if (markerOrigin && (source.fileId === void 0 || source.line === void 0 || source.column === void 0)) {
     throw new import_shared15.SpotPatchError(import_shared15.ERROR_CODES.INVALID_REQUEST);
   }
@@ -4894,7 +4906,8 @@ function createDataFlowAnalyzer(options) {
     root: options.root,
     registryEpoch: options.session.id,
     registerSource: (absolutePath) => options.registry.register(absolutePath),
-    limits: options.options.dataFlow.limits
+    limits: options.options.dataFlow.limits,
+    ...options.projectDataFlowSource === void 0 ? {} : { projectSource: options.projectDataFlowSource }
   });
 }
 async function analyzeTarget(request, analyzer, options) {
@@ -5849,6 +5862,113 @@ function parseSerializedSpotPatchOptions(value) {
     });
   }
 }
+
+// src/development-session.ts
+async function createDevelopmentSession(input) {
+  const cleanups = [
+    () => {
+      input.registry.clear();
+    }
+  ];
+  let closing;
+  const close = () => closing ??= (async () => {
+    const errors = [];
+    for (const cleanup of cleanups.splice(0).reverse()) {
+      try {
+        await cleanup();
+      } catch (error) {
+        errors.push(error);
+      }
+    }
+    if (errors.length > 0)
+      throw new AggregateError(errors, "SpotPatch service cleanup failed.");
+  })();
+  const warn = (message) => {
+    input.logger?.warn(`[spotpatch:${input.framework}] ${message}`);
+  };
+  try {
+    const { options, root, registry } = input;
+    const coordinator = createWorkspaceActivityCoordinator();
+    const agentManager = options.ai === false ? void 0 : createAgentJobManager({
+      ai: options.ai,
+      environment: input.environment,
+      root: input.executionRoot ?? root,
+      coordinator
+    });
+    if (agentManager !== void 0) cleanups.push(() => agentManager.close());
+    const preference = options.contextualAsk.defaultExecutor === void 0 ? {} : { defaultExecutor: options.contextualAsk.defaultExecutor };
+    const contextualAskManager = !options.contextualAsk.enabled ? void 0 : createContextualAskManager({
+      coordinator,
+      enabled: true,
+      registry,
+      root,
+      ...input.resolveSourceImports === void 0 ? {} : { resolveSourceImports: input.resolveSourceImports },
+      executors: composeContextualAskExecutors({
+        configuredKey: options.ai === false ? [] : createConfiguredKeyAskExecutors({
+          ai: options.ai,
+          environment: input.environment,
+          ...preference
+        }),
+        managedCodex: input.createManagedAskExecutor(),
+        ...preference
+      })
+    });
+    if (contextualAskManager !== void 0)
+      cleanups.push(() => contextualAskManager.close());
+    const externalHandoffService = !options.externalAgent.enabled ? void 0 : createExternalHandoffService({
+      framework: input.framework,
+      root,
+      sessionId: input.session.id
+    });
+    let externalAgentControl;
+    if (externalHandoffService !== void 0) {
+      cleanups.push(() => externalHandoffService.close());
+      try {
+        await externalHandoffService.start();
+      } catch {
+        warn("External Agent handoff is unavailable; core tools remain active.");
+      }
+      if (externalHandoffService.capability().brokerReady) {
+        try {
+          const validation = await (input.resolveValidation?.() ?? resolveManagedExecutionValidation({ ai: options.ai, appRoot: root }));
+          const control = await input.createExternalAgentControl(validation);
+          externalAgentControl = control;
+          cleanups.push(() => control.dispose());
+        } catch {
+          warn("Managed Agent control is unavailable; Inbox remains active.");
+        }
+      }
+    }
+    const middleware = createSpotPatchMiddleware({
+      options,
+      root,
+      registry,
+      session: input.session,
+      ...input.projectDataFlowSource === void 0 ? {} : { projectDataFlowSource: input.projectDataFlowSource },
+      ...input.bootstrap === void 0 ? {} : { bootstrap: input.bootstrap },
+      ...input.logger === void 0 ? {} : { logger: input.logger },
+      ...input.editorLauncher === void 0 ? {} : { editorLauncher: input.editorLauncher },
+      ...agentManager === void 0 ? {} : { agentManager },
+      ...contextualAskManager === void 0 ? {} : { contextualAskManager },
+      ...externalHandoffService === void 0 ? {} : { externalHandoffService },
+      ...externalAgentControl === void 0 ? {} : { externalAgentControl }
+    });
+    cleanups.push(() => {
+      middleware.dispose();
+    });
+    return Object.freeze({ middleware, close });
+  } catch (error) {
+    try {
+      await close();
+    } catch (cleanupError) {
+      throw new AggregateError(
+        [error, cleanupError],
+        "SpotPatch service startup and cleanup failed."
+      );
+    }
+    throw error;
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ContextualAskError,
@@ -5860,6 +5980,7 @@ function parseSerializedSpotPatchOptions(value) {
   createAgentJobManager,
   createConfiguredKeyAskExecutors,
   createContextualAskManager,
+  createDevelopmentSession,
   createExternalHandoffService,
   createIntegrationFileChange,
   createRuntimeAiConfig,