検索後も既存cursorの変更履歴を保持する

Author: quolu

Sources/AIShellCore/FactoryDiagnostics.swift

@@ -2,7 +2,7 @@ import Foundation
 
 public enum AIShellProduct {
     public static let identifier = "aishell"
-    public static let version = "0.7.3"
+    public static let version = "0.7.4"
     public static let diagnosticsSchemaVersion = "aishell.native_factory_diagnostics.v1"
     public static let runtimeSchemaVersion = "aishell.runtime_configuration.v3"
     public static let mcpProtocolVersion = "2025-11-25"

Sources/AIShellCore/WorkspaceStateRuntime.swift

@@ -340,10 +340,16 @@ public actor WorkspaceStateRuntime {
             needsPersistence = true
         }
         if !state.journal.events.isEmpty {
-            let appliedSequence = state.journal.sequence
-            _ = try reconcile(paths: state.journal.events.map(\.path), state: &state)
-            state.journal.discardEvents(through: appliedSequence)
-            state.knownChangesBySequence.removeAll(keepingCapacity: true)
+            let retained = state.journal.events
+            let changes = try reconcile(paths: retained.map(\.path), state: &state)
+            // 検索開始は他consumerのackではない。照合済み差分もcursorの保持区間に残す。
+            for change in changes {
+                for event in retained where
+                    Self.relativePath(event.path, root: root.path) == change.path
+                        || Self.relativePath(event.path, root: root.path) == change.previousPath {
+                    state.knownChangesBySequence[event.sequence] = change
+                }
+            }
             needsPersistence = true
         }
         state.prefetchedPaths.removeAll(keepingCapacity: true)

Tests/AIShellCoreTests/WorkspaceStateRuntimeTests.swift

@@ -61,6 +61,33 @@ final class WorkspaceStateRuntimeTests: XCTestCase {
         XCTAssertEqual(changedScanCount, 1)
     }
 
+    func testSearchCursorPreservesEarlierConsumerAcrossNoOpAndChangedEvents() async throws {
+        let fixture = try TemporaryFixture()
+        defer { fixture.cleanup() }
+        let root = fixture.base.appendingPathComponent("workspace", isDirectory: true)
+        try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
+        let file = root.appendingPathComponent("State.swift")
+        try "let value = 1\n".write(to: file, atomically: false, encoding: .utf8)
+        let store = RuntimeStore(baseDirectory: fixture.base.appendingPathComponent("runtime"))
+        await store.setWorkingDirectoryForTesting(root)
+        let runtime = WorkspaceStateRuntime(runtimeStore: store, startsFSEvents: false)
+        let initial = try await runtime.snapshot(path: root.path, contextBudget: 0)
+
+        await runtime.ingestObservedPaths([file.path])
+        _ = try await runtime.currentSearchCursor(path: root.path)
+        let unchanged = try await runtime.snapshot(path: root.path, sinceCursor: initial.cursor)
+        XCTAssertTrue(unchanged.changes.isEmpty)
+
+        try "let value = 2\n".write(to: file, atomically: false, encoding: .utf8)
+        await runtime.ingestObservedPaths([file.path])
+        _ = try await runtime.currentSearchCursor(path: root.path)
+        _ = try await runtime.currentSearchCursor(path: root.path)
+        let changed = try await runtime.snapshot(path: root.path, sinceCursor: initial.cursor)
+        XCTAssertEqual(changed.changes.map(\.path), ["State.swift"])
+        let repeated = try await runtime.snapshot(path: root.path, sinceCursor: initial.cursor)
+        XCTAssertEqual(repeated.changes, changed.changes)
+    }
+
     func testCurrentSearchCursorRestoresCheckpointWithoutFilesystemScan() async throws {
         let fixture = try TemporaryFixture()
         defer { fixture.cleanup() }

docs/archive/releases/release-notes-0.7.4.md

@@ -0,0 +1,12 @@
+# 0.7.4
+
+## 修正
+
+- snapshot後にfilesystem通知を受けてからsearch_contextを使うと、検索開始処理が保持中の変更履歴を破棄し、先のcursorをCURSOR_EXPIREDにしていた問題を修正した。
+- 検索後も変更履歴と照合結果を保持する。実変更がない通知だけなら元のcursorで編集を続けられ、実変更が残る場合はWORKSPACE_CHANGEDで拒否する。
+- 管理UI・Keychain認証の廃止と工場向け診断schemaは維持する。
+
+## 検証
+
+- 修正前にcursor失効を再現するfocused testが失敗し、修正後に成功した。workspace状態の関連テストも成功した。
+- 隔離repoの公開MCP呼出しでsnapshot、読取り、検索、4ファイル編集を確認した。別processのfactory診断を挟んだ継続編集も成功した。

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/aishell",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "A native macOS state runtime with high-density MCP tools for AI development",
   "license": "Apache-2.0",
   "author": {