ask-app-server 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d32c61a5ff66b6b3babd900aeae87b296267e2d9e4b1bf2bddd10ef4407d3d2f
-  data.tar.gz: 1ed9f839391bc2049a85bd0f3f98a7cb877c5184856ab8bfdf0c16e956d02156
+  metadata.gz: 2272260cc312765a2fb145f0c7e121c895ef47baf6aa1e8394c4ad94e36ee835
+  data.tar.gz: 2c344972b0c6629793bc26901d4ea9560dacfa8cc5c1f9367749dbd7e90b4438
 SHA512:
-  metadata.gz: b88dcd89903d66bb42229f4ba94cb9a9674041fb7dfaeb47fcedd4369d6ebb0216a32138cc0b0144162ba9c43e5fb9365b4914f1e69978172bc2a622752c46fb
-  data.tar.gz: 92d17d5b601731f762a1f3b18a23773239d72994149b61af213ce2975cc974f6850e44058c2cb4e121c7a45fe5eea6091e3c751a5c676a9e72503107939b05b8
+  metadata.gz: 126c904d33f636b7336d6f44bca17cd8b2b6914d75d120cc1285537c353635e2eb800fccb2a52b651c5003c2f1afd7f6dd8cc3d069a53937175e9c0eb69211b9
+  data.tar.gz: 92f6895aa13391cb72d61e72764cd273d7bc0bcb12a8f627113fa315e90935818360e2a24c9cdad1b6616cabdae94396825acde43cb6fd9e2fa7763f896c7a48

data/lib/ask/app_server/agent_adapter.rb

@@ -44,6 +44,11 @@ module Ask
         @approval = approval
         @require_approval = require_approval
         @agent_dir = agent_dir
+        # The session's workspace is the tools' home: bash commands
+        # without an explicit cd run there (default_workdir), so the
+        # agent never drifts into the host's cwd — the recurring
+        # "where is the project?" failure mode.
+        @tools.each { |tool| tool.default_workdir = @agent_dir if tool.respond_to?(:default_workdir=) }
         @session = nil
         @translator = nil
         @on_event_block = nil
@@ -293,11 +298,29 @@ module Ask
             while @session.queued_steers.positive?
               @session.run("", reset: false)
             end
+            # A run that returned with the turn still active ended
+            # without a terminal event — the model stream dropped
+            # mid-turn (a dead connection, a provider that closed the
+            # stream early). Without this, the client would wait on a
+            # ghost run forever. Surface it as a failure so the fix
+            # loop can redeliver.
+            if @translator.turn_active?
+              @logger.error("Turn ended without a completion event — the model stream dropped mid-turn")
+              @translator.turn_failed("The model stream ended without completing the turn (the connection dropped mid-stream)")
+            end
           rescue => e
-            # Agent may have been aborted — that's fine
-            @logger.debug("Agent run error: #{e.message}") if ENV["DEBUG"]
+            # An aborted turn raises Ask::Agent::Aborted — that's not a
+            # failure, the client asked for it. Everything else is a real
+            # run failure the client must see: without a turn.failed, a
+            # watching board would wait forever on a dead turn. The
+            # translator's failure event carries the message.
+            unless e.is_a?(Ask::Agent::Aborted) || e.class.name.to_s.include?("Aborted")
+              @logger.error("Agent run failed: #{e.class}: #{e.message}")
+              @translator.turn_failed(e.message.to_s[0, 500])
+            end
           ensure
             @running_mutex.synchronize { @running = false }
+            @logger.debug("Run thread ended: turn_active=#{@translator.turn_active?} last_seq=#{@translator.last_seq}")
           end
         end
 

data/lib/ask/app_server/cli.rb

@@ -37,11 +37,14 @@ module Ask
         # Parse --config and --socket from args
         config_path = nil
         socket_path = nil
+        socket_only = false
         args.each_with_index do |arg, i|
           if arg == "--config" && i + 1 < args.length
             config_path = args[i + 1]
           elsif arg == "--socket" && i + 1 < args.length
             socket_path = args[i + 1]
