@aglyn/plugins-ai 1.0.0-beta.269 → 1.0.0-beta.271

package/src/lib/jobs/ai-jobs.js

@@ -24,6 +24,7 @@ import { createResourceUid } from "@aglyn/aglyn/app-utils/create-resource-uid";
 import { checkEntitlement } from "@aglyn/aglyn/server";
 import { assistCreditsFromUsd, assistFreeTasteRefusalText, assistHardCapRefusalText, assistRefusedByHardCap } from "../usage/assist-credits.js";
 import { AI_JOB_PLAN_STEP, AI_JOB_TERMINAL_STATUSES } from "../model/ai-jobs.types.js";
+import { aiJobInputProblems, aiPlanWithInput } from "../model/ai-job-input.js";
 import { resolveEffectivePlan } from "@aglyn/aglyn/app-utils/plan-entitlements";
 import { aiOverageReservationRefusal } from "../billing/ai-overage-gate.js";
 import { aiAllotmentRefusalText } from "../model/ai-allotments.js";
@@ -478,7 +479,7 @@ export async function getAiJob(firestore, orgId, jobId) {
 }
 /** The wire form. `running` is the lease, read against `now`. */ export function aiJobSummary(job, now = new Date()) {
     var _job_hostId, _job_steps, _job_outputs, _job_creditsReserved, _job_creditsSpent, _job_refundedCredits, _toIso, _toIso1, _job_error, _job_plan_labels, _job_plan_confirmedBy, _job_applied_versions, _job_applied_staged;
-    var _job_lease, _job_inputs, _job_items, _job_inputs1;
+    var _job_lease, _job_inputs, _job_input_fields, _job_input, _job_items, _job_inputs1;
     const leaseUntil = toMillis((_job_lease = job.lease) == null ? void 0 : _job_lease.until);
     return _extends({
         id: job.$id,
@@ -519,7 +520,10 @@ export async function getAiJob(firestore, orgId, jobId) {
         }) : null,
         review: job.review ? aiCustomerSafeReview(job.review, {
             page: job.kind === 'page'
-        }) : null,
+        }) : null
+    }, job.status === 'needs_input' && ((_job_input = job.input) == null ? void 0 : (_job_input_fields = _job_input.fields) == null ? void 0 : _job_input_fields.length) ? {
+        input: job.input
+    } : {}, {
         applied: job.applied ? {
             at: toIso(job.applied.at),
             by: job.applied.by,
@@ -830,7 +834,7 @@ function nextStepIndex(job) {
  */ export async function recordStep(firestore, orgId, jobId, owner, stepIndex, input, now = new Date()) {
     const ref = jobsCollection(firestore, orgId).doc(jobId);
     const recorded = await firestore.runTransaction(async (tx)=>{
-        var _ref, _input_items, _job_outputs, _input_outputs, _job_creditsSpent, _job_creditsReserved, _job_creditsReserved1, _job_refundedCredits, _ref1;
+        var _ref, _input_items, _job_outputs, _input_outputs, _job_creditsSpent, _job_creditsReserved, _job_creditsReserved1, _job_refundedCredits, _input_input, _ref1;
         var _job_lease, _input_item, _this;
         const job = jobFrom(await tx.get(ref));
         if (!job) throw new Error(`ai job ${orgId}/${jobId} vanished`);
@@ -858,7 +862,9 @@ function nextStepIndex(job) {
         // write that records what the step cost and built: nothing after it runs.
         const canceling = aiJobCancelPending(job);
         const parksForReview = Boolean(input.review) && !isAiJobTerminal(job.status) && !canceling;
-        const status = isAiJobTerminal(job.status) ? job.status : canceling ? 'canceled' : job.status === 'needs_input' ? job.status : parksForReview ? 'needs_review' : input.status === 'failed' ? 'running' : remaining > 0 ? 'queued' : 'running';
+        // A plan only the person can complete waits for their answer (AGL-3978).
+        const parkedAs = input.input ? 'needs_input' : 'needs_review';
+        const status = isAiJobTerminal(job.status) ? job.status : canceling ? 'canceled' : job.status === 'needs_input' ? job.status : parksForReview ? parkedAs : input.status === 'failed' ? 'running' : remaining > 0 ? 'queued' : 'running';
         const patch = _extends({
             status,
             steps,
@@ -883,7 +889,8 @@ function nextStepIndex(job) {
             refundedCredits: ((_job_refundedCredits = job.refundedCredits) != null ? _job_refundedCredits : 0) + input.item.creditsRefunded
         } : {}, parksForReview && input.review ? {
             review: input.review,
-            error: input.review.reason === 'plan' ? null : input.review.message
+            error: input.input ? input.input.message : input.review.reason === 'plan' ? null : input.review.message,
+            input: (_input_input = input.input) != null ? _input_input : null
         } : {}, canceling ? _extends({
             creditsReserved: 0,
             lease: null,
@@ -900,8 +907,8 @@ function nextStepIndex(job) {
         return {
             job: _extends({}, job, patch),
             remaining,
-            // Entered `needs_review` in this write, rather than parked again.
-            parked: parksForReview && job.status !== 'needs_review',
+            // Entered `needs_review` (or `needs_input` for an answer) in this write, rather than parked again.
+            parked: parksForReview && job.status !== parkedAs,
             // Ended `canceled` in this write (AGL-3936).
             ended: canceling && !isAiJobTerminal(job.status)
         };
@@ -1426,11 +1433,27 @@ async function transition(firestore, orgId, jobId, apply) {
  */ export async function resumeAiJob(firestore, orgId, jobId, actor, now = new Date(), options = {}) {
     const resumed = await transition(firestore, orgId, jobId, (current)=>{
         var _options_reducePlan;
-        var _current_review, _current_inputs;
+        var _current_input_fields, _current_input, _current_review, _current_inputs;
         // A job the meter paused (AGL-3660) carries on from the step it paused
         // on: that step is already pending, so it is queued again with nothing
         // else changed. Whether the credits are there now is the reservation's
         // to say, at the door and again at the step.
+        // A job waiting for a person's answer (AGL-3978) takes it only once every
+        // field reads (`aiJobInputProblems`, which the door asks first): the
+        // answer is written to the plan's item and the job returns to its plan
+        // card, where Confirm builds it as any plan.
+        if (current.status === 'needs_input' && ((_current_input = current.input) == null ? void 0 : (_current_input_fields = _current_input.fields) == null ? void 0 : _current_input_fields.length)) {
+            const values = options.input;
+            if (!values || !current.plan || Object.keys(aiJobInputProblems(current.input, values)).length) return null;
+            return {
+                status: 'needs_review',
+                plan: aiPlanWithInput(current.plan, current.input, values),
+                input: null,
+                error: null,
+                lease: null,
+                updatedAt: now
+            };
+        }
         if (current.status === 'needs_input') {
             return {
                 status: 'queued',
@@ -2004,6 +2027,8 @@ async function transition(firestore, orgId, jobId, apply) {
         plan: outcome.plan
     } : {}, review ? {
         review
+    } : {}, review && outcome.input ? {
+        input: outcome.input
     } : {}, outcome.sitePublish ? {
         sitePublish: outcome.sitePublish
     } : {}, aiJobSettlesByItem(job.kind) && outcome.items ? {
@@ -2072,6 +2097,22 @@ async function transition(firestore, orgId, jobId, apply) {
             job: resumed.job
         };
     }
+    // A plan waiting for an answer only the person can give (AGL-3978): kept,
+    // charged as any plan is, and asked of them; nothing about it failed.
+    if (review && outcome.input && recorded.job.status === 'needs_input') {
+        await logAiJobNeedsInput(orgId, {
+            uid: null
+        }, {
+            jobId,
+            kind: job.kind,
+            reason: 'input'
+        });
+        if (recorded.parked) await announceAiJobTransition(recorded.job, 'needs-review');
+        return {
+            outcome: 'needs_input',
+            job: recorded.job
+        };
+    }
     if (review && recorded.job.status === 'needs_review') {
         var _reservation_free6;
         // Nobody parked the job but its own step, so the row names no actor, as
@@ -2199,6 +2240,7 @@ async function transition(firestore, orgId, jobId, apply) {
     const attempt = async (candidate, left, first)=>{
         const { orgId, jobId } = candidate;
         try {
+            var _current_input_fields, _current_input;
             const current = await getAiJob(options.firestore, orgId, jobId);
             // A step that needs more time than is left is not started (AGL-2907): a
             // provider call the abort cuts off is billed upstream and metered
@@ -2209,6 +2251,19 @@ async function transition(firestore, orgId, jobId, apply) {
                 if (first) result.remaining += 1;
                 return;
             }
+            // A job waiting for a person's answer (AGL-3978) is theirs to resume:
+            // it rests again, at the back of the parked queue, so it never holds a
+            // place a meter park could use.
+            if ((current == null ? void 0 : current.status) === 'needs_input' && ((_current_input = current.input) == null ? void 0 : (_current_input_fields = _current_input.fields) == null ? void 0 : _current_input_fields.length)) {
+                await transition(options.firestore, orgId, jobId, (job)=>{
+                    var _job_input_fields, _job_input;
+                    return job.status === 'needs_input' && ((_job_input = job.input) == null ? void 0 : (_job_input_fields = _job_input.fields) == null ? void 0 : _job_input_fields.length) ? {
+                        updatedAt: new Date(now())
+                    } : null;
+                });
+                if (first) result.skipped += 1;
+                return;
+            }
             if ((current == null ? void 0 : current.status) === 'needs_input') {
                 await transition(options.firestore, orgId, jobId, (job)=>job.status === 'needs_input' ? {
                         status: 'queued',