rubik 0.9.1 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. checksums.yaml +4 -4
  2. data/ATTRIBUTION.md +1 -1
  3. data/CHANGELOG.md +203 -1
  4. data/lib/rubik/adapter/base.rb +2 -1
  5. data/lib/rubik/adapter/process.rb +28 -67
  6. data/lib/rubik/ast/extractor.rb +2 -1
  7. data/lib/rubik/ast/treesitter_extractor.rb +2 -1
  8. data/lib/rubik/benchmark/vakanuvis_adoption.rb +12 -4
  9. data/lib/rubik/buffer/apply_contract.rb +3 -3
  10. data/lib/rubik/buffer/apply_transaction.rb +165 -0
  11. data/lib/rubik/buffer/manager.rb +26 -120
  12. data/lib/rubik/config/deep_ops.rb +4 -1
  13. data/lib/rubik/config/defaults.rb +6 -3
  14. data/lib/rubik/config/schema.rb +8 -0
  15. data/lib/rubik/config/secret_policy.rb +198 -0
  16. data/lib/rubik/config/store.rb +2 -1
  17. data/lib/rubik/config.rb +13 -2
  18. data/lib/rubik/context/ignore_rules.rb +193 -0
  19. data/lib/rubik/context/scanner.rb +46 -161
  20. data/lib/rubik/diagnostics/collector.rb +0 -9
  21. data/lib/rubik/errors.rb +15 -0
  22. data/lib/rubik/event_bus.rb +2 -1
  23. data/lib/rubik/kernel/dispatcher.rb +12 -7
  24. data/lib/rubik/kernel/unit.rb +4 -1
  25. data/lib/rubik/llm/client.rb +6 -200
  26. data/lib/rubik/llm/connection_pool.rb +104 -0
  27. data/lib/rubik/llm/registry.rb +13 -9
  28. data/lib/rubik/llm/router.rb +2 -5
  29. data/lib/rubik/llm/sse_parser.rb +110 -0
  30. data/lib/rubik/log.rb +21 -0
  31. data/lib/rubik/lsp/circuit_breaker.rb +98 -0
  32. data/lib/rubik/lsp/client.rb +77 -273
  33. data/lib/rubik/lsp/client_provisioner.rb +49 -0
  34. data/lib/rubik/lsp/manager.rb +67 -96
  35. data/lib/rubik/lsp/transport.rb +365 -0
  36. data/lib/rubik/mcp/boot_lifecycle.rb +6 -2
  37. data/lib/rubik/mcp/boot_run.rb +190 -0
  38. data/lib/rubik/mcp/manager.rb +55 -166
  39. data/lib/rubik/mcp/transport/stdio.rb +4 -1
  40. data/lib/rubik/orchestrator/auto_apply.rb +8 -6
  41. data/lib/rubik/orchestrator/continuation_manager.rb +3 -22
  42. data/lib/rubik/orchestrator/goal_ledger/ledger.rb +12 -1
  43. data/lib/rubik/orchestrator/goal_ledger/schema_vocabulary.rb +38 -0
  44. data/lib/rubik/orchestrator/goal_ledger/xml_render.rb +6 -1
  45. data/lib/rubik/orchestrator/goal_ledger.rb +1 -0
  46. data/lib/rubik/orchestrator/goal_session.rb +53 -39
  47. data/lib/rubik/orchestrator/loop.rb +28 -47
  48. data/lib/rubik/orchestrator/lsp_feedback.rb +1 -1
  49. data/lib/rubik/orchestrator/maestro_gate.rb +5 -7
  50. data/lib/rubik/orchestrator/provider_recovery.rb +4 -2
  51. data/lib/rubik/orchestrator/provider_resolver.rb +4 -2
  52. data/lib/rubik/orchestrator/resume_window.rb +96 -0
  53. data/lib/rubik/orchestrator/shell_deps.rb +16 -0
  54. data/lib/rubik/orchestrator/step_executor.rb +2 -1
  55. data/lib/rubik/orchestrator/stream_manager.rb +2 -1
  56. data/lib/rubik/orchestrator/subagent/deferred_spec.rb +4 -1
  57. data/lib/rubik/orchestrator/subagent/instance.rb +7 -12
  58. data/lib/rubik/orchestrator/subagent/lifecycle.rb +3 -1
  59. data/lib/rubik/orchestrator/subagent/notices.rb +2 -2
  60. data/lib/rubik/orchestrator/subagent/questioner.rb +3 -1
  61. data/lib/rubik/orchestrator/subagent/reaper.rb +3 -5
  62. data/lib/rubik/orchestrator/subagent/resilience.rb +4 -2
  63. data/lib/rubik/orchestrator/subagent/result_archive.rb +0 -4
  64. data/lib/rubik/orchestrator/subagent/run_cycle.rb +2 -7
  65. data/lib/rubik/orchestrator/subagent/spawn_transaction.rb +11 -2
  66. data/lib/rubik/orchestrator/subagent/step_runner.rb +10 -2
  67. data/lib/rubik/orchestrator/subagent/transcript_formatter.rb +2 -1
  68. data/lib/rubik/orchestrator/subagent/type_definition.rb +0 -4
  69. data/lib/rubik/orchestrator/tool_timeout.rb +121 -1
  70. data/lib/rubik/platform/io_drain.rb +5 -2
  71. data/lib/rubik/platform/process.rb +144 -54
  72. data/lib/rubik/platform.rb +2 -1
  73. data/lib/rubik/plugin/manager.rb +2 -1
  74. data/lib/rubik/plugin/storage.rb +8 -8
  75. data/lib/rubik/repl/commands/agent_context.rb +8 -7
  76. data/lib/rubik/repl/commands/agent_execution.rb +13 -32
  77. data/lib/rubik/repl/commands/agent_models.rb +4 -3
  78. data/lib/rubik/repl/commands/agent_providers.rb +43 -2
  79. data/lib/rubik/repl/commands/base.rb +47 -2
  80. data/lib/rubik/repl/commands/buffer.rb +5 -4
  81. data/lib/rubik/repl/commands/lsp.rb +2 -1
  82. data/lib/rubik/repl/commands/pruner.rb +2 -1
  83. data/lib/rubik/repl/commands/secrets.rb +151 -0
  84. data/lib/rubik/repl/commands/workspace.rb +60 -150
  85. data/lib/rubik/repl/commands/workspace_approval.rb +209 -0
  86. data/lib/rubik/repl/config_wiring.rb +8 -6
  87. data/lib/rubik/repl/hooks.rb +2 -1
  88. data/lib/rubik/repl/input_execution.rb +162 -79
  89. data/lib/rubik/repl/input_loop.rb +2 -1
  90. data/lib/rubik/repl/lifecycle.rb +60 -210
  91. data/lib/rubik/repl/notice_router.rb +319 -0
  92. data/lib/rubik/repl/paste_support.rb +3 -1
  93. data/lib/rubik/repl/presentation.rb +5 -3
  94. data/lib/rubik/repl/pruner/gate.rb +3 -1
  95. data/lib/rubik/repl/pruner/harness.rb +2 -1
  96. data/lib/rubik/repl/shell.rb +4 -3
  97. data/lib/rubik/repl/tee_io.rb +2 -1
  98. data/lib/rubik/repl/turn_recorder.rb +6 -5
  99. data/lib/rubik/runtime/ast_service.rb +2 -1
  100. data/lib/rubik/runtime/discovery.rb +3 -2
  101. data/lib/rubik/runtime/loop_service.rb +4 -3
  102. data/lib/rubik/runtime/manifest_store.rb +9 -1
  103. data/lib/rubik/runtime/overlay_guard.rb +127 -0
  104. data/lib/rubik/runtime/overlay_storage.rb +109 -163
  105. data/lib/rubik/runtime/task_manager.rb +64 -25
  106. data/lib/rubik/sandbox/driver/docker.rb +5 -1
  107. data/lib/rubik/sandbox/runner.rb +21 -19
  108. data/lib/rubik/security/audit_log.rb +2 -1
  109. data/lib/rubik/security/command_gate.rb +126 -243
  110. data/lib/rubik/security/guard.rb +7 -3
  111. data/lib/rubik/security/secret_store.rb +492 -0
  112. data/lib/rubik/security/segment_report.rb +161 -0
  113. data/lib/rubik/security/synthesis_gate.rb +8 -11
  114. data/lib/rubik/session/manager.rb +7 -1
  115. data/lib/rubik/session/recorder.rb +2 -1
  116. data/lib/rubik/skills/manager.rb +4 -4
  117. data/lib/rubik/storage/search.rb +49 -0
  118. data/lib/rubik/storage/store.rb +13 -20
  119. data/lib/rubik/storage/transcript_indexer.rb +3 -2
  120. data/lib/rubik/storage/vakanuvis/harness.rb +2 -3
  121. data/lib/rubik/storage/vakanuvis.rb +2 -1
  122. data/lib/rubik/tools/base.rb +22 -0
  123. data/lib/rubik/tools/builtins/files.rb +3 -15
  124. data/lib/rubik/tools/builtins/goal_ledger.rb +12 -1
  125. data/lib/rubik/tools/builtins/grep.rb +1 -6
  126. data/lib/rubik/tools/builtins/lifecycle.rb +6 -5
  127. data/lib/rubik/tools/builtins/synthesis.rb +3 -3
  128. data/lib/rubik/tools/lifecycle_rollbacks.rb +14 -1
  129. data/lib/rubik/tools/preflight_runner.rb +2 -1
  130. data/lib/rubik/tools/truncator.rb +48 -36
  131. data/lib/rubik/tools/uri_resolver.rb +3 -2
  132. data/lib/rubik/ui/banner.rb +4 -3
  133. data/lib/rubik/ui/capability.rb +1 -0
  134. data/lib/rubik/ui/spinner.rb +3 -1
  135. data/lib/rubik/ui/statusline.rb +6 -5
  136. data/lib/rubik/version.rb +1 -1
  137. data/lib/rubik.rb +4 -5
  138. metadata +20 -1
