fix: Pause point status, await, and clear find a marker whichever path names the file

.agents/skills/uloop-pause-point/SKILL.md

@@ -95,7 +95,7 @@ On a wait timeout, `PAUSE_POINT_EXPIRED`, or an enable failure, read `Error.Deta
 - Patches drop on every compile or domain reload (the compile / Play-entry responses warn). `--persist` re-arms automatically (`references/persist.md`).
 - Physics message methods, their helpers, and pre-bound delegates can miss hits on pre-existing GameObjects; enable warns where detectable.
 - An `--id` marker waits on your `UloopPausePoint.Pause(id)` call (`using io.github.hatayama.UnityCliLoop.Runtime;`); its hits record no `CapturedVariables`.
-- Every `--file` form resolves to the asset path (`Packages/<package-id>/...` for a package script), which the marker `Id` uses; pass that `Id` to status, await, and clear.
+- Every `--file` form resolves to the asset path (`Packages/<package-id>/...` for a package script), which the marker `Id` uses; status, await, and clear find it by any form.
 
 ## Reference Guides
 

.agents/skills/uloop-pause-point/references/troubleshooting.md

@@ -86,7 +86,7 @@ A "No method named '<name>' ..." failure means no method matching `--method` has
 
 ## File Path Forms
 
-`--file` takes the asset path Unity shows (`Assets/...` or `Packages/<package-id>/...`), the path under a package's folder (`Packages/<folder>/...` for an embedded package), or an absolute path. Every form resolves to the asset path, and a file:line marker's `Id` is `<asset path>:<line>`. `pause-point-status`, `await-pause-point`, and `clear-pause-point` look the marker up by that `Id`, so pass the `Id` the enable response returned, or `--file` in the asset path form; `--file` in another form names a different `Id` and finds no marker.
+`--file` takes the asset path Unity shows (`Assets/...` or `Packages/<package-id>/...`), the path under a package's folder (`Packages/<folder>/...` for an embedded package), or an absolute path. Every form resolves to the asset path, and a file:line marker's `Id` is `<asset path>:<line>`. `pause-point-status`, `await-pause-point`, and `clear-pause-point` resolve `--file` (or an `--id` of the form `<path>:<line>`) the same way, so every form finds the same marker. A named marker's `Id` is looked up as given.
 
 ## Debug-switch trade-offs
 

.claude/skills/uloop-pause-point/SKILL.md

@@ -95,7 +95,7 @@ On a wait timeout, `PAUSE_POINT_EXPIRED`, or an enable failure, read `Error.Deta
 - Patches drop on every compile or domain reload (the compile / Play-entry responses warn). `--persist` re-arms automatically (`references/persist.md`).
 - Physics message methods, their helpers, and pre-bound delegates can miss hits on pre-existing GameObjects; enable warns where detectable.
 - An `--id` marker waits on your `UloopPausePoint.Pause(id)` call (`using io.github.hatayama.UnityCliLoop.Runtime;`); its hits record no `CapturedVariables`.
-- Every `--file` form resolves to the asset path (`Packages/<package-id>/...` for a package script), which the marker `Id` uses; pass that `Id` to status, await, and clear.
+- Every `--file` form resolves to the asset path (`Packages/<package-id>/...` for a package script), which the marker `Id` uses; status, await, and clear find it by any form.
 
 ## Reference Guides
 

.claude/skills/uloop-pause-point/references/troubleshooting.md

@@ -86,7 +86,7 @@ A "No method named '<name>' ..." failure means no method matching `--method` has
 
 ## File Path Forms
 
-`--file` takes the asset path Unity shows (`Assets/...` or `Packages/<package-id>/...`), the path under a package's folder (`Packages/<folder>/...` for an embedded package), or an absolute path. Every form resolves to the asset path, and a file:line marker's `Id` is `<asset path>:<line>`. `pause-point-status`, `await-pause-point`, and `clear-pause-point` look the marker up by that `Id`, so pass the `Id` the enable response returned, or `--file` in the asset path form; `--file` in another form names a different `Id` and finds no marker.
+`--file` takes the asset path Unity shows (`Assets/...` or `Packages/<package-id>/...`), the path under a package's folder (`Packages/<folder>/...` for an embedded package), or an absolute path. Every form resolves to the asset path, and a file:line marker's `Id` is `<asset path>:<line>`. `pause-point-status`, `await-pause-point`, and `clear-pause-point` resolve `--file` (or an `--id` of the form `<path>:<line>`) the same way, so every form finds the same marker. A named marker's `Id` is looked up as given.
 
 ## Debug-switch trade-offs
 

Assets/Tests/Editor/PausePointQueryScriptPathFormTests.cs

