@getpochi/cli 0.5.22 → 0.5.23

package/dist/cli.js

@@ -62,6 +62,337 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// ../../node_modules/minimal-polyfills/Map.js
+var require_Map = __commonJS((exports) => {
+  exports.__esModule = true;
+  exports.Polyfill = exports.LightMapImpl = undefined;
+  var LightMapImpl = function() {
+    function LightMapImpl2() {
+      this.record = [];
+    }
+    LightMapImpl2.prototype.has = function(key) {
+      return this.record.map(function(_a) {
+        var _key = _a[0];
+        return _key;
+      }).indexOf(key) >= 0;
+    };
+    LightMapImpl2.prototype.get = function(key) {
+      var entry = this.record.filter(function(_a) {
+        var _key = _a[0];
+        return _key === key;
+      })[0];
+      if (entry === undefined) {
+        return;
+      }
+      return entry[1];
+    };
+    LightMapImpl2.prototype.set = function(key, value2) {
+      var entry = this.record.filter(function(_a) {
+        var _key = _a[0];
+        return _key === key;
+      })[0];
+      if (entry === undefined) {
+        this.record.push([key, value2]);
+      } else {
+        entry[1] = value2;
+      }
+      return this;
+    };
+    LightMapImpl2.prototype["delete"] = function(key) {
+      var index = this.record.map(function(_a) {
+        var key2 = _a[0];
+        return key2;
+      }).indexOf(key);
+      if (index < 0) {
+        return false;
+      }
+      this.record.splice(index, 1);
+      return true;
+    };
+    LightMapImpl2.prototype.keys = function() {
+      return this.record.map(function(_a) {
+        var key = _a[0];
+        return key;
+      });
+    };
+    return LightMapImpl2;
+  }();
+  exports.LightMapImpl = LightMapImpl;
+  exports.Polyfill = typeof Map !== "undefined" ? Map : LightMapImpl;
+});
+
+// ../../node_modules/minimal-polyfills/WeakMap.js
+var require_WeakMap = __commonJS((exports) => {
+  exports.__esModule = true;
+  exports.Polyfill = undefined;
+  var Map_1 = require_Map();
+  exports.Polyfill = typeof WeakMap !== "undefined" ? WeakMap : Map_1.Polyfill;
+});
+
+// ../../node_modules/run-exclusive/lib/runExclusive.js
+var require_runExclusive = __commonJS((exports) => {
+  var __spreadArrays = exports && exports.__spreadArrays || function() {
+    for (var s = 0, i = 0, il = arguments.length;i < il; i++)
+      s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0;i < il; i++)
+      for (var a = arguments[i], j = 0, jl = a.length;j < jl; j++, k++)
+        r[k] = a[j];
+    return r;
+  };
+  exports.__esModule = true;
+  exports.buildMethodCb = exports.buildCb = exports.getPrComplete = exports.isRunning = exports.cancelAllQueuedCalls = exports.getQueuedCallCount = exports.buildMethod = exports.build = exports.createGroupRef = undefined;
+  var WeakMap_1 = require_WeakMap();
+  var ExecQueue = function() {
+    function ExecQueue2() {
+      this.queuedCalls = [];
+      this.isRunning = false;
+      this.prComplete = Promise.resolve();
+    }
+    ExecQueue2.prototype.cancelAllQueuedCalls = function() {
+      var n;
+      this.queuedCalls.splice(0, n = this.queuedCalls.length);
+      return n;
+    };
+    return ExecQueue2;
+  }();
+  var globalContext = {};
+  var clusters = new WeakMap_1.Polyfill;
+  function getOrCreateExecQueue(context, groupRef) {
+    var execQueueByGroup = clusters.get(context);
+    if (!execQueueByGroup) {
+      execQueueByGroup = new WeakMap_1.Polyfill;
+      clusters.set(context, execQueueByGroup);
+    }
+    var execQueue = execQueueByGroup.get(groupRef);
+    if (!execQueue) {
+      execQueue = new ExecQueue;
+      execQueueByGroup.set(groupRef, execQueue);
+    }
+    return execQueue;
+  }
+  function createGroupRef() {
+    return new Array(0);
+  }
+  exports.createGroupRef = createGroupRef;
+  function build() {
+    var inputs = [];
+    for (var _i = 0;_i < arguments.length; _i++) {
+      inputs[_i] = arguments[_i];
+    }
+    switch (inputs.length) {
+      case 1:
+        return buildFnPromise(true, createGroupRef(), inputs[0]);
+      case 2:
+        return buildFnPromise(true, inputs[0], inputs[1]);
+    }
+  }
+  exports.build = build;
+  function buildMethod() {
+    var inputs = [];
+    for (var _i = 0;_i < arguments.length; _i++) {
+      inputs[_i] = arguments[_i];
+    }
+    switch (inputs.length) {
+      case 1:
+        return buildFnPromise(false, createGroupRef(), inputs[0]);
+      case 2:
+        return buildFnPromise(false, inputs[0], inputs[1]);
+    }
+  }
+  exports.buildMethod = buildMethod;
+  function getQueuedCallCount(runExclusiveFunction, classInstanceObject) {
+    var execQueue = getExecQueueByFunctionAndContext(runExclusiveFunction, classInstanceObject);
+    return execQueue ? execQueue.queuedCalls.length : 0;
+  }
+  exports.getQueuedCallCount = getQueuedCallCount;
+  function cancelAllQueuedCalls(runExclusiveFunction, classInstanceObject) {
+    var execQueue = getExecQueueByFunctionAndContext(runExclusiveFunction, classInstanceObject);
+    return execQueue ? execQueue.cancelAllQueuedCalls() : 0;
+  }
+  exports.cancelAllQueuedCalls = cancelAllQueuedCalls;
+  function isRunning(runExclusiveFunction, classInstanceObject) {
+    var execQueue = getExecQueueByFunctionAndContext(runExclusiveFunction, classInstanceObject);
+    return execQueue ? execQueue.isRunning : false;
+  }
+  exports.isRunning = isRunning;
+  function getPrComplete(runExclusiveFunction, classInstanceObject) {
+    var execQueue = getExecQueueByFunctionAndContext(runExclusiveFunction, classInstanceObject);
+    return execQueue ? execQueue.prComplete : Promise.resolve();
+  }
+  exports.getPrComplete = getPrComplete;
+  var groupByRunExclusiveFunction = new WeakMap_1.Polyfill;
+  function getExecQueueByFunctionAndContext(runExclusiveFunction, context) {
+    if (context === undefined) {
+      context = globalContext;
+    }
+    var groupRef = groupByRunExclusiveFunction.get(runExclusiveFunction);
+    if (!groupRef) {
+      throw Error("Not a run exclusiveFunction");
+    }
+    var execQueueByGroup = clusters.get(context);
+    if (!execQueueByGroup) {
+      return;
+    }
+    return execQueueByGroup.get(groupRef);
+  }
+  function buildFnPromise(isGlobal, groupRef, fun) {
+    var execQueue;
+    var runExclusiveFunction = function() {
+      var _this = this;
+      var inputs = [];
+      for (var _i = 0;_i < arguments.length; _i++) {
+        inputs[_i] = arguments[_i];
+      }
+      if (!isGlobal) {
+        if (!(this instanceof Object)) {
+          throw new Error("Run exclusive, <this> should be an object");
+        }
+        execQueue = getOrCreateExecQueue(this, groupRef);
+      }
+      return new Promise(function(resolve, reject) {
+        var onPrCompleteResolve;
+        execQueue.prComplete = new Promise(function(resolve2) {
+          return onPrCompleteResolve = function() {
+            return resolve2();
+          };
+        });
+        var onComplete = function(result2) {
+          onPrCompleteResolve();
+          execQueue.isRunning = false;
+          if (execQueue.queuedCalls.length) {
+            execQueue.queuedCalls.shift()();
+          }
+          if ("data" in result2) {
+            resolve(result2.data);
+          } else {
+            reject(result2.reason);
+          }
+        };
+        (function callee() {
+          var _this2 = this;
+          var inputs2 = [];
+          for (var _i2 = 0;_i2 < arguments.length; _i2++) {
+            inputs2[_i2] = arguments[_i2];
+          }
+          if (execQueue.isRunning) {
+            execQueue.queuedCalls.push(function() {
+              return callee.apply(_this2, inputs2);
+            });
+            return;
+          }
+          execQueue.isRunning = true;
+          try {
+            fun.apply(this, inputs2).then(function(data) {
+              return onComplete({ data });
+            })["catch"](function(reason) {
+              return onComplete({ reason });
+            });
+          } catch (error40) {
+            onComplete({ reason: error40 });
+          }
+        }).apply(_this, inputs);
+      });
+    };
+    if (isGlobal) {
+      execQueue = getOrCreateExecQueue(globalContext, groupRef);
+    }
+    groupByRunExclusiveFunction.set(runExclusiveFunction, groupRef);
+    return runExclusiveFunction;
+  }
+  function buildCb() {
+    var inputs = [];
+    for (var _i = 0;_i < arguments.length; _i++) {
+      inputs[_i] = arguments[_i];
+    }
+    switch (inputs.length) {
+      case 1:
+        return buildFnCallback(true, createGroupRef(), inputs[0]);
+      case 2:
+        return buildFnCallback(true, inputs[0], inputs[1]);
+    }
+  }
+  exports.buildCb = buildCb;
+  function buildMethodCb() {
+    var inputs = [];
+    for (var _i = 0;_i < arguments.length; _i++) {
+      inputs[_i] = arguments[_i];
+    }
+    switch (inputs.length) {
+      case 1:
+        return buildFnCallback(false, createGroupRef(), inputs[0]);
+      case 2:
+        return buildFnCallback(false, inputs[0], inputs[1]);
+    }
+  }
+  exports.buildMethodCb = buildMethodCb;
+  function buildFnCallback(isGlobal, groupRef, fun) {
+    var execQueue;
+    var runExclusiveFunction = function() {
+      var _this = this;
+      var inputs = [];
+      for (var _i = 0;_i < arguments.length; _i++) {
+        inputs[_i] = arguments[_i];
+      }
+      if (!isGlobal) {
+        if (!(this instanceof Object)) {
+          throw new Error("Run exclusive, <this> should be an object");
+        }
+        execQueue = getOrCreateExecQueue(this, groupRef);
+      }
+      var callback = undefined;
+      if (inputs.length && typeof inputs[inputs.length - 1] === "function") {
+        callback = inputs.pop();
+      }
+      var onPrCompleteResolve;
+      execQueue.prComplete = new Promise(function(resolve) {
+        return onPrCompleteResolve = function() {
+          return resolve();
+        };
+      });
+      var onComplete = function() {
+        var inputs2 = [];
+        for (var _i2 = 0;_i2 < arguments.length; _i2++) {
+          inputs2[_i2] = arguments[_i2];
+        }
+        onPrCompleteResolve();
+        execQueue.isRunning = false;
+        if (execQueue.queuedCalls.length) {
+          execQueue.queuedCalls.shift()();
+        }
+        if (callback) {
+          callback.apply(_this, inputs2);
+        }
+      };
+      onComplete.hasCallback = !!callback;
+      (function callee() {
+        var _this2 = this;
+        var inputs2 = [];
+        for (var _i2 = 0;_i2 < arguments.length; _i2++) {
+          inputs2[_i2] = arguments[_i2];
+        }
+        if (execQueue.isRunning) {
+          execQueue.queuedCalls.push(function() {
+            return callee.apply(_this2, inputs2);
+          });
+          return;
+        }
+        execQueue.isRunning = true;
+        try {
+          fun.apply(this, __spreadArrays(inputs2, [onComplete]));
+        } catch (error40) {
+          error40.message += " ( This exception should not have been thrown, miss use of run-exclusive buildCb )";
+          throw error40;
+        }
+      }).apply(this, inputs);
+    };
+    if (isGlobal) {
+      execQueue = getOrCreateExecQueue(globalContext, groupRef);
+    }
+    groupByRunExclusiveFunction.set(runExclusiveFunction, groupRef);
+    return runExclusiveFunction;
+  }
+});
+
 // ../../node_modules/node-machine-id/dist/index.js
 var require_dist = __commonJS((exports, module) => {
   (function(t2, n2) {
@@ -74201,10 +74532,10 @@ var init_debug_info = __esm(() => {
   MutableDebugInfo = exports_Schema2.mutable(DebugInfo);
 });
 
-// ../../node_modules/@livestore/utils/node_modules/nanoid/url-alphabet/index.js
+// ../../node_modules/nanoid/url-alphabet/index.js
 var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 
-// ../../node_modules/@livestore/utils/node_modules/nanoid/index.js
+// ../../node_modules/nanoid/index.js
 import { webcrypto as crypto4 } from "node:crypto";
 function fillPool(bytes) {
   if (!pool || pool.length < bytes) {
@@ -270967,7 +271298,7 @@ var require_document = __commonJS((exports, module) => {
   Document.default = Document;
 });
 
-// ../../node_modules/nanoid/non-secure/index.cjs
+// ../../node_modules/postcss/node_modules/nanoid/non-secure/index.cjs
 var require_non_secure = __commonJS((exports, module) => {
   var urlAlphabet2 = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
   var customAlphabet = (alphabet, defaultSize = 21) => {
@@ -327368,6 +327699,9 @@ var ModelOptions = v4_default.object({
   contextWindow: v4_default.number().optional(),
   useToolCallMiddleware: v4_default.boolean().optional()
 });
+// ../common/src/vendor/base.ts
+var runExclusive = __toESM(require_runExclusive(), 1);
+
 // ../common/src/configuration/config-manager.ts
 import * as fs from "node:fs";
 import * as fsPromise from "node:fs/promises";
@@ -345085,17 +345419,17 @@ class VendorBase {
   constructor(vendorId) {
     this.vendorId = vendorId;
   }
-  getCredentials = async () => {
+  getCredentials = runExclusive.buildMethod(async () => {
     const { credentials } = this.getVendorConfig();
     const newCredentials = await this.renewCredentials(credentials);
     if (credentials !== newCredentials) {
-      updateVendorConfig(this.vendorId, {
+      await updateVendorConfig(this.vendorId, {
         credentials: newCredentials
       });
     }
     return newCredentials;
-  };
-  async getUserInfo() {
+  });
+  getUserInfo = runExclusive.buildMethod(async () => {
     const { user } = this.getVendorConfig();
     if (user)
       return user;
@@ -345106,7 +345440,7 @@ class VendorBase {
       credentials
     });
     return newUser;
-  }
+  });
   logout() {
     return updateVendorConfig(this.vendorId, null);
   }
@@ -346898,7 +347232,7 @@ var buildCustomFetchImpl = () => {
 var authClient = createAuthClient2();
 function isJWTExpiring(jwt2) {
   const { exp } = decodeJwt(jwt2);
-  return exp ? Date.now() >= (exp - 120) * 1000 : true;
+  return exp ? Date.now() >= (exp - 5 * 60) * 1000 : true;
 }
 
 // ../vendor-pochi/src/node.ts
@@ -351974,7 +352308,7 @@ var {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.5.22",
+  version: "0.5.23",
   type: "module",
   bin: {
     pochi: "src/cli.ts"
@@ -352000,6 +352334,7 @@ var package_default = {
     "@getpochi/vendor-pochi": "workspace:*",
     "@livestore/adapter-node": "catalog:",
     "@livestore/livestore": "catalog:",
+    "@livestore/utils": "catalog:",
     "@livestore/wa-sqlite": "catalog:",
     "@livestore/sync-cf": "catalog:",
     "@preact/signals-core": "^1.6.2",
@@ -386962,7 +387297,7 @@ ${followUpText}`,
   if (part.type === "tool-attemptCompletion") {
     const { result: result2 = "" } = part.input || {};
     const text12 = `${source_default2.bold(source_default2.green("\uD83C\uDF89 Task Completed"))}
-${source_default2.dim("└─")} ${result2}`;
+${result2}`;
     return {
       text: text12,
       stop: "stopAndPersist",
@@ -387064,6 +387399,9 @@ function renderSubtaskMessages(messages2) {
   return output2;
 }
 
+// src/task/cmd.ts
+init_effect();
+
 // src/livekit/store.ts
 import os10 from "node:os";
 import path21 from "node:path";
@@ -387099,7 +387437,67 @@ async function getPochiCredentials3() {
   const credentials = await pochi.getCredentials().catch(() => null);
   return credentials;
 }
+// src/livekit/chat.node.ts
+class NodeChatState {
+  signal = {
+    status: d("ready"),
+    error: d(undefined),
+    messages: d([])
+  };
+  get status() {
+    return this.signal.status.value;
+  }
+  set status(chatStatus) {
+    this.signal.status.value = chatStatus;
+  }
+  get error() {
+    return this.signal.error.value;
+  }
+  set error(error44) {
+    this.signal.error.value = error44;
+  }
+  get messages() {
+    return this.signal.messages.value;
+  }
+  set messages(messages2) {
+    this.signal.messages.value = messages2;
+  }
+  constructor(initialMessages = []) {
+    this.messages = initialMessages;
+  }
+  pushMessage = (message) => {
+    this.messages = this.messages.concat(message);
+  };
+  popMessage = () => {
+    this.messages = this.messages.slice(0, -1);
+  };
+  replaceMessage = (index3, message) => {
+    this.messages = [
+      ...this.messages.slice(0, index3),
+      this.snapshot(message),
+      ...this.messages.slice(index3 + 1)
+    ];
+  };
+  snapshot = (value9) => structuredClone(value9);
+}
 
+class Chat extends AbstractChat {
+  constructor({ messages: messages2, ...init4 }) {
+    const state2 = new NodeChatState(messages2);
+    super({ ...init4, state: state2 });
+  }
+  appendOrReplaceMessage(message) {
+    const index3 = this.state.messages.findIndex((m13) => m13.id === message.id);
+    if (index3 === -1) {
+      this.state.pushMessage(message);
+    } else {
+      this.state.replaceMessage(index3, message);
+    }
+  }
+  getState() {
+    return this.state;
+  }
+}
 // src/task/list.ts
 function registerTaskListCommand(taskCommand) {
   taskCommand.command("list", { isDefault: true }).description("List all recent tasks, showing their status and IDs.").option("-n, --limit <number>", "The maximum number of tasks to display.", "10").action(async (options4) => {
@@ -387204,10 +387602,24 @@ function registerTaskShareCommand(taskCommand) {
 // src/task/cmd.ts
 function registerTaskCommand(program5) {
   const taskCommand = program5.command("task").description("Manage and interact with tasks.").addHelpCommand(true);
+  taskCommand.hook("preAction", waitForSync);
   registerTaskListCommand(taskCommand);
   registerTaskShareCommand(taskCommand);
   return taskCommand;
 }
+async function waitForSync() {
+  const store = await createStore4(process.cwd());
+  await exports_Effect2.gen(function* (_8) {
+    while (true) {
+      const nextChange = store.syncProcessor.syncState.changes.pipe(exports_Stream2.take(1), exports_Stream2.runCollect, exports_Effect2.as(false));
+      const timeout5 = exports_Effect2.sleep("1 second").pipe(exports_Effect2.as(true));
+      if (yield* exports_Effect2.raceFirst(nextChange, timeout5)) {
+        break;
+      }
+    }
+  }).pipe(exports_Effect2.runPromise);
+  await store.shutdown();
+}
 // ../livekit/src/task.ts
 function toTaskStatus(message, finishReason) {
   let lastStepStart = -1;
@@ -389860,67 +390272,7 @@ class StepCount {
     return stepToString(this);
   }
 }
-// src/livekit/chat.node.ts
-class NodeChatState {
-  signal = {
-    status: d("ready"),
-    error: d(undefined),
-    messages: d([])
-  };
-  get status() {
-    return this.signal.status.value;
-  }
-  set status(chatStatus) {
-    this.signal.status.value = chatStatus;
-  }
-  get error() {
-    return this.signal.error.value;
-  }
-  set error(error44) {
-    this.signal.error.value = error44;
-  }
-  get messages() {
-    return this.signal.messages.value;
-  }
-  set messages(messages2) {
-    this.signal.messages.value = messages2;
-  }
-  constructor(initialMessages = []) {
-    this.messages = initialMessages;
-  }
-  pushMessage = (message) => {
-    this.messages = this.messages.concat(message);
-  };
-  popMessage = () => {
-    this.messages = this.messages.slice(0, -1);
-  };
-  replaceMessage = (index3, message) => {
-    this.messages = [
-      ...this.messages.slice(0, index3),
-      this.snapshot(message),
-      ...this.messages.slice(index3 + 1)
-    ];
-  };
-  snapshot = (value9) => structuredClone(value9);
-}
 
-class Chat extends AbstractChat {
-  constructor({ messages: messages2, ...init4 }) {
-    const state2 = new NodeChatState(messages2);
-    super({ ...init4, state: state2 });
-  }
-  appendOrReplaceMessage(message) {
-    const index3 = this.state.messages.findIndex((m13) => m13.id === message.id);
-    if (index3 === -1) {
-      this.state.pushMessage(message);
-    } else {
-      this.state.replaceMessage(index3, message);
-    }
-  }
-  getState() {
-    return this.state;
-  }
-}
 // src/tools/apply-diff.ts
 import * as fs11 from "node:fs/promises";
 import * as nodePath from "node:path";
@@ -390596,7 +390948,7 @@ function toError2(e11) {
 // package.json
 var package_default2 = {
   name: "@getpochi/cli",
-  version: "0.5.22",
+  version: "0.5.23",
   type: "module",
   bin: {
     pochi: "src/cli.ts"
@@ -390622,6 +390974,7 @@ var package_default2 = {
     "@getpochi/vendor-pochi": "workspace:*",
     "@livestore/adapter-node": "catalog:",
     "@livestore/livestore": "catalog:",
+    "@livestore/utils": "catalog:",
     "@livestore/wa-sqlite": "catalog:",
     "@livestore/sync-cf": "catalog:",
     "@preact/signals-core": "^1.6.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpochi/cli",
-  "version": "0.5.22",
+  "version": "0.5.23",
   "type": "module",
   "bin": {
     "pochi": "src/cli.ts"
@@ -26,6 +26,7 @@
     "@getpochi/vendor-pochi": "0.0.1",
     "@livestore/adapter-node": "0.4.0-dev.7",
     "@livestore/livestore": "0.4.0-dev.7",
+    "@livestore/utils": "0.4.0-dev.7",
     "@livestore/wa-sqlite": "0.4.0-dev.7",
     "@livestore/sync-cf": "0.4.0-dev.7",
     "@preact/signals-core": "^1.6.2",