@@ -1,9 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "open3"
4
3
  require "json"
5
4
  require "uri"
6
5
  require_relative "server_command"
6
+ require_relative "transport"
7
7
  require_relative "document_store"
8
8
  require_relative "../platform"
9
9
  require_relative "../log"
@@ -11,14 +11,11 @@ require_relative "../log"
11
11
  module Rubik
12
12
  module LSP
13
13
  class Client
14
- class RequestError < StandardError
15
- attr_reader :reason
16
-
17
- def initialize(reason, message)
18
- @reason = reason
19
- super(message)
20
- end
21
- end
14
+ # Typed request failure. The class itself lives on the Transport (the
15
+ # correlation registry that raises it moved there, issue #470); the
16
+ # constant is aliased here so the public exception surface
17
+ # (Rubik::LSP::Client::RequestError) is unchanged.
18
+ RequestError = Transport::RequestError
22
19
 
23
20
  SERVERS = {
24
21
  "go" => "gopls",
@@ -36,8 +33,12 @@ module Rubik
36
33
  "vue" => "vue-language-server --stdio"
37
34
  }.freeze
38
35
 
39
- attr_reader :language, :server_cmd, :root_dir, :running, :server_capabilities,
36
+ attr_reader :language, :server_cmd, :root_dir, :server_capabilities,
40
37
  :sync_capabilities