+          elsif arg == "--socket-only"
+            socket_only = true
           end
         end
 
@@ -90,19 +93,37 @@ module Ask
           $stderr.puts "socket:    #{socket_server.socket_path}"
         end
 
-        # Start the server (stdio transport, blocks)
-        server = Server.new(session_manager: session_manager)
-
-        begin
-          server.start
-        rescue Interrupt
-          $stderr.puts "\n[ask-app-server] Shutting down..." if config.debug?
-        ensure
-          # Clean up on Ctrl-C AND on normal exit (stdin EOF): the socket
-          # file must not outlive the host.
-          server.stop
-          socket_server&.stop
-          herdr_reporter&.close
+        if socket_only
+          # Daemon mode: the host lives on the socket alone, no stdio
+          # transport — its lifetime must not depend on stdin (a
+          # supervisor's EOF would take the whole host down with it).
+          if socket_server.nil?
+            $stderr.puts "[ask-app-server] --socket-only needs --socket"
+            exit 1
+          end
+          begin
+            socket_server.join
+          rescue Interrupt
+            $stderr.puts "\n[ask-app-server] Shutting down..." if config.debug?
+          ensure
+            socket_server&.stop
+            herdr_reporter&.close
+          end
+        else
+          # Start the server (stdio transport, blocks)
+          server = Server.new(session_manager: session_manager)
+
+          begin
+            server.start
+          rescue Interrupt
+            $stderr.puts "\n[ask-app-server] Shutting down..." if config.debug?
+          ensure
+            # Clean up on Ctrl-C AND on normal exit (stdin EOF): the socket
+            # file must not outlive the host.
+            server.stop
+            socket_server&.stop
+            herdr_reporter&.close
+          end
         end
       end
 
@@ -141,11 +162,17 @@ module Ask
 
           USAGE:
             ask-app-server                  Start in stdio mode
+            ask-app-server --socket SOCK --socket-only
+                                            Start as a socket daemon (no stdio)
 
           OPTIONS:
             --version, -v                  Show version
             --help, -h                     Show this help message
             --config PATH                  Config file path (default: auto-detect)
+            --socket PATH                  Also expose a unix socket at PATH
+            --socket-only                  Daemon mode: serve the socket alone
+                                           (the host's lifetime does not depend
+                                           on stdin)
 
           CONFIG FILE (JSON):
             Search order:

data/lib/ask/app_server/event_translator.rb

@@ -17,7 +17,13 @@ module Ask
       # delivery means the log is append-only; clients with cursors older
       # than the cap miss the dropped events (durable log is a host
       # storage concern).
-      MAX_EVENTS = 2000
+      # How many events the translator buffers for cursor-based
+      # delivery. The cap must clear the largest thinking flood: a
+      # reasoning model streams thousands of deltas per turn (observed
+      # >9000), and events dropped here are dropped for every connected
+      # client — the completion event could fall in the gap and the
+      # client would watch a ghost run forever.
+      MAX_EVENTS = 20_000
 
       # Optional observer called with every emitted canonical Event.
       # This is the single choke point for all session events (translations
@@ -135,6 +141,24 @@ module Ask
         @events.select { |e| e.seq > after_seq }
       end
 
+      # Whether a turn is mid-flight (started, not completed or failed).
+      # A run that returns while a turn is still active ended without a
+      # terminal event — the model stream dropped mid-turn — and the
+      # adapter must surface that as a failure, not let the client wait
+      # on a ghost.
+      def turn_active?
+        @turn_active
+      end
+
+      # Emit a turn.failed event. Called by the adapter when a run dies
+      # (an exception, or a stream that ended without completing).
+      def turn_failed(message)
+        @turn_active = false
+        payload = { "error" => message.to_s }
+        payload["turnId"] = @turn_id if @turn_id
+        emit("turn.failed", payload)
+      end
+
       private
 
       def next_seq
