ask-coding-providers 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b9421ae222addaf585ea8b26333306078843d0574a4b71a34cecaa3fc4ff79
-  data.tar.gz: 8c7d16435c702703f0f661474077389c28d4fc796aafe196bfce4ccd1f7019b2
+  metadata.gz: 5af7db1f38c3b4d11a223269116e1b7c83da716a6e5c4ef0120f321a9f566241
+  data.tar.gz: af4be91462e45a4b5fc07119976d098b439daae44714cdcfe302902bd4db5f64
 SHA512:
-  metadata.gz: 76cbfb82c26608b1d73a44673b09ab6a299a7c604e80566fa8e9555acd4c2443239d28fafafdee6e29589aa9062cef5e4c4bab465bdb103e41db66560e91b2fe
-  data.tar.gz: 4a704264075d1c25ce32bf4ae73106050c3ffd7aa52f34ed042f8e98c4132d0f150aca5fe88af3114ca4d0b8c066a83c9f545b44ca267b6abf34d7e802f5c829
+  metadata.gz: 06be52e4d472be0c6456842884cb3ccdeb07da10322683de138de6a638cb14e8ba198c5649f57eca1e17e142e752382234bdba8e971cacf664c96f49e821d3fb
+  data.tar.gz: 81beeba55e7d5b6cdd197d615f0f3926bf44ee36a87a781aba9197fe301e22ac7e7e72520fa6635f239fe266a9b13cdedc33450653ff47b8a1d3afcaa6d89215

data/lib/ask/coding_providers/acp/adapter.rb

@@ -64,7 +64,7 @@ module Ask
           @client&.running? || false
         end
 
-        def create_session(workspace_path, mode: nil)
+        def create_session(workspace_path, mode: nil, system_prompt: nil, **)
           ensure_running
           params = { cwd: workspace_path || @cwd }
           session = @client.session_new(**params)

data/lib/ask/coding_providers/adapter.rb

@@ -14,7 +14,7 @@ module Ask
       # @param workspace_path [String] the working directory
       # @param mode [String, nil] permission mode
       # @return [String] the session ID
-      def create_session(workspace_path, mode: nil)
+      def create_session(workspace_path, mode: nil, system_prompt: nil, **)
         raise NotImplementedError, "#{self.class} must implement #create_session"
       end
 

data/lib/ask/coding_providers/ask_agent/adapter.rb

@@ -147,7 +147,15 @@ module Ask
         # @param workspace_path [String] working directory
         # @param mode [String, nil] permission mode
         # @param model [String, nil] model override for this session
-        def create_session(workspace_path, mode: nil, model: nil)
+        # @param system_prompt [String, nil] system prompt override for this
+        #   session (takes precedence over any system_prompt in session_opts)
+        # @param agent [String, nil] declarative agent name (ask-agent
+        #   convention: agents/<name>/agent.rb + instructions.md, discovered
+        #   from the workspace's working directory). When given, the session
+        #   is built via Ask::Agent.new so the definition's tools, skills,
+        #   and instructions apply; the harness-level options (model,
+        #   system_prompt, approval, plan mode, todos) still win.
+        def create_session(workspace_path, mode: nil, model: nil, system_prompt: nil, agent: nil)
           ensure_started
           sid = "sess_#{SecureRandom.uuid}"
           @mutex.synchronize do
@@ -155,6 +163,8 @@ module Ask
               workspace: workspace_path,
               mode: mode,
               model: model || @model_id,
+              system_prompt: system_prompt,
+              agent: agent,
               created_at: Time.now,
               session: nil,
               subscribers: [],
@@ -364,41 +374,78 @@ module Ask
         # ── Session construction ──
 
         def build_session(entry)
-          chat = build_chat(entry[:model])
+          session = entry[:agent] ? build_agent_session(entry) : build_plain_session(entry)
+          session.on_event { |event| translate_event(entry, session, event) }
+          session
+        end
 
