perstack 0.0.64 → 0.0.66

package/dist/bin/cli.js

@@ -20,7 +20,7 @@ import { useRun } from '@perstack/react';
 // package.json
 var package_default = {
   name: "perstack",
-  version: "0.0.64",
+  version: "0.0.66",
   description: "PerStack CLI"};
 function getEnv(envPath) {
   const env = Object.fromEntries(
@@ -433,6 +433,13 @@ function getEventContents(jobId, runId, maxStepNumber) {
   }
   return events;
 }
+function getRunIdsByJobId(jobId) {
+  const runsDir = path10__default.resolve(getJobDir(jobId), "runs");
+  if (!existsSync(runsDir)) {
+    return [];
+  }
+  return readdirSync(runsDir, { withFileTypes: true }).filter((dir) => dir.isDirectory()).map((dir) => dir.name);
+}
 var FileSystemStorage = class {
   basePath;
   constructor(config = {}) {
@@ -1444,9 +1451,6 @@ function getMostRecentRun() {
   }
   return runs[0];
 }
-function getRunsByJobId(jobId) {
-  return getAllRuns2().filter((r) => r.jobId === jobId);
-}
 function getCheckpointsByJobId2(jobId) {
   return getCheckpointsByJobId(jobId);
 }
@@ -1493,10 +1497,10 @@ function getEventContents2(jobId, runId, maxStepNumber) {
   return getEventContents(jobId, runId, maxStepNumber);
 }
 function getAllEventContentsForJob(jobId, maxStepNumber) {
-  const runs = getRunsByJobId(jobId);
+  const runIds = getRunIdsByJobId(jobId);
   const allEvents = [];
-  for (const run of runs) {
-    const events = getEventContents(jobId, run.runId, maxStepNumber);
+  for (const runId of runIds) {
+    const events = getEventContents(jobId, runId, maxStepNumber);
     allEvents.push(...events);
   }
   return allEvents.sort((a, b) => a.timestamp - b.timestamp);
@@ -6926,6 +6930,7 @@ var startCommand = new Command().command("start").description("Start Perstack wi
     }
     let currentQuery = selection.query;
     let currentJobId = currentCheckpoint?.jobId ?? input.options.jobId;
+    let isNextQueryInteractiveToolResult = input.options.interactiveToolCallResult ?? false;
     let accumulatedEvents = currentCheckpoint ? getAllEventContentsForJob(currentCheckpoint.jobId, currentCheckpoint.stepNumber) : void 0;
     while (currentQuery !== null) {
       const historicalEvents = accumulatedEvents;
@@ -6948,7 +6953,7 @@ var startCommand = new Command().command("start").description("Start Perstack wi
         setting: {
           jobId: currentJobId,
           expertKey: selection.expertKey,
-          input: input.options.interactiveToolCallResult && currentCheckpoint ? parseInteractiveToolCallResult(currentQuery, currentCheckpoint) : { text: currentQuery },
+          input: isNextQueryInteractiveToolResult && currentCheckpoint ? parseInteractiveToolCallResult(currentQuery, currentCheckpoint) : { text: currentQuery },
           experts,
           model,
           providerConfig,
@@ -6970,10 +6975,12 @@ var startCommand = new Command().command("start").description("Start Perstack wi
         additionalEnvKeys: input.options.env
       });
       const result = await executionResult;
-      if (result.nextQuery && (runResult.status === "completed" || runResult.status === "stoppedByExceededMaxSteps" || runResult.status === "stoppedByError")) {
+      const canContinue = runResult.status === "completed" || runResult.status === "stoppedByExceededMaxSteps" || runResult.status === "stoppedByError" || runResult.status === "stoppedByInteractiveTool";
+      if (result.nextQuery && canContinue) {
         currentQuery = result.nextQuery;
         currentCheckpoint = runResult;
         currentJobId = runResult.jobId;
+        isNextQueryInteractiveToolResult = runResult.status === "stoppedByInteractiveTool";
         const newRunEvents = getEventContents2(runResult.jobId, runResult.runId);
         if (accumulatedEvents) {
           accumulatedEvents = [...accumulatedEvents, ...newRunEvents];