@@ -0,0 +1,148 @@
+using System;
+
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+using io.github.hatayama.UnityCliLoop.FirstPartyTools;
+using io.github.hatayama.UnityCliLoop.Infrastructure;
+using io.github.hatayama.UnityCliLoop.Runtime;
+using io.github.hatayama.UnityCliLoop.ToolContracts;
+
+namespace io.github.hatayama.UnityCliLoop.Tests.Editor
+{
+    /// <summary>
+    /// Verifies that status, extend, and clear reach a source pause point whichever path form the
+    /// query names its file by, while a named marker is looked up by its id as given.
+    /// </summary>
+    public sealed class PausePointQueryScriptPathFormTests
+    {
+        // An embedded package whose folder name differs from its package name, so the folder path
+        // and the asset path of the same script differ.
+        private const string PackageAssetPath =
+            "Packages/io.github.hatayama.uloop.hotreload-package-fixture/Runtime/HotReloadPackageFixture.cs";
+        private const string PackagePhysicalPath =
+            "Packages/uloop-hotreload-package-fixture/Runtime/HotReloadPackageFixture.cs";
+        private const string AssetsScriptPath = "Assets/Tests/Editor/PausePointQueryScriptPathFormTests.cs";
+        private const string Line = ":16";
+        private const string ProjectRootToken = "<root>/";
+
+        [SetUp]
+        public void SetUp()
+        {
+            UloopPausePointRegistry.ConfigureForTests(new FakePauseController(), () => DateTime.UtcNow);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            UloopPausePointRegistry.ResetForTests();
+        }
+
+        /// <summary>
+        /// What: a status query naming the file by its folder path, its absolute path, or a ./ path
+        /// finds the marker enabled under the asset path.
+        /// </summary>
+        [TestCase(PackageAssetPath, PackagePhysicalPath)]
+        [TestCase(PackageAssetPath, ProjectRootToken + PackagePhysicalPath)]
+        [TestCase(PackageAssetPath, "./" + PackagePhysicalPath)]
+        [TestCase(PackageAssetPath, "./" + PackageAssetPath)]
+        [TestCase(AssetsScriptPath, "./" + AssetsScriptPath)]
+        [TestCase(AssetsScriptPath, ProjectRootToken + AssetsScriptPath)]
+        [TestCase(AssetsScriptPath, "Assets/Tests/../Tests/Editor/PausePointQueryScriptPathFormTests.cs")]
+        public void Status_ByAnotherPathForm_FindsTheMarkerEnabledByTheAssetPath(string enabledPath, string queriedPath)
+        {
+            string markerId = enabledPath + Line;
+            UloopPausePointRegistry.Enable(markerId, 30);
+
+            PausePointStatusResponse response = PausePointStatusBridgeCommand.Execute(IdParams(queriedPath + Line));
+
+            Assert.That(response.Status, Is.EqualTo(UloopPausePointStatus.Enabled));
+            Assert.That(response.Id, Is.EqualTo(markerId));
+        }
+
+        /// <summary>
+        /// What: the extend an await sends names the file as the user typed it and still extends the marker.
+        /// </summary>
+        [Test]
+        public void Extend_ByTheFolderPath_ExtendsTheMarkerEnabledByTheAssetPath()
+        {
+            string markerId = PackageAssetPath + Line;
+            UloopPausePointRegistry.Enable(markerId, 1);
+            JObject parameters = IdParams(PackagePhysicalPath + Line);
+            parameters["MinimumRemainingSeconds"] = 60;
+
+            PausePointStatusResponse response = PausePointStatusBridgeCommand.Extend(parameters);
+
+            Assert.That(response.Id, Is.EqualTo(markerId));
+            Assert.That(response.RemainingMilliseconds, Is.GreaterThan(30000));
+        }
+
+        /// <summary>
+        /// What: the clear sent after an await times out removes the marker when it names the folder path.
+        /// </summary>
+        [Test]
+        public void BridgeClear_ByTheFolderPath_ClearsTheMarkerEnabledByTheAssetPath()
+        {
+            string markerId = PackageAssetPath + Line;
+            UloopPausePointRegistry.Enable(markerId, 30);
+
+            PausePointStatusBridgeCommand.Clear(IdParams(PackagePhysicalPath + Line));
+
+            Assert.That(UloopPausePointRegistry.IsArmed(markerId), Is.False);
+        }
+
+        /// <summary>
+        /// What: clear-pause-point --file with the folder path removes the marker enabled under the asset path.
+        /// </summary>
+        [Test]
+        public void ToolClear_ByTheFolderPath_ClearsTheMarkerEnabledByTheAssetPath()
+        {
+            string markerId = PackageAssetPath + Line;
+            UloopPausePointRegistry.Enable(markerId, 30);
+
+            new PausePointUseCase().Clear(new ClearPausePointSchema { Id = PackagePhysicalPath + Line });
+
+            Assert.That(UloopPausePointRegistry.IsArmed(markerId), Is.False);
+        }
+
+        /// <summary>
+        /// What: a named marker is looked up by the id as given, even when the id reads like a path
+        /// and line that a rewrite would change.
+        /// </summary>
+        [TestCase("./jump")]
+        [TestCase("./jump:1")]
+        [TestCase("Enemy\\Attack:2")]
+        public void Status_NamedMarker_IsLookedUpByItsIdAsGiven(string markerId)
+        {
+            UloopPausePointRegistry.Enable(markerId, 30);
+
+            PausePointStatusResponse response = PausePointStatusBridgeCommand.Execute(IdParams(markerId));
+
+            Assert.That(response.Status, Is.EqualTo(UloopPausePointStatus.Enabled));
+            Assert.That(response.Id, Is.EqualTo(markerId));
+        }
+
+        private static JObject IdParams(string id)
+        {
+            string resolved = id.StartsWith(ProjectRootToken, StringComparison.Ordinal)
+                ? UnityCliLoopPathResolver.GetProjectRoot().Replace('\\', '/').TrimEnd('/') + "/"
+                    + id.Substring(ProjectRootToken.Length)
+                : id;
+            return new JObject { ["Id"] = resolved };
+        }
+
+        private sealed class FakePauseController : IUloopPausePointPauseController
+        {
+            public bool IsPlaying => true;
+            public bool IsPaused => false;
+
+            public void Pause()
+            {
+            }
+
+            public void Resume()
+            {
+            }
+        }
+    }
+}