-          queue = EmittingApprovalQueue.new(
-            on_submit: ->(a) { emit_approval(entry, a, :pending) },
-            on_status: ->(a) { emit_approval(entry, a, a.status) }
-          )
+        # Build a session from a declarative agent definition (ask-agent
+        # convention). The definition's tools, skills (agent_dir), and
+        # instructions apply; harness-level options win where set. Agents
+        # are discovered from the working directory (the harness runs the
+        # session inside its workspace).
+        #
+        # The emitting approval queue is passed through Ask::Agent.new's
+        # opts, so Session#build_approval wires it with the session's
+        # apply/reject/register callbacks — approval events stream exactly
+        # like the plain path.
+        def build_agent_session(entry)
+          queue = emitting_queue(entry)
+          opts = {
+            approval: approval_config(queue),
+            plan_mode: @plan_mode,
+            todos: @todos,
+            max_turns: @max_turns,
+            # Caller options win over the definition; a nil model lets the
+            # definition's own model apply.
+            model: (entry[:model] unless entry[:model] == @model_id)
+          }.compact
+          opts[:system_prompt] = entry[:system_prompt] if entry[:system_prompt]
+          Ask::Agent.new(entry[:agent], **opts)
+        end
 
-          approval_cfg =
-            case @approval
-            when APPROVAL_REQUIRE then { queue: queue, require_approval: @approval_required }
-            when APPROVAL_AUTO then { queue: queue }
-            when APPROVAL_OFF then nil
-            else
-              raise ArgumentError, "approval must be one of #{APPROVAL_MODES.inspect}, got #{@approval.inspect}"
-            end
+        # Build the default session (no declarative agent).
+        def build_plain_session(entry)
+          prompt = entry[:system_prompt] || @session_opts[:system_prompt]
+          chat = build_chat(entry[:model], prompt)
 
           Ask::Agent::Session.new(
             model: chat,
             tools: @tools,
             max_turns: @max_turns,
-            approval: approval_cfg,
+            approval: approval_config(emitting_queue(entry)),
             plan_mode: @plan_mode,
             todos: @todos,
             **@session_opts
-          ).tap do |session|
-            session.on_event { |event| translate_event(entry, session, event) }
+          )
+        end
+
+        def emitting_queue(entry)
+          EmittingApprovalQueue.new(
+            on_submit: ->(a) { emit_approval(entry, a, :pending) },
+            on_status: ->(a) { emit_approval(entry, a, a.status) }
+          )
+        end
+
+        def approval_config(queue)
+          case @approval
+          when APPROVAL_REQUIRE then { queue: queue, require_approval: @approval_required }
+          when APPROVAL_AUTO then { queue: queue }
+          when APPROVAL_OFF then nil
+          else
+            raise ArgumentError, "approval must be one of #{APPROVAL_MODES.inspect}, got #{@approval.inspect}"
           end
         end
 
-        def build_chat(model_id)
+
+
+        def build_chat(model_id, system_prompt = nil)
           chat = Ask::Agent::Chat.new(
             model: model_id,
             provider: @provider_slug,
             tools: @tools
           )
+          chat.with_instructions(system_prompt) if system_prompt
           # Inject pre-configured provider to bypass Ask::Auth.resolve
           chat.instance_variable_set(:@provider, @provider)
           chat

data/lib/ask/coding_providers/claude/adapter.rb

@@ -38,7 +38,7 @@ module Ask
           @started
         end
 
-        def create_session(workspace_path, mode: nil)
+        def create_session(workspace_path, mode: nil, system_prompt: nil, **)
           ensure_started
           sid = "sess_#{SecureRandom.uuid}"
           @sessions[sid] = { workspace: workspace_path, mode: mode, created_at: Time.now }

data/lib/ask/coding_providers/codex/adapter.rb

@@ -42,7 +42,7 @@ module Ask
           @client&.running? || false
         end
 
-        def create_session(workspace_path, mode: nil)
+        def create_session(workspace_path, mode: nil, system_prompt: nil, **)
           ensure_running
           thread = @client.thread_start(cwd: workspace_path)
           tid = thread["id"] || thread[:id]

data/lib/ask/coding_providers/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module CodingProviders
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-coding-providers
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Kaka Ruto