feat(backend/jobs): add agent_id parameter

backend/cmd/main.go

@@ -105,8 +105,7 @@ func main() {
 
 	// Initialize script management service and handlers
 	scriptManageSvc := service.NewScriptService(h.Repo)
-	scriptManageHandlers := handlers.NewScriptHandlersGroup(scriptManageSvc, cmdr,
+	scriptManageHandlers := handlers.NewScriptHandlersGroup(scriptManageSvc, cmdr)
-		os.Getenv("WHEREAMI"))
 
 	agents := handlers.NewAgentsGroup(h, coll)
 	auth := handlers.AuthGroup{Handlers: h}

backend/docs/docs.go

@@ -1657,7 +1657,7 @@ const docTemplate = `{
                         "Bearer": []
                     }
                 ],
-                "description": "Loads a script from storage, resolves interpreter command, and submits it to the agent",
+                "description": "Loads a script from storage, resolves interpreter command, and executes on the specified agent",
                 "consumes": [
                     "application/json"
                 ],
@@ -1677,7 +1677,7 @@ const docTemplate = `{
                         "required": true
                     },
                     {
-                        "description": "Agent ID and optional stdin",
+                        "description": "Agent token and optional stdin",
                         "name": "body",
                         "in": "body",
                         "required": true,
@@ -1690,7 +1690,7 @@ const docTemplate = `{
                     "201": {
                         "description": "Created",
                         "schema": {
-                            "$ref": "#/definitions/internal_handlers.AddJobOut"
+                            "$ref": "#/definitions/internal_handlers.JobResult"
                         }
                     },
                     "400": {

backend/docs/swagger.json

@@ -1646,7 +1646,7 @@
                         "Bearer": []
                     }
                 ],
-                "description": "Loads a script from storage, resolves interpreter command, and submits it to the agent",
+                "description": "Loads a script from storage, resolves interpreter command, and executes on the specified agent",
                 "consumes": [
                     "application/json"
                 ],
@@ -1666,7 +1666,7 @@
                         "required": true
                     },
                     {
-                        "description": "Agent ID and optional stdin",
+                        "description": "Agent token and optional stdin",
                         "name": "body",
                         "in": "body",
                         "required": true,
@@ -1679,7 +1679,7 @@
                     "201": {
                         "description": "Created",
                         "schema": {
-                            "$ref": "#/definitions/internal_handlers.AddJobOut"
+                            "$ref": "#/definitions/internal_handlers.JobResult"
                         }
                     },
                     "400": {

backend/docs/swagger.yaml

@@ -1576,14 +1576,14 @@ paths:
       consumes:
       - application/json
       description: Loads a script from storage, resolves interpreter command, and
-        submits it to the agent
+        executes on the specified agent
       parameters:
       - description: Script ID
         in: path
         name: id
         required: true
         type: integer
-      - description: Agent ID and optional stdin
+      - description: Agent token and optional stdin
         in: body
         name: body
         required: true
@@ -1595,7 +1595,7 @@ paths:
         "201":
           description: Created
           schema:
-            $ref: '#/definitions/internal_handlers.AddJobOut'
+            $ref: '#/definitions/internal_handlers.JobResult'
         "400":
           description: Bad Request
           schema:

backend/internal/handlers/scripts_manage.go

@@ -18,12 +18,11 @@ import (
 type ScriptHandlersGroup struct {
 	svc   *service.ScriptService
 	cmder *commander.Commander
-	whereami string
 }
 
 // NewScriptHandlersGroup creates a new ScriptHandlersGroup.
-func NewScriptHandlersGroup(svc *service.ScriptService, cmder *commander.Commander, whereami string) *ScriptHandlersGroup {
+func NewScriptHandlersGroup(svc *service.ScriptService, cmder *commander.Commander) *ScriptHandlersGroup {
-	return &ScriptHandlersGroup{svc: svc, cmder: cmder, whereami: whereami}
+	return &ScriptHandlersGroup{svc: svc, cmder: cmder}
 }
 
 // GetTree returns the script directory tree.
@@ -193,13 +192,13 @@ func (sh *ScriptHandlersGroup) DeleteScript(c *gin.Context) {
 
 // RunScriptByID executes a stored script on a target agent.
 // @Summary Run script by ID
-// @Description Loads a script from storage, resolves interpreter command, and submits it to the agent
+// @Description Loads a script from storage, resolves interpreter command, and executes on the specified agent
 // @Tags scripts
 // @Accept json
 // @Produce json
 // @Param id path int true "Script ID"
-// @Param body body RunStoredScriptIn true "Agent ID and optional stdin"
+// @Param body body RunStoredScriptIn true "Agent token and optional stdin"
-// @Success 201 {object} AddJobOut
+// @Success 201 {object} JobResult
 // @Failure 400 {object} map[string]string
 // @Failure 404 {object} map[string]string
 // @Failure 500 {object} map[string]string
@@ -249,12 +248,19 @@ func (sh *ScriptHandlersGroup) RunScriptByID(c *gin.Context) {
 		return
 	}
 
-	waitURL := fmt.Sprintf("%s/api/v1/jobs/%d/wait", sh.whereami, jid)
+	job, err := agent.WaitJob(jid)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("job execution failed: %v", err)})
+		return
+	}
 
-	c.JSON(http.StatusCreated, AddJobOut{
+	c.JSON(http.StatusCreated, JobResult{
-		ID:      jid,
+		ID:      job.ID,
-		Command: command,
+		Command: job.Command,
-		WaitURL: waitURL,
+		Stdin:   job.Stdin,
+		Stdout:  job.Stdout,
+		Stderr:  job.Stderr,
+		Status:  job.Status,
 	})
 }