38
+ # The JSON-RPC transport delegate (issue #470). Exposed read-only as a
39
+ # seam for focused Transport unit tests and white-box transport
40
+ # injection; the protocol API above remains the supported surface.
41
+ attr_reader :transport
41
42
 
42
43
  def initialize(language, root_dir: Dir.pwd, server_cmd: nil)
43
44
  @language = language.to_s.downcase
@@ -50,29 +51,20 @@ module Rubik
50
51
  elsif File.basename(@server_argv.first.to_s) == "solargraph" && !@server_argv.include?("stdio")
51
52
  @server_argv << "stdio"
52
53
  end
53
- @running = false
54
- @crashed = false
55
- @req_id = 0
56
- @stdin = nil
57
- @stdout = nil
58
- @stderr = nil
59
- @wait_thr = nil
60
- @reader_thr = nil
61
- @stderr_drain = nil
62
- @mutex = Mutex.new
54
+ # The transport owns spawn/reader/correlation (issue #470); it is
55
+ # created first because the DocumentStore shares its mutex/condvar.
56
+ @transport = Transport.new(
57
+ root_dir: @root_dir,
58
+ on_message: ->(msg) { handle_incoming_message(msg) }
59
+ )
63
60
  @document_mutex = Mutex.new
64
- @write_mutex = Mutex.new
65
- @cv = ConditionVariable.new
66
- @responses = {}
67
- @pending_requests = {}
68
- @reader_failure = nil
69
61
  # The ONE acquisition rule for document state (see the invariant
70
62
  # documented on Rubik::LSP::DocumentStore): hold @document_mutex
71
- # across every @document_store call; the store takes @mutex itself
72
- # for the diagnostic hashes. Transport writes (@write_mutex) may only
73
- # happen inside those document_mutex regions, giving the single
74
- # legal order document_mutex -> write_mutex -> mutex.
75
- @document_store = DocumentStore.new(@mutex, @cv)
63
+ # across every @document_store call; the store takes the transport
64
+ # mutex for the diagnostic hashes. Transport writes (@write_mutex)
65
+ # may only happen inside those document_mutex regions, giving the
66
+ # single legal order document_mutex -> write_mutex -> transport mutex.
67
+ @document_store = DocumentStore.new(@transport.mutex, @transport.cv)
76
68
  @server_capabilities = {}
77
69
  @sync_capabilities = {
78
70
  source: :not_advertised, open_close: false, change: 0,
@@ -94,17 +86,12 @@ module Rubik
94
86
  def start
95
87
  return false unless available?
96
88
 
97
- stop if alive? || @wait_thr&.alive? || @reader_alive
89
+ stop if alive? || @transport.stale?
98
90
 
99
91
  @document_mutex.synchronize do
100
- @req_id = 0
101
92
  @document_store.reset
102
93
  end
103
- @mutex.synchronize do
104
- @responses.clear
105
- @pending_requests.clear
106
- @reader_failure = nil
107
- end
94
+ @transport.reset_correlation
108
95
 
109
96
  cmd_parts = @server_argv.dup
110
97
  bin = cmd_parts.first
@@ -113,22 +100,7 @@ module Rubik
113
100
 
114
101
  cmd_parts[0] = resolved_bin if resolved_bin
115
102
 
116
- @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(sanitized_spawn_env, *cmd_parts, chdir: @root_dir)
117
- # Binary mode: LSP framing is byte-exact. Text-mode pipes on Windows
118
- # translate CRLF→LF on read, so Content-Length counts and read(len)
119
- # disagree and the JSON body arrives truncated (the reader's old
120
- # silent rescue-then-break hid this — no real server was ever
121
- # spawned in tests).
122
- @stdin.binmode
123
- @stdout.binmode
124
- @running = false
125
- @crashed = false
126
- @reader_alive = false
127
-
128
- start_reader_thread
129
- # An unread stderr pipe fills its OS buffer (~64KB) and blocks the
130
- # server itself mid-write; drain continuously, discard content.
131
- @stderr_drain = Rubik::Platform::IoDrain.start(@stderr)
103
+ @transport.spawn(cmd_parts)
132
104
 
133
105
  root_uri = Rubik::Platform.to_file_uri(@root_dir)
134
106
  init_res = send_request("initialize", {
@@ -168,7 +140,7 @@ module Rubik
168
140
  stop
169
141
  return false
170
142
  end
171
- @running = true
143
+ @transport.mark_running
172
144
  init_res
173
145
  rescue StandardError => e
174
146
  # The handshake failure cause (bad server binary, protocol mismatch,
@@ -180,68 +152,38 @@ module Rubik
180
152
  end
181
153
 
182
154
  def alive?
183
- return false unless @running
184
- return false if defined?(@reader_alive) && !@reader_alive
185
-
186
- if @wait_thr
187
- return false unless @wait_thr.alive?
188
- return false if @stdin&.closed? || @stdout&.closed?
189
- end
155
+ @transport.alive?
156
+ end
190
157
 
191
- true
158
+ def running
159
+ @transport.running
192
160
  end
193
161
 
194
162
  def crashed?
195
- defined?(@crashed) && @crashed == true
163
+ @transport.crashed?
164
+ end
165
+
166
+ # PID of the spawned language server process (nil when not running).
167
+ def server_pid
168
+ @transport.server_pid
196
169
  end
197
170
 
198
171
  def reconnect!
199
- stop if @running
172
+ stop if running
200
173
  start
201
174
  end
202
175
 
203
176
  def stop
204
- return unless @running || @wait_thr || @reader_thr
177
+ return unless running || @transport.resources?
205
178
 
206
179
  begin
207
- send_request("shutdown", {}, timeout: 2) if @running
208
- send_notification("exit", {}) if @running
180
+ send_request("shutdown", {}, timeout: 2) if running
181
+ send_notification("exit", {}) if running
209
182
  rescue StandardError
210
183
  # ignore
211
184
  end
212
185
 
213
- @running = false
214
- @crashed = false
215
- @reader_alive = false
216
- # Drain first: its thread may be blocked in gets on @stderr.
217
- @stderr_drain&.stop
218
- @stderr_drain = nil
219
- begin
220
- @reader_thr&.kill
221
- rescue StandardError
222
- nil
223
- end
224
-
225
- [@stdin, @stdout, @stderr].each do |io|
226
- io.close
227
- rescue StandardError
228
- nil
229
- end
230
-
231
- begin
232
- @reader_thr&.join(0.5)
233
- @reader_thr = nil
234
- rescue StandardError
235
- nil
236
- end
237
- return unless @wait_thr&.alive?
238
-
239
- Rubik::Platform.kill_tree(@wait_thr.pid)
240
- begin
241
- @wait_thr.join
242
- rescue StandardError
243
- nil
244
- end
186
+ @transport.shutdown
245
187
  end
246
188
  alias dispose stop
247
189
 
@@ -284,7 +226,8 @@ module Rubik
284
226
  })
285
227
  end
286
228
  end
287
- rescue StandardError
229
+ rescue StandardError => e
230
+ Rubik::Log.warn(:lsp, "did_open failed for #{file_path}: #{e.class}: #{e.message}")
288
231
  false
289
232
  end
290
233
 
@@ -293,12 +236,13 @@ module Rubik
293
236
 
294
237
  abs_path = normalized_document_path(file_path)
295
238
  @document_mutex.synchronize { send_document_change_unlocked(abs_path, content) }
296
- rescue StandardError
239
+ rescue StandardError => e
240
+ Rubik::Log.warn(:lsp, "did_change failed for #{file_path}: #{e.class}: #{e.message}")
297
241
  false
298
242
  end
299
243
 
300
244
  def did_close(file_path)
301
- return false unless @running && @sync_capabilities[:open_close]
245
+ return false unless running && @sync_capabilities[:open_close]
302
246
 
303
247
  abs_path = normalized_document_path(file_path)
304
248
  @document_mutex.synchronize do
@@ -311,7 +255,8 @@ module Rubik
311
255
  })