Packages/src/Editor/CliOnlyTools~/PausePoint/Skill/SKILL.md

@@ -95,7 +95,7 @@ On a wait timeout, `PAUSE_POINT_EXPIRED`, or an enable failure, read `Error.Deta
 - Patches drop on every compile or domain reload (the compile / Play-entry responses warn). `--persist` re-arms automatically (`references/persist.md`).
 - Physics message methods, their helpers, and pre-bound delegates can miss hits on pre-existing GameObjects; enable warns where detectable.
 - An `--id` marker waits on your `UloopPausePoint.Pause(id)` call (`using io.github.hatayama.UnityCliLoop.Runtime;`); its hits record no `CapturedVariables`.
-- Every `--file` form resolves to the asset path (`Packages/<package-id>/...` for a package script), which the marker `Id` uses; pass that `Id` to status, await, and clear.
+- Every `--file` form resolves to the asset path (`Packages/<package-id>/...` for a package script), which the marker `Id` uses; status, await, and clear find it by any form.
 
 ## Reference Guides
 

Packages/src/Editor/CliOnlyTools~/PausePoint/Skill/references/troubleshooting.md

@@ -86,7 +86,7 @@ A "No method named '<name>' ..." failure means no method matching `--method` has
 
 ## File Path Forms
 
-`--file` takes the asset path Unity shows (`Assets/...` or `Packages/<package-id>/...`), the path under a package's folder (`Packages/<folder>/...` for an embedded package), or an absolute path. Every form resolves to the asset path, and a file:line marker's `Id` is `<asset path>:<line>`. `pause-point-status`, `await-pause-point`, and `clear-pause-point` look the marker up by that `Id`, so pass the `Id` the enable response returned, or `--file` in the asset path form; `--file` in another form names a different `Id` and finds no marker.
+`--file` takes the asset path Unity shows (`Assets/...` or `Packages/<package-id>/...`), the path under a package's folder (`Packages/<folder>/...` for an embedded package), or an absolute path. Every form resolves to the asset path, and a file:line marker's `Id` is `<asset path>:<line>`. `pause-point-status`, `await-pause-point`, and `clear-pause-point` resolve `--file` (or an `--id` of the form `<path>:<line>`) the same way, so every form finds the same marker. A named marker's `Id` is looked up as given.
 
 ## Debug-switch trade-offs
 

Packages/src/Editor/FirstPartyTools/Common/ScriptPath/AssemblyInfo.cs

@@ -3,4 +3,5 @@
 [assembly: InternalsVisibleTo("UnityCLILoop.FirstPartyTools.HotReload.Shared.Editor")]
 [assembly: InternalsVisibleTo("UnityCLILoop.FirstPartyTools.HotReload.Editor")]
 [assembly: InternalsVisibleTo("UnityCLILoop.FirstPartyTools.PausePoint.Editor")]
+[assembly: InternalsVisibleTo("UnityCLILoop.Infrastructure")]
 [assembly: InternalsVisibleTo("UnityCLILoop.Tests.Editor.HotReload")]

Packages/src/Editor/FirstPartyTools/Common/ScriptPath/SourcePausePointId.cs

@@ -0,0 +1,82 @@
+using System;
+using System.IO;
+
+using UnityEngine;
+
+namespace io.github.hatayama.UnityCliLoop.FirstPartyTools
+{
+    /// <summary>
+    /// The id of a pause point set at a source location, <c>&lt;asset path&gt;:&lt;line&gt;</c>: built
+    /// once when the marker is enabled, and rebuilt from whatever path form a later query names
+    /// the file by, so every form reaches the same marker.
+    /// </summary>
+    internal static class SourcePausePointId
+    {
+        internal static string Build(string assetPath, int line)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(assetPath), "assetPath must not be empty.");
+            return assetPath + ":" + line;
+        }
+
+        /// <summary>
+        /// Returns the id a query names its marker by. An id already registered, such as a named
+        /// marker, comes back as given. Otherwise an id in the source form has its path rewritten
+        /// to the asset path; any other id, and a source id whose path is already the asset path,
+        /// comes back unchanged. Must be called on the Unity main thread.
+        /// </summary>
+        internal static string ToMarkerId(string id, string projectRoot, Func<string, bool> isRegistered)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(id), "id must not be empty.");
+            Debug.Assert(!string.IsNullOrEmpty(projectRoot), "projectRoot must not be empty.");
+            Debug.Assert(isRegistered != null, "isRegistered must not be null.");
+
+            // Why first: a named marker may itself read like <path>:<line>, and the rewrite would
+            // send its query to an id nobody enabled.
+            if (isRegistered(id))
+            {
+                return id;
+            }
+
+            int separator = id.LastIndexOf(':');
+            if (separator <= 0 || !int.TryParse(id.Substring(separator + 1), out int line))
+            {
+                return id;
+            }
+
+            string path = id.Substring(0, separator);
+            // Why skip the Package Manager for an Assets path: await polls status every second, and
+            // such a path is already its asset path.
+            if (RewriteLeavesUnchanged(path))
+            {
+                return id;
+            }
+
+            string assetPath = ScriptPathNormalizer.ToAssetPath(path, projectRoot, ScriptPackageRoots.ReadCurrent());
+            return assetPath == path ? id : Build(assetPath, line);
+        }
+
+        // Why Packages/ is not skipped: a package's folder path also starts with it, and only the
+        // package roots tell the two apart. Why . and .. segments are not skipped: enable folds them
+        // away, while the CLI sends them as typed.
+        private static bool RewriteLeavesUnchanged(string path)
+        {
+            return !Path.IsPathRooted(path)
+                && path.IndexOf('\\') < 0
+                && !path.StartsWith("Packages/", StringComparison.Ordinal)
+                && !HasDotSegment(path);
+        }
+
+        private static bool HasDotSegment(string path)
+        {
+            foreach (string segment in path.Split('/'))
+            {
+                if (segment == "." || segment == "..")
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}

Packages/src/Editor/FirstPartyTools/PausePoint/PausePointUseCase.cs

@@ -165,8 +165,13 @@ public PausePointResponse Clear(ClearPausePointSchema parameters)
                     "Pass --id with the id returned by enable-pause-point, or use --all to clear every marker.");
             }
 
+            // The CLI turns --file/--line into an id built from the path as typed.
+            string id = SourcePausePointId.ToMarkerId(
+                parameters.Id,
+                UnityCliLoopPathResolver.GetProjectRoot(),
+                UloopPausePointRegistry.Contains);
             (UloopPausePointSnapshot snapshot, bool resumedFromPause, int clearedCount) =
-                UloopPausePointRegistry.Clear(parameters.Id);
+                UloopPausePointRegistry.Clear(id);
             PausePointUseCaseLogger.LogCleared(snapshot.Id, snapshot.StatusBeforeClear);
             if (snapshot.StatusBeforeClear == UloopPausePointStatus.Expired)
             {
@@ -222,7 +227,9 @@ private static PausePointResponse EnableBySourceLocation(
                 parameters.File,
                 UnityCliLoopPathResolver.GetProjectRoot(),
                 ScriptPackageRoots.ReadCurrent());
-            string id = BuildSourcePausePointId(normalizedFile, parameters.Line);
+            // The requested line rather than the resolved one, so repeated calls at the same
+            // requested location stay idempotent whichever path form names the file.
+            string id = SourcePausePointId.Build(normalizedFile, parameters.Line);
             SourcePausePointSnapshotTiming snapshotTiming = ParseSnapshotTiming(parameters.SnapshotTiming);
 
             PausePointHotReloadFileState fileState = PausePointHotReloadFileState.Read(normalizedFile);
@@ -547,13 +554,5 @@ private static PausePointResponse FinishEnableBySourceLocation(
 
             return response;
         }
-
-        // The derived id must use the requested file in its asset path form and the requested line
-        // (not the resolved/rounded line), so repeated calls at the same requested location stay
-        // idempotent whichever path form names the file.
-        private static string BuildSourcePausePointId(string assetPath, int line)
-        {
-            return assetPath + ":" + line;
-        }
     }
 }