ask-agent 0.38.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3486ed15f739d216a4b0dd46e8efdb29cc6cc7689a70ea4a2a6ef5477444037
-  data.tar.gz: 628f14e1905695cf814eb3ff49012f924d30ce13c92c25ef425ec695dc37502f
+  metadata.gz: e2b75f968977ca6b41df200a5dbba36cc73d799bc74e91ad3a201a3b9a2c78e7
+  data.tar.gz: 19fe24495b1f70b44a320c98b77ee8c2fdf9d83a5642e4bf58c071f8e16ec45c
 SHA512:
-  metadata.gz: 7cd3f07a7dbcaa19379815eb1999f225bef3baa938ab34e018c0d1c0d755edbd5e78ba67881f65098e4b3a59b2f6696e75e1a6bfa2bba3ba17c9cb151918c9ae
-  data.tar.gz: 8644f8522aa5ea4719bb6e02d6dc19ce85d66f2e5e53765da02fcb8a002c67540f60ce31f787abb091a4e76b80a83fdb82d538b2866506385fa8c66e94f54d4a
+  metadata.gz: 5c9057c8b69cbe470beb46d9c656bf56ea15abf1d5328a93bc1a66cbef9c8f69f77aa0cfeb9f64cce264c60278f4df0c9290e3d89b71c42816ff2755d91b3e5e
+  data.tar.gz: 6df2b868b1430e00c9f2fab030ab48b1128de64b23a29b22f9c70963b977c777e20aaf75d5da529f772998116c453763b935ca92d4495efa21bd04efe309caf4

data/lib/ask/agent/chat.rb

@@ -53,8 +53,9 @@ module Ask
         @prompt_caching = prompt_caching.nil? ? config.prompt_caching : prompt_caching
       end
 
-      def ask(message = nil, &block)
-        @messages << Ask::Message.new(role: :user, content: message.to_s) if message
+      def ask(message = nil, attachments: nil, &block)
+        validate_attachment_modalities!(attachments)
+        @messages << Ask::Message.new(role: :user, content: merge_attachments(message, attachments)) if message || attachments
 
         stream = block_given?
         tool_defs = @tools.map { |t| Ask::ToolDef.from_tool(t) }
@@ -79,10 +80,11 @@ module Ask
         response_msg
       end
 
-      def add_message(role:, content: nil, tool_call_id: nil, tool_calls: nil)
+      def add_message(role:, content: nil, tool_call_id: nil, tool_calls: nil, attachments: nil)
+        validate_attachment_modalities!(attachments) if role == :user
         @messages << Ask::Message.new(
           role: role,
-          content: content,
+          content: merge_attachments(content, attachments),
           tool_call_id: tool_call_id,
           tool_calls: tool_calls
         )
@@ -112,6 +114,42 @@ module Ask
 
       MAX_CHAT_RETRIES = 3
 
+      # Merge attachments into message content as content blocks: a plain
+      # string becomes a Text block followed by the attachment blocks;
+      # Array content has the blocks appended. Returns the content
+      # unchanged when there are no attachments.
+      def merge_attachments(content, attachments)
+        return content if attachments.nil? || attachments.empty?
+
+        blocks = content.is_a?(Array) ? content.dup : (content ? [Ask::Content::Text.new(content.to_s)] : [])
+        Ask::Attachment.wrap_all(attachments).each do |item|
+          blocks << (item.is_a?(Ask::Attachment) ? item.to_content : item)
+        end
+        blocks
+      end
+
+      # :inline attachments must be within the model's input modalities.
+      # :context attachments are plain text (a manifest line) and always
+      # supported. The check is skipped when the catalog has no modality
+      # info for the model.
+      def validate_attachment_modalities!(attachments)
+        return if attachments.nil? || attachments.empty?
+
+        inline = Ask::Attachment.wrap_all(attachments).select { |a| a.is_a?(Ask::Attachment) && a.inline? }
+        return if inline.empty?
+
+        modalities = @model_info.respond_to?(:modalities) ? @model_info.modalities : nil
+        supported = modalities.is_a?(Hash) ? Array(modalities[:input] || modalities["input"]) : []
+        return if supported.empty? || supported.include?("*")
+
+        unsupported = inline.reject { |a| supported.include?(a.type.to_s) }
+        return if unsupported.empty?
+
+        raise Ask::Agent::UnsupportedAttachmentError,
+          "Model #{@model_id} cannot receive #{unsupported.map(&:type).uniq.join(', ')} attachments " \
+          "(supported input modalities: #{supported.join(', ')})"
+      end
+
       def provider
         @test_provider || @provider ||= build_provider
       end

data/lib/ask/agent/loop.rb

@@ -17,12 +17,12 @@ module Ask
       @max_consecutive_tool_turns = max_consecutive_tool_turns
       end
 
-      def run_turn(chat:, message:, tools:, tool_executor:, compactor:, hooks:, event_emitter:, session_id: nil, persist: nil, tool_call_repair: nil, steer_source: nil)
+      def run_turn(chat:, message:, tools:, tool_executor:, compactor:, hooks:, event_emitter:, session_id: nil, persist: nil, tool_call_repair: nil, steer_source: nil, attachments: nil)
         raise MaxTurnsExceeded if @turn_count >= @max_turns
 
         event_emitter.emit(Events::TurnStart.new)
 
-        response = chat.ask(message) do |chunk|
+        response = chat.ask(message, attachments: attachments) do |chunk|
           if chunk.content.to_s.strip.length > 0
             event_emitter.emit(Events::TextDelta.new(content: chunk.content))
           end

data/lib/ask/agent/session.rb

@@ -196,7 +196,7 @@ module Ask
       #   (only when the +artifacts:+ option is enabled)
       attr_reader :artifact_store
 
-      def run(message, tools: nil, reset: true)
+      def run(message, tools: nil, reset: true, attachments: nil)
         raise "Session deleted" if @deleted
         raise "Session already running" if @running
 
@@ -230,6 +230,7 @@ module Ask
 	          response = @loop.run_turn(
 	            chat: @chat,
 	            message: message,
+	            attachments: attachments,
 	            tools: active_tools,
 	            tool_executor: @tool_executor,
 	            compactor: @compactor,
@@ -443,7 +444,7 @@ module Ask
         data[:messages].each do |msg|
           session.chat.add_message(
             role: msg[:role].to_sym,
-            content: msg[:content],
+            content: deserialize_content(msg[:content]),
             tool_call_id: msg[:tool_call_id]
           )
         end
@@ -662,8 +663,11 @@ end
       # @param message [String]
       # @param expected_turn_id [Integer, nil] the turn id the caller
       #   believes is current; nil skips the check
+      # @param attachments [Array<Ask::Attachment>, nil] files to attach
+      #   (applied when the session is idle; queued steers keep the
+      #   message text only — the loop resolves queued messages as text)
       # @return [Hash] {status: :stale|:queued|:steered, turn_id: Integer}
-      def steer(message, expected_turn_id: nil)
+      def steer(message, expected_turn_id: nil, attachments: nil)
         @steer_mutex.synchronize do
           if expected_turn_id && expected_turn_id != @turn_id
             return { status: :stale, turn_id: @turn_id }
@@ -673,7 +677,7 @@ end
             return { status: :queued, turn_id: @turn_id }
           end
         end
-        @chat.add_message(role: :user, content: message.to_s)
+        @chat.add_message(role: :user, content: message.to_s, attachments: attachments)
         { status: :steered, turn_id: @turn_id }
       end
 
@@ -959,7 +963,7 @@ end
         data[:messages].each do |msg|
           target.chat.add_message(
             role: msg[:role].to_sym,
-            content: msg[:content],
+            content: self.class.deserialize_content(msg[:content]),
             tool_call_id: msg[:tool_call_id]
           )
         end
@@ -977,13 +981,26 @@ end
         @tools.reject { |t| t.is_a?(Ask::Skills::LoadSkillTool) }
       end
 
+      # Persist content blocks as their +to_h+ hashes so attachments
+      # survive save/load; plain messages stay strings.
+      def self.serialize_content(message)
+        message.content_blocks ? message.content_blocks.map(&:to_h) : message.content.to_s
+      end
+
+      # Rebuild message content from a persisted value: block hashes are
+      # reconstructed via Ask::Content.from_h (deep_symbolize_keys may have
+      # symbol keys — from_h normalizes).
+      def self.deserialize_content(content)
+        content.is_a?(Array) ? content.map { |block| Ask::Content.from_h(block) } : content
+      end
+
       def persist!
         payload = {
           id: @id,
           messages: @chat.messages.map { |m|
             {
               role: m.role,
-              content: m.content.to_s,
+              content: self.class.serialize_content(m),
               tool_call_id: m.tool_call_id,
               created_at: Time.now.iso8601
             }

data/lib/ask/agent/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module Agent
-    VERSION = "0.38.0"
+    VERSION = "0.39.0"
   end
 end

data/lib/ask/agent.rb

@@ -18,6 +18,7 @@ module Ask
     class ToolExecutionError < Error; end
     class CompactionFailed < Error; end
     class SessionNotPersisted < Error; end
+    class UnsupportedAttachmentError < Error; end
 
     class UnknownAgent < Error; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-agent
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Kaka Ruto