312
256
  end
313
257
  end
314
- rescue StandardError
258
+ rescue StandardError => e
259
+ Rubik::Log.warn(:lsp, "did_close failed for #{file_path}: #{e.class}: #{e.message}")
315
260
  false
316
261
  end
317
262
 
@@ -323,7 +268,8 @@ module Rubik
323
268
  params = { textDocument: { uri: document_uri(abs_path) } }
324
269
  params[:text] = content if @sync_capabilities[:include_text] && !content.nil?
325
270
  send_notification("textDocument/didSave", params)
326
- rescue StandardError
271
+ rescue StandardError => e
272
+ Rubik::Log.warn(:lsp, "did_save failed for #{file_path}: #{e.class}: #{e.message}")
327
273
  false
328
274
  end
329
275
 
@@ -368,68 +314,40 @@ module Rubik
368
314
 
369
315
  private
370
316
 
317
+ # ---- Delegates to the transport (issue #470). These thin shims keep
318
+ # ---- the Client's internal call sites and per-instance test stubs
319
+ # ---- working unchanged; the implementations live on Transport.
320
+ def send_request(method, params, timeout: 5)
321
+ @transport.send_request(method, params, timeout: timeout)
322
+ end
323
+
324
+ def wait_for_response(req_id, timeout: 5)
325
+ @transport.wait_for_response(req_id, timeout: timeout)
326
+ end
327
+
328
+ def send_notification(method, params)
329
+ @transport.send_notification(method, params)
330
+ end
331
+
332
+ def write_message(msg_hash)
333
+ @transport.write_message(msg_hash)
334
+ end
335
+
371
336
  def start_reader_thread
