deepline 0.3.313 → 0.3.315

package/dist/bundling-sources/shared_libs/plays/docflow-binding-owner.ts

@@ -239,9 +239,9 @@ function callSiteExtent(substep: PlayStaticSubstep): DocflowLineExtent | null {
  * An annotation written in the ENTRY file keeps the existing behavior exactly:
  * whatever the resolver prefers, no path check. An annotation written in an
  * imported module is only comparable to a range from that same module — two
- * files both have a line 42 — so it picks the substep's own range or its call
- * site, whichever was recorded in the annotation's file, and matches nothing
- * when neither was.
+ * files both have a line 42. Owner extents union only the children in that
+ * file, while own-call extents stay local. A call reached through another
+ * function remains bounded by its matching caller range.
  */
 function extentForBinding(
   substep: PlayStaticSubstep,
@@ -249,11 +249,34 @@ function extentForBinding(
   extentOf: DocflowExtentResolver,
 ): DocflowLineExtent | null {
   if (!binding.sourcePath) return extentOf(substep);
-  for (const range of [substep.sourceRange, substep.callSiteRange]) {
-    if (range?.sourcePath !== binding.sourcePath) continue;
-    return { startLine: range.startLine, endLine: range.endLine };
+  const sourcePath = binding.sourcePath;
+  const caller = substep.callSiteRange;
+  if (caller?.sourcePath === sourcePath)
+    return { startLine: caller.startLine, endLine: caller.endLine };
+  if (extentOf !== substepSourceExtent) {
+    const own = substep.sourceRange;
+    return own?.sourcePath === sourcePath
+      ? { startLine: own.startLine, endLine: own.endLine }
+      : null;
   }
-  return null;
+  const ranges: PlayStaticSourceRange[] = [];
+  const collect = (candidate: PlayStaticSubstep) => {
+    if (candidate.callSiteRange?.sourcePath === sourcePath) {
+      ranges.push(candidate.callSiteRange);
+      return;
+    }
+    if (candidate.sourceRange?.sourcePath === sourcePath)
+      ranges.push(candidate.sourceRange);
+    const nested = (candidate as { steps?: PlayStaticSubstep[] }).steps;
+    if (Array.isArray(nested)) for (const step of nested) collect(step);
+  };
+  collect(substep);
+  return ranges.length > 0
+    ? {
+        startLine: Math.min(...ranges.map((range) => range.startLine)),
+        endLine: Math.max(...ranges.map((range) => range.endLine)),
+      }
+    : null;
 }
 
 function extentContainsLine(
@@ -268,7 +291,10 @@ function extentContainsLine(
     : null;
 }
 
-/** Smallest containing extent wins, so a nested construct beats its parent. */
+/**
+ * Smallest containing extent wins, so a nested construct beats its parent.
+ * Equal extents in a named file cannot distinguish two imported callers.
+ */
 function smallestContaining<TSubstep extends PlayStaticSubstep>(
   candidates: readonly TSubstep[],
   binding: PlayDocflowBinding,
@@ -276,6 +302,7 @@ function smallestContaining<TSubstep extends PlayStaticSubstep>(
 ): TSubstep | null {
   let best: TSubstep | null = null;
   let bestSpan = Number.POSITIVE_INFINITY;
+  let tied = false;
   for (const candidate of candidates) {
     const extent = extentContainsLine(candidate, binding, extentOf);
     if (!extent) continue;
@@ -283,9 +310,17 @@ function smallestContaining<TSubstep extends PlayStaticSubstep>(
     if (span < bestSpan) {
       best = candidate;
       bestSpan = span;
+      tied = false;
+    } else if (
+      binding.sourcePath &&
+      span === bestSpan &&
+      best &&
+      substepIdentity(candidate) !== substepIdentity(best)
+    ) {
+      tied = true;
     }
   }
-  return best;
+  return tied ? null : best;
 }
 
 /**
@@ -416,7 +451,7 @@ export function docflowBoundToolSubsteps(
   const roots = docflowOutputRoots(binding);
   if (roots.length === 0) return [];
   const matched: DocflowToolSubstep[] = [];
-  const seen = new Set<string>();
+  const seen = new Set<string | DocflowToolSubstep>();
   // Callers hand over whatever shape they hold — the config model passes the
   // top-level stages, whose tools sit several levels down inside step suites
   // and control flow. Flatten here so the answer never depends on that.
@@ -430,7 +465,7 @@ export function docflowBoundToolSubsteps(
       );
       if (!paths.includes(binding.sourcePath)) continue;
     }
-    const identity = `${substep.toolId}::${substep.paramsSource ?? ''}`;
+    const identity = docflowToolCallIdentity(substep) ?? substep;
     if (seen.has(identity)) continue;
     seen.add(identity);
     matched.push(substep);
@@ -438,6 +473,21 @@ export function docflowBoundToolSubsteps(
   return matched;
 }
 
+/** A retained call site, including its imported declaration and caller. */
+export function docflowToolCallIdentity(
+  substep: DocflowToolSubstep,
+): string | null {
+  if (!substep.sourceRange && !substep.callSiteRange) return null;
+  return JSON.stringify([
+    substep.field,
+    substep.sourceRange,
+    substep.callSiteRange,
+    substep.toolId,
+    substep.paramsSource,
+    substep.inputPrelude,
+  ]);
+}
+
 /**
  * The `ctx.runPlay` or `ctx.runPlayAsync` call a `type:"play"` docflow node
  * names. Same join as every other binding — symbol first, extent as the fallback

package/dist/cli/{auth-LNA6WCQA.mjs → auth-OVWOO5NP.mjs}

@@ -9,11 +9,11 @@ import {
   registerAuthCommands,
   reportSetupCompleted,
   resolvePendingAuthClaimForResume
-} from "./chunk-BLMO3JMZ.mjs";
-import "./chunk-CSH4PKPJ.mjs";
-import "./chunk-DOI3UBGV.mjs";
+} from "./chunk-OUIIYFG3.mjs";
+import "./chunk-HNKHMHJ7.mjs";
+import "./chunk-AZWQJAQF.mjs";
 import "./chunk-DLIRSHV6.mjs";
-import "./chunk-HM2TSTCT.mjs";
+import "./chunk-JF4O5OMH.mjs";
 import "./chunk-NXGCO4JB.mjs";
 import "./chunk-WZYKRD7T.mjs";
 import "./chunk-KRD6H754.mjs";

package/dist/cli/auth-P2TTZU36.js

@@ -0,0 +1,31 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+
+
+
+
+
+
+
+
+
+var _chunkOJP4FCCXjs = require('./chunk-OJP4FCCX.js');
+require('./chunk-Y42UERUY.js');
+require('./chunk-URVZGYGG.js');
+require('./chunk-XNYIZMNQ.js');
+require('./chunk-6BJACIVK.js');
+require('./chunk-7P5AA3SN.js');
+require('./chunk-OG64RBAC.js');
+require('./chunk-COGTRVWW.js');
+
+
+
+
+
+
+
+
+
+
+
+exports.EXIT_WORKSPACE_MISMATCH = _chunkOJP4FCCXjs.EXIT_WORKSPACE_MISMATCH; exports.clearPendingClaim = _chunkOJP4FCCXjs.clearPendingClaim; exports.clearSatisfiedPendingClaim = _chunkOJP4FCCXjs.clearSatisfiedPendingClaim; exports.handleRegister = _chunkOJP4FCCXjs.handleRegister; exports.handleStatus = _chunkOJP4FCCXjs.handleStatus; exports.handleWait = _chunkOJP4FCCXjs.handleWait; exports.readPendingAuthClaim = _chunkOJP4FCCXjs.readPendingAuthClaim; exports.registerAuthCommands = _chunkOJP4FCCXjs.registerAuthCommands; exports.reportSetupCompleted = _chunkOJP4FCCXjs.reportSetupCompleted; exports.resolvePendingAuthClaimForResume = _chunkOJP4FCCXjs.resolvePendingAuthClaimForResume;