@spotpatch/dev-server 0.10.1 → 0.11.1

package/dist/index.d.cts

@@ -322,12 +322,20 @@ interface CreateConfiguredKeyAskExecutorsOptions {
 /** Builds one isolated read-only Ask executor per configured Provider/model pair. */
 declare function createConfiguredKeyAskExecutors(options: CreateConfiguredKeyAskExecutorsOptions): readonly ContextualAskExecutor[];
 
+/** Executors that drive a locally installed Agent CLI instead of an API key. */
+interface ManagedAskExecutors {
+    readonly codex: ContextualAskExecutor;
+    readonly claudeCode: ContextualAskExecutor;
+}
 interface ComposeContextualAskExecutorsOptions {
     readonly configuredKey: readonly ContextualAskExecutor[];
-    readonly managedCodex: ContextualAskExecutor;
+    readonly managed: ManagedAskExecutors;
     readonly defaultExecutor?: ContextualAskExecutorPreference;
 }
-/** Orders independent executor implementations without coupling dev-server to Codex. */
+/**
+ * Orders independent executor implementations without coupling dev-server to
+ * any Agent. The preferred kind comes first; otherwise configured keys lead.
+ */
 declare function composeContextualAskExecutors(options: ComposeContextualAskExecutorsOptions): readonly ContextualAskExecutor[];
 
 interface SpotPatchSession {
@@ -438,7 +446,7 @@ interface DevelopmentSessionInput extends Omit<CreateMiddlewareOptions, "agentMa
     readonly resolveSourceImports?: CreateContextualAskManagerOptions["resolveSourceImports"];
     readonly environment: Readonly<Record<string, string | undefined>>;
     readonly executionRoot?: string;
-    readonly createManagedAskExecutor: () => ContextualAskExecutor;
+    readonly createManagedAskExecutors: () => ManagedAskExecutors;
     readonly createExternalAgentControl: (validation: ResolvedManagedExecutionValidation) => Promise<ExternalAgentControlPort>;
     readonly resolveValidation?: () => Promise<ResolvedManagedExecutionValidation>;
 }
@@ -449,4 +457,4 @@ interface DevelopmentSession {
 /** Owns feature services, not HTTP listeners or framework-specific transports. */
 declare function createDevelopmentSession(input: DevelopmentSessionInput): Promise<DevelopmentSession>;
 
-export { type AgentJobEventListener, type AgentJobManager, type CaptureAskReadSnapshotOptions, type CapturedAskReadSnapshot, type ComposeContextualAskExecutorsOptions, ContextualAskError, type ContextualAskJobEventListener, type ContextualAskManager, type ContextualAskRoute, type CreateAgentJobManagerOptions, type CreateConfiguredKeyAskExecutorsOptions, type CreateContextualAskManagerOptions, type CreateExternalHandoffServiceOptions, type CreateMiddlewareOptions, DEFAULT_EXCLUDE, DEFAULT_OPTIONS, type DevelopmentSession, type DevelopmentSessionInput, type DiscoverProjectValidationCheckOptions, type EnvironmentAiConfiguration, type ExternalAgentControlPort, type ExternalHandoffService, type FilterEntry, type IntegrationFileChange, type IntegrationPlan, type ResolveManagedExecutionValidationOptions, type ResolveProjectOptionsInput, type ResolveProjectValidationChecksOptions, type ResolvedContextualAskOptions, type ResolvedManagedExecutionValidation, type ResolvedRuntimeBootstrapOptions, type ResolvedSpotPatchDataFlowOptions, type ResolvedSpotPatchOptions, type RuntimeBootstrapOptions, type SerializedFilterEntry, type SerializedSpotPatchOptions, type SimpleAiOptions, type SourceRegistrationHandler, type SourceRegistrationService, type SourceRegistrationServiceOptions, type SourceRegistry, type SpotPatchAiOptions, type SpotPatchDataFlowOptions, type SpotPatchMiddleware, type SpotPatchNext, type SpotPatchOptions, type SpotPatchServerLogger, type SpotPatchSession, type WorkspaceActivityCoordinator, type WorkspaceActivityKind, type WorkspaceActivityLease, applyIntegrationPlan, captureAskReadSnapshot, composeContextualAskExecutors, createAgentJobManager, createConfiguredKeyAskExecutors, createContextualAskManager, createDevelopmentSession, createExternalHandoffService, createIntegrationFileChange, createRuntimeAiConfig, createRuntimeDataFlowConfig, createSession, createSourceRegistrationService, createSourceRegistry, createSpotPatchMiddleware, createWorkspaceActivityCoordinator, discoverProjectValidationCheck, handleContextualAskRequest, integrationPathExists, isLoopbackHostname, matchContextualAskPath, parseSerializedSpotPatchOptions, readIntegrationFile, readJsonRequestBody, readRuntimeBootstrap, resolveCredentialEnvironment, resolveEnvironmentAiConfiguration, resolveManagedExecutionValidation, resolveOptions, resolveProjectOptions, resolveProjectValidationChecks, resolveRuntimeBootstrapOptions, serializeResolvedSpotPatchOptions };
+export { type AgentJobEventListener, type AgentJobManager, type CaptureAskReadSnapshotOptions, type CapturedAskReadSnapshot, type ComposeContextualAskExecutorsOptions, ContextualAskError, type ContextualAskJobEventListener, type ContextualAskManager, type ContextualAskRoute, type CreateAgentJobManagerOptions, type CreateConfiguredKeyAskExecutorsOptions, type CreateContextualAskManagerOptions, type CreateExternalHandoffServiceOptions, type CreateMiddlewareOptions, DEFAULT_EXCLUDE, DEFAULT_OPTIONS, type DevelopmentSession, type DevelopmentSessionInput, type DiscoverProjectValidationCheckOptions, type EnvironmentAiConfiguration, type ExternalAgentControlPort, type ExternalHandoffService, type FilterEntry, type IntegrationFileChange, type IntegrationPlan, type ManagedAskExecutors, type ResolveManagedExecutionValidationOptions, type ResolveProjectOptionsInput, type ResolveProjectValidationChecksOptions, type ResolvedContextualAskOptions, type ResolvedManagedExecutionValidation, type ResolvedRuntimeBootstrapOptions, type ResolvedSpotPatchDataFlowOptions, type ResolvedSpotPatchOptions, type RuntimeBootstrapOptions, type SerializedFilterEntry, type SerializedSpotPatchOptions, type SimpleAiOptions, type SourceRegistrationHandler, type SourceRegistrationService, type SourceRegistrationServiceOptions, type SourceRegistry, type SpotPatchAiOptions, type SpotPatchDataFlowOptions, type SpotPatchMiddleware, type SpotPatchNext, type SpotPatchOptions, type SpotPatchServerLogger, type SpotPatchSession, type WorkspaceActivityCoordinator, type WorkspaceActivityKind, type WorkspaceActivityLease, applyIntegrationPlan, captureAskReadSnapshot, composeContextualAskExecutors, createAgentJobManager, createConfiguredKeyAskExecutors, createContextualAskManager, createDevelopmentSession, createExternalHandoffService, createIntegrationFileChange, createRuntimeAiConfig, createRuntimeDataFlowConfig, createSession, createSourceRegistrationService, createSourceRegistry, createSpotPatchMiddleware, createWorkspaceActivityCoordinator, discoverProjectValidationCheck, handleContextualAskRequest, integrationPathExists, isLoopbackHostname, matchContextualAskPath, parseSerializedSpotPatchOptions, readIntegrationFile, readJsonRequestBody, readRuntimeBootstrap, resolveCredentialEnvironment, resolveEnvironmentAiConfiguration, resolveManagedExecutionValidation, resolveOptions, resolveProjectOptions, resolveProjectValidationChecks, resolveRuntimeBootstrapOptions, serializeResolvedSpotPatchOptions };

package/dist/index.d.ts

@@ -322,12 +322,20 @@ interface CreateConfiguredKeyAskExecutorsOptions {
 /** Builds one isolated read-only Ask executor per configured Provider/model pair. */
 declare function createConfiguredKeyAskExecutors(options: CreateConfiguredKeyAskExecutorsOptions): readonly ContextualAskExecutor[];
 
+/** Executors that drive a locally installed Agent CLI instead of an API key. */
+interface ManagedAskExecutors {
+    readonly codex: ContextualAskExecutor;
+    readonly claudeCode: ContextualAskExecutor;
+}
 interface ComposeContextualAskExecutorsOptions {
     readonly configuredKey: readonly ContextualAskExecutor[];
-    readonly managedCodex: ContextualAskExecutor;
+    readonly managed: ManagedAskExecutors;
     readonly defaultExecutor?: ContextualAskExecutorPreference;
 }
-/** Orders independent executor implementations without coupling dev-server to Codex. */
+/**
+ * Orders independent executor implementations without coupling dev-server to
+ * any Agent. The preferred kind comes first; otherwise configured keys lead.
+ */
 declare function composeContextualAskExecutors(options: ComposeContextualAskExecutorsOptions): readonly ContextualAskExecutor[];
 
 interface SpotPatchSession {
@@ -438,7 +446,7 @@ interface DevelopmentSessionInput extends Omit<CreateMiddlewareOptions, "agentMa
     readonly resolveSourceImports?: CreateContextualAskManagerOptions["resolveSourceImports"];
     readonly environment: Readonly<Record<string, string | undefined>>;
     readonly executionRoot?: string;
-    readonly createManagedAskExecutor: () => ContextualAskExecutor;
+    readonly createManagedAskExecutors: () => ManagedAskExecutors;
     readonly createExternalAgentControl: (validation: ResolvedManagedExecutionValidation) => Promise<ExternalAgentControlPort>;
     readonly resolveValidation?: () => Promise<ResolvedManagedExecutionValidation>;
 }
@@ -449,4 +457,4 @@ interface DevelopmentSession {
 /** Owns feature services, not HTTP listeners or framework-specific transports. */
 declare function createDevelopmentSession(input: DevelopmentSessionInput): Promise<DevelopmentSession>;
 
-export { type AgentJobEventListener, type AgentJobManager, type CaptureAskReadSnapshotOptions, type CapturedAskReadSnapshot, type ComposeContextualAskExecutorsOptions, ContextualAskError, type ContextualAskJobEventListener, type ContextualAskManager, type ContextualAskRoute, type CreateAgentJobManagerOptions, type CreateConfiguredKeyAskExecutorsOptions, type CreateContextualAskManagerOptions, type CreateExternalHandoffServiceOptions, type CreateMiddlewareOptions, DEFAULT_EXCLUDE, DEFAULT_OPTIONS, type DevelopmentSession, type DevelopmentSessionInput, type DiscoverProjectValidationCheckOptions, type EnvironmentAiConfiguration, type ExternalAgentControlPort, type ExternalHandoffService, type FilterEntry, type IntegrationFileChange, type IntegrationPlan, type ResolveManagedExecutionValidationOptions, type ResolveProjectOptionsInput, type ResolveProjectValidationChecksOptions, type ResolvedContextualAskOptions, type ResolvedManagedExecutionValidation, type ResolvedRuntimeBootstrapOptions, type ResolvedSpotPatchDataFlowOptions, type ResolvedSpotPatchOptions, type RuntimeBootstrapOptions, type SerializedFilterEntry, type SerializedSpotPatchOptions, type SimpleAiOptions, type SourceRegistrationHandler, type SourceRegistrationService, type SourceRegistrationServiceOptions, type SourceRegistry, type SpotPatchAiOptions, type SpotPatchDataFlowOptions, type SpotPatchMiddleware, type SpotPatchNext, type SpotPatchOptions, type SpotPatchServerLogger, type SpotPatchSession, type WorkspaceActivityCoordinator, type WorkspaceActivityKind, type WorkspaceActivityLease, applyIntegrationPlan, captureAskReadSnapshot, composeContextualAskExecutors, createAgentJobManager, createConfiguredKeyAskExecutors, createContextualAskManager, createDevelopmentSession, createExternalHandoffService, createIntegrationFileChange, createRuntimeAiConfig, createRuntimeDataFlowConfig, createSession, createSourceRegistrationService, createSourceRegistry, createSpotPatchMiddleware, createWorkspaceActivityCoordinator, discoverProjectValidationCheck, handleContextualAskRequest, integrationPathExists, isLoopbackHostname, matchContextualAskPath, parseSerializedSpotPatchOptions, readIntegrationFile, readJsonRequestBody, readRuntimeBootstrap, resolveCredentialEnvironment, resolveEnvironmentAiConfiguration, resolveManagedExecutionValidation, resolveOptions, resolveProjectOptions, resolveProjectValidationChecks, resolveRuntimeBootstrapOptions, serializeResolvedSpotPatchOptions };
+export { type AgentJobEventListener, type AgentJobManager, type CaptureAskReadSnapshotOptions, type CapturedAskReadSnapshot, type ComposeContextualAskExecutorsOptions, ContextualAskError, type ContextualAskJobEventListener, type ContextualAskManager, type ContextualAskRoute, type CreateAgentJobManagerOptions, type CreateConfiguredKeyAskExecutorsOptions, type CreateContextualAskManagerOptions, type CreateExternalHandoffServiceOptions, type CreateMiddlewareOptions, DEFAULT_EXCLUDE, DEFAULT_OPTIONS, type DevelopmentSession, type DevelopmentSessionInput, type DiscoverProjectValidationCheckOptions, type EnvironmentAiConfiguration, type ExternalAgentControlPort, type ExternalHandoffService, type FilterEntry, type IntegrationFileChange, type IntegrationPlan, type ManagedAskExecutors, type ResolveManagedExecutionValidationOptions, type ResolveProjectOptionsInput, type ResolveProjectValidationChecksOptions, type ResolvedContextualAskOptions, type ResolvedManagedExecutionValidation, type ResolvedRuntimeBootstrapOptions, type ResolvedSpotPatchDataFlowOptions, type ResolvedSpotPatchOptions, type RuntimeBootstrapOptions, type SerializedFilterEntry, type SerializedSpotPatchOptions, type SimpleAiOptions, type SourceRegistrationHandler, type SourceRegistrationService, type SourceRegistrationServiceOptions, type SourceRegistry, type SpotPatchAiOptions, type SpotPatchDataFlowOptions, type SpotPatchMiddleware, type SpotPatchNext, type SpotPatchOptions, type SpotPatchServerLogger, type SpotPatchSession, type WorkspaceActivityCoordinator, type WorkspaceActivityKind, type WorkspaceActivityLease, applyIntegrationPlan, captureAskReadSnapshot, composeContextualAskExecutors, createAgentJobManager, createConfiguredKeyAskExecutors, createContextualAskManager, createDevelopmentSession, createExternalHandoffService, createIntegrationFileChange, createRuntimeAiConfig, createRuntimeDataFlowConfig, createSession, createSourceRegistrationService, createSourceRegistry, createSpotPatchMiddleware, createWorkspaceActivityCoordinator, discoverProjectValidationCheck, handleContextualAskRequest, integrationPathExists, isLoopbackHostname, matchContextualAskPath, parseSerializedSpotPatchOptions, readIntegrationFile, readJsonRequestBody, readRuntimeBootstrap, resolveCredentialEnvironment, resolveEnvironmentAiConfiguration, resolveManagedExecutionValidation, resolveOptions, resolveProjectOptions, resolveProjectValidationChecks, resolveRuntimeBootstrapOptions, serializeResolvedSpotPatchOptions };

package/dist/index.js

@@ -2699,7 +2699,9 @@ function confidence(value) {
 async function authorizeSeeds(selection, registry, root, realRoot) {
   const byPath = /* @__PURE__ */ new Map();
   for (const target of selection.targets) {
-    let fileId = target.react.source?.fileId ?? target.source.fileId;
+    const location = target.react.source?.fileId === void 0 ? target.source : target.react.source;
+    let fileId = location.fileId;
+    let claimedRelative = location.relativePath;
     let sourceVersion;
     if (target.react.componentSourceId !== void 0) {
       const anchor = registry.resolveDataFlowComponent(target.react.componentSourceId);
@@ -2707,6 +2709,7 @@ async function authorizeSeeds(selection, registry, root, realRoot) {
         deny("ASK_SELECTION_STALE");
       }
       fileId = anchor.fileId;
+      claimedRelative = void 0;
       sourceVersion = anchor.sourceVersion;
     }
     if (fileId === void 0) continue;
@@ -2716,7 +2719,6 @@ async function authorizeSeeds(selection, registry, root, realRoot) {
     if (canonical === void 0) deny("ASK_SELECTION_STALE");
     const absolutePath = path5.normalize(canonical);
     const registeredRelative = toPosixRelative(realRoot, absolutePath);
-    const claimedRelative = target.react.source?.relativePath ?? target.source.relativePath;
     if (claimedRelative !== void 0 && claimedRelative.split("\\").join("/") !== registeredRelative) {
       deny("ASK_SELECTION_STALE");
     }
@@ -3637,8 +3639,10 @@ function createConfiguredKeyAskExecutors(options) {
 
 // src/contextual-ask/executors.ts
 function composeContextualAskExecutors(options) {
+  const { codex, claudeCode } = options.managed;
+  const preference = options.defaultExecutor?.kind;
   return Object.freeze(
-    options.defaultExecutor?.kind === "managed-codex" ? [options.managedCodex, ...options.configuredKey] : [...options.configuredKey, options.managedCodex]
+    preference === "managed-codex" ? [codex, claudeCode, ...options.configuredKey] : preference === "claude-code" ? [claudeCode, codex, ...options.configuredKey] : [...options.configuredKey, codex, claudeCode]
   );
 }
 
@@ -3907,6 +3911,7 @@ import {
 import { realpath as realpath6 } from "fs/promises";
 import path8 from "path";
 import {
+  ELEMENT_INSTANCE_LIMITS,
   ERROR_CODES as ERROR_CODES9,
   SpotPatchError as SpotPatchError9,
   redactSensitiveText,
@@ -4297,17 +4302,14 @@ function freezeMatchedRule(rule) {
   });
 }
 function targetIdentity(target) {
-  const source = target.source;
-  if (source.fileId !== void 0 && source.line !== void 0 && source.column !== void 0) {
-    return `source:${source.fileId}:${String(source.line)}:${String(source.column)}`;
-  }
-  return [
-    "element",
-    source.origin,
-    source.relativePath ?? "",
+  if (target.element.instance !== void 0)
+    return `instance:${target.element.instance.id}`;
+  return JSON.stringify([
+    target.page?.url ?? "",
+    target.source,
     target.element.selector,
     target.element.sanitizedHtml
-  ].join("\0");
+  ]);
 }
 async function authorizeTarget(target, input) {
   const source = await authorizeSourceRef(target.source, input.registry, input.root);
@@ -4344,6 +4346,19 @@ async function authorizeTarget(target, input) {
       ...reactSource === void 0 ? {} : { source: reactSource }
     }),
     element: Object.freeze({
+      ...target.element.instance === void 0 ? {} : {
+        instance: Object.freeze({
+          ...target.element.instance,
+          label: redactSensitiveText(target.element.instance.label).slice(
+            0,
+            ELEMENT_INSTANCE_LIMITS.labelCharacters
+          ),
+          context: redactSensitiveText(target.element.instance.context).slice(
+            0,
+            ELEMENT_INSTANCE_LIMITS.contextCharacters
+          )
+        })
+      },
       tagName: target.element.tagName,
       selector: target.element.selector,
       sanitizedHtml: target.element.sanitizedHtml,
@@ -5905,9 +5920,9 @@ function parseContextualAsk(value) {
     throw new TypeError("The SpotPatch contextual Ask transport is invalid.");
   }
   const preference = value.defaultExecutor;
-  if (preference.kind === "managed-codex" && hasExactKeys(preference, ["kind"])) {
+  if ((preference.kind === "managed-codex" || preference.kind === "claude-code") && hasExactKeys(preference, ["kind"])) {
     return Object.freeze({
-      defaultExecutor: Object.freeze({ kind: "managed-codex" })
+      defaultExecutor: Object.freeze({ kind: preference.kind })
     });
   }
   if (preference.kind === "configured-key" && hasExactKeys(preference, ["kind", "modelProfileId", "providerProfileId"]) && typeof preference.providerProfileId === "string" && typeof preference.modelProfileId === "string") {
@@ -5999,7 +6014,7 @@ async function createDevelopmentSession(input) {
           environment: input.environment,
           ...preference
         }),
-        managedCodex: input.createManagedAskExecutor(),
+        managed: input.createManagedAskExecutors(),
         ...preference
       })
     });