372
- @reader_alive = true
373
- @reader_thr = Thread.new do
374
- while (@running || @reader_alive) && @stdout && !@stdout.closed?
375
- begin
376
- content_length = nil
377
- loop do
378
- header_line = @stdout.gets
379
- break if header_line.nil?
380
-
381
- stripped = header_line.strip
382
- break if stripped.empty?
383
-
384
- content_length = stripped.split(":", 2).last.strip.to_i if stripped.downcase.start_with?("content-length:")
385
- end
386
-
387
- break if content_length.nil?
388
-
389
- body = @stdout.read(content_length)
390
- break unless body
391
-
392
- begin
393
- parsed = JSON.parse(body)
394
- handle_incoming_message(parsed)
395
- rescue StandardError => e
396
- Rubik::Log.warn(:lsp, "Failed to handle message: #{e.class}: #{e.message}")
397
- end
398
- rescue IOError, Errno::EPIPE, Errno::ECONNRESET
399
- break
400
- rescue StandardError => e
401
- Rubik::Log.warn(:lsp, "Reader loop error: #{e.class}: #{e.message}")
402
- next
403
- end
404
- end
405
- ensure
406
- @mutex.synchronize do
407
- @crashed = true if @running
408
- @reader_alive = false
409
- @running = false
410
- @reader_failure ||= "LSP response reader stopped before completing the request"
411
- @cv.broadcast
412
- end
413
- end
337
+ @transport.start_reader_thread
338
+ end
339
+
340
+ def sanitized_spawn_env
341
+ @transport.sanitized_spawn_env
414
342
  end
415
343
 
344
+ # ---- Incoming message routing (protocol concern, stays on Client).
345
+
416
346
  def handle_incoming_message(msg)
417
347
  if msg.key?("method") && msg.key?("id")
418
348
  handle_server_request(msg)
419
349
  elsif msg.key?("id")
420
- req_id = msg["id"]
421
- @mutex.synchronize do
422
- # Discard late response if request is neither pending nor already tracked
423
- if @pending_requests.key?(req_id)
424
- @responses[req_id] = msg
425
- @cv.broadcast
426
- end
427
- # Prune stale responses if cap reached
428
- if @responses.size > 100
429
- oldest_keys = @responses.keys.take(@responses.size - 100)
430
- oldest_keys.each { |k| @responses.delete(k) }
431
- end
432
- end
350
+ @transport.correlate_response(msg)
433
351
  elsif msg["method"] == "textDocument/publishDiagnostics"
434
352
  params = msg["params"] || {}
435
353
  uri = params["uri"].to_s
@@ -444,81 +362,6 @@ module Rubik
444
362
  end
445
363
  end
446
364
 
447
- def send_request(method, params, timeout: 5)
448
- req_id = @mutex.synchronize do
449
- @req_id += 1
450
- @pending_requests[@req_id] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
451
- @req_id
452
- end
453
- msg = {
454
- jsonrpc: "2.0",
455
- id: req_id,
456
- method: method,
457
- params: params
458
- }
459
- unless write_message(msg)
460
- @mutex.synchronize do
461
- @pending_requests.delete(req_id)
462
- @responses.delete(req_id)
463
- end
464
- raise RequestError.new(:transport_failure, @reader_failure || "LSP request write failed")
465
- end
466
- wait_for_response(req_id, timeout: timeout)
467
- end
468
-
469
- def wait_for_response(req_id, timeout: 5)
470
- start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
471
- timed_out = false
472
- reader_failure = nil
473
-
474
- @mutex.synchronize do
475
- loop do
476
- if @responses.key?(req_id)
477
- response = @responses.delete(req_id)
478
- @pending_requests.delete(req_id)
479
- if response.key?("error")
480
- error = response["error"] || {}
481
- raise RequestError.new(:server_error, error["message"] || "LSP server returned an error")
482
- end
483
- return response["result"] if response.key?("result")
484
-
485
- raise RequestError.new(:invalid_response, "LSP response did not contain a result")
486
- end
487
-
488
- if @reader_failure
489
- reader_failure = @reader_failure
490
- @responses.delete(req_id)
491
- @pending_requests.delete(req_id)
492
- break
493
- end
494
-
495
- remaining = timeout - (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time)
496
- if remaining <= 0
497
- @responses.delete(req_id)
498
- @pending_requests.delete(req_id)
499
- timed_out = true
500
- break
501
- end
502
-
503
- @cv.wait(@mutex, remaining)
504
- end
505
- end
506
-
507
- if timed_out
508
- # W9: send $/cancelRequest notification (safely ignored if unsupported)
509
- begin
510
- send_notification("$/cancelRequest", { id: req_id })
511
- rescue StandardError
512
- nil
513
- end
514
- raise RequestError.new(:timeout, "LSP request timed out after #{timeout} seconds")
515
- end
516
-
517
- raise RequestError.new(:reader_failure, reader_failure) if reader_failure
518
-
519
- nil
520
- end
521
-
522
365
  def normalized_document_path(file_path)
523
366
  raise ArgumentError, "file_path cannot be nil or empty" if file_path.nil? || file_path.to_s.strip.empty?
524
367
 
@@ -657,45 +500,6 @@ module Rubik
657
500
  })
658
501
  end
659
502
  end
660
-
661
- def send_notification(method, params)
662
- msg = {
663
- jsonrpc: "2.0",
664
- method: method,
665
- params: params
666
- }
667
- write_message(msg)
668
- end
669
-
670
- def write_message(msg_hash)
671
- json = JSON.dump(msg_hash)
672
- header = "Content-Length: #{json.bytesize}\r\n\r\n"
673
- bytes = header + json
674
- @write_mutex.synchronize do
675
- offset = 0
676
- while offset < bytes.bytesize
677
- written = @stdin.write(bytes.byteslice(offset, bytes.bytesize - offset))
678
- raise IOError, "LSP transport made no write progress" unless written&.positive?
679
-
680
- offset += written
681
- end
682
- @stdin.flush
683
- end
684
- true
685
- rescue IOError, SystemCallError, NoMethodError => e
686
- message = "LSP transport write failed: #{e.class}: #{e.message}"
687
- @mutex.synchronize do
688
- @reader_failure ||= message
689
- @running = false
690
- @crashed = true if @wait_thr
691
- @cv.broadcast
692
- end
693
- false
694
- end
695
-
696
- def sanitized_spawn_env
697
- Rubik::Platform.sanitized_spawn_env
698
- end
699
503
  end
700
504
  end
701
505
  end
@@ -0,0 +1,49 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative "client"
4
+ require_relative "server_command"
5
+ require_relative "../storage/layout"
6
+ require_relative "../runtime/discovery"
7
+ require_relative "../runtime/diagnostic_engine"
8
+
9
+ module Rubik
10
+ module LSP
11
+ # Client provisioning policy for LSP servers (extracted from Manager,
12
+ # issue #497): resolve the configured server command, build a Client,
13
+ # fall back to Runtime::Discovery probing when the configured binary is
14
+ # unavailable, and diagnose the failure when nothing usable is found.
15
+ #
16
+ # Plain, lock-free collaborator — the Manager owns all locking and
17
+ # invokes `provision` while holding its monitor.
18
+ class ClientProvisioner
19
+ def initialize(config:, root_dir:)
20
+ @config = config
21
+ @root_dir = root_dir
22
+ end
23
+
24
+ # Resolve a client for `lang`. Returns { client:, diagnosis: } —
25
+ # `client` is always a Client instance (usable or not); `diagnosis` is
26
+ # a Runtime::ExecutionFailure when no server binary could be found,
27
+ # nil when the client is available.
28
+ def provision(lang, existing: nil)
29
+ configured_cmd = Rubik::Storage::Layout.config_get(@config, "lsp.servers.#{lang}", nil) || Client::SERVERS[lang]
30
+ client = existing || Client.new(lang, root_dir: @root_dir, server_cmd: configured_cmd)
31
+
32
+ # Fallback probing if the configured command binary is not available
33
+ unless client.available?
34
+ probed_cmd = Runtime::Discovery.probe_lsp(lang, root_dir: @root_dir, custom_cmd: configured_cmd)
35
+ client = Client.new(lang, root_dir: @root_dir, server_cmd: probed_cmd) if probed_cmd && !probed_cmd.eql?(client.server_cmd)
36
+ end
37
+
38
+ return { client: client, diagnosis: nil } if client.available?
39
+
40
+ failure = Runtime::DiagnosticEngine.diagnose(
41
+ cmd: ServerCommand.display(client.server_cmd),
42
+ exit_code: 127,
43
+ stderr: "Server binary '#{ServerCommand.display(client.server_cmd)}' not found in PATH"
44
+ )
45
+ { client: client, diagnosis: failure }
46
+ end
47
+ end
48
+ end
49
+ end