@@ -231,13 +255,6 @@ module Ask
         emit("error", payload)
       end
 
-      def turn_failed(message)
-        @turn_active = false
-        payload = { "error" => message.to_s }
-        payload["turnId"] = @turn_id if @turn_id
-        emit("turn.failed", payload)
-      end
-
       def emit(type, payload)
         event = Ask::SessionProtocol::Events.event(type: type, seq: next_seq, payload: payload)
         @events << event

data/lib/ask/app_server/server.rb

@@ -188,6 +188,11 @@ module Ask
       # events its sessions have produced since the connection's cursor,
       # then advance the cursor. Cursor-based, so each client receives
       # exactly the events after its own seq (replay on subscribe).
+      #
+      # Each event carries its sessionId: a connection may subscribe to
+      # several sessions, and the client routes events to the right
+      # watcher — without it, a multi-session client would record one
+      # session's events into another's run.
       def push_pending
         connections.each do |connection|
           connection.subscriptions.keys.each do |session_id|
@@ -198,7 +203,7 @@ module Ask
             next if events.empty?
 
             events.each do |ev|
-              connection.write({ method: "session/event", params: { event: ev.to_h } })
+              connection.write({ method: "session/event", params: { sessionId: session_id, event: ev.to_h } })
             end
             connection.advance(session_id, events.last.seq)
           end

data/lib/ask/app_server/session_manager.rb

@@ -62,6 +62,14 @@ module Ask
 
         # Extract provider prefix from model string (e.g., "opencode_go/deepseek-v4-flash")
         model_id, model_provider = parse_model_string(model || DEFAULT_MODEL)
+        # A provider-qualified model must stay resolvable: the agent's
+        # model catalog looks up bare ids, so the prefixed model is
+        # registered under its provider before the session builds its
+        # chat. Without this, "deepseek/deepseek-v4-flash" becomes the
+        # bare "deepseek-v4-flash" which the catalog may not know — the
+        # session falls back to the wrong provider and the run hangs
+        # silently on a missing credential.
+        register_prefixed_model(model_id, model_provider) if model_provider
         model_for_agent = model_provider ? model_id : (model || DEFAULT_MODEL)
 
         adapter = AgentAdapter.new(
@@ -318,6 +326,31 @@ module Ask
         parts = str.split("/", 2)
         [parts[1], parts[0]]
       end
+
+      # Make a provider-qualified model resolvable by the agent's model
+      # catalog: the catalog looks up bare ids, so a model that arrived
+      # as "provider/id" is registered under its provider. If the id is
+      # already known, its existing provider is preserved — the caller's
+      # explicit prefix is the override.
+      def register_prefixed_model(model_id, model_provider)
+        catalog = Ask::ModelCatalog.respond_to?(:instance) ? Ask::ModelCatalog.instance : nil
+        return unless catalog&.respond_to?(:register)
+
+        existing = catalog.find(model_id) rescue nil
+        return if existing && existing.provider.to_s == model_provider.to_s
+        return if existing && existing.provider.to_s != "unknown"
+
+        info = OpenStruct.new(
+          id: model_id.to_s,
+          provider: model_provider.to_s,
+          chat?: true,
+          context: 4096,
+          output: 4096
+        )
+        catalog.register(info)
+      rescue StandardError
+        nil # registration is best-effort; the session will surface a real error
+      end
     end
   end
 end

data/lib/ask/app_server/socket_server.rb

@@ -63,6 +63,12 @@ module Ask
         FileUtils.rm_f(@socket_path) rescue nil
       end
 
+      # Block until the acceptor stops (the process's main loop in
+      # socket-only mode — there's no stdio transport to join on).
+      def join
+        @acceptor&.join
+      end
+
       # Whether the server is running.
       def running?
         @running

data/lib/ask/app_server/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module AppServer
-    VERSION = "0.4.7"
+    VERSION = "0.4.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-app-server
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Kaka Ruto
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ask-tools
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement