making things work

gptel-openai.el

@@ -314,8 +314,8 @@ Mutate state INFO with response metadata."
   (format "call_%s" tool-id))
 
 (defun gptel--openai-unformat-tool-id (tool-id)
-  (or (and (string-match-p "call_\\(.+\\)" tool-id)
-           (match-string 0 tool-id))
+  (or (and (string-match "call_\\(.+\\)" tool-id)
+           (match-string 1 tool-id))
       (progn
         (message "Unexpected tool_call_id format: %s" tool-id)
         tool-id)))

gptel-org.el

@@ -50,6 +50,7 @@
 (declare-function gptel-backend-name "gptel")
 (declare-function gptel--parse-buffer "gptel")
 (declare-function gptel--parse-directive "gptel")
+(declare-function gptel--restore-props "gptel")
 (declare-function org-entry-get "org")
 (declare-function org-entry-put "org")
 (declare-function org-with-wide-buffer "org-macs")

gptel.el

@@ -169,6 +169,7 @@
 (declare-function ediff-regions-internal "ediff")
 (declare-function hl-line-highlight "hl-line")
 
+(declare-function org-escape-code-in-string "org-src")
 (declare-function gptel-org--create-prompt "gptel-org")
 (declare-function gptel-org-set-topic "gptel-org")
 (declare-function gptel-org--save-state "gptel-org")
@@ -1979,7 +1980,8 @@ Run post-response hooks."
                         backend (plist-get info :data)
                         (gptel--parse-tool-results
                          backend (plist-get info :tool-use)))
-                       (funcall (plist-get info :callback) result-alist info)
+                       (funcall (plist-get info :callback)
+                                (cons 'tool-result result-alist) info)
                        (gptel--fsm-transition fsm)))))
            (when-let* ((tool-spec
                         (cl-find-if
@@ -2011,7 +2013,8 @@ Run post-response hooks."
           (setq gptel--fsm-last fsm)
           (when gptel-mode (gptel--update-status
                             (format " Run tools?" ) 'mode-line-emphasis)))
-        (funcall (plist-get info :callback) pending-calls info)))))
+        (funcall (plist-get info :callback)
+                 (cons 'tool-call pending-calls) info)))))
 
 ;;;; State machine predicates
 ;; Predicates used to find the next state to transition to, see