@aomi-labs/client 0.1.15 → 0.1.16

package/dist/cli.js

@@ -22,7 +22,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 // package.json
 var package_default = {
   name: "@aomi-labs/client",
-  version: "0.1.15",
+  version: "0.1.16",
   description: "Platform-agnostic TypeScript client for the Aomi backend API",
   type: "module",
   main: "./dist/index.cjs",
@@ -278,6 +278,7 @@ function readStoredSession(path) {
     const fallbackLocalId = (_a3 = parseSessionFileLocalId(basename(path))) != null ? _a3 : 0;
     return {
       sessionId: parsed.sessionId,
+      clientId: parsed.clientId,
       baseUrl: parsed.baseUrl,
       app: parsed.app,
       model: parsed.model,
@@ -286,6 +287,7 @@ function readStoredSession(path) {
       chainId: parsed.chainId,
       pendingTxs: parsed.pendingTxs,
       signedTxs: parsed.signedTxs,
+      secretHandles: parsed.secretHandles,
       localId: typeof parsed.localId === "number" && parsed.localId > 0 ? parsed.localId : fallbackLocalId,
       createdAt: typeof parsed.createdAt === "number" && parsed.createdAt > 0 ? parsed.createdAt : Date.now(),
       updatedAt: typeof parsed.updatedAt === "number" && parsed.updatedAt > 0 ? parsed.updatedAt : Date.now()
@@ -1148,6 +1150,30 @@ var AomiClient = class {
   }
 };
 
+// src/types.ts
+var CLIENT_TYPE_TS_CLI = "ts_cli";
+function addUserStateExt(userState, key, value) {
+  const currentExt = userState["ext"];
+  const extRecord = typeof currentExt === "object" && currentExt !== null && !Array.isArray(currentExt) ? currentExt : {};
+  return __spreadProps(__spreadValues({}, userState), {
+    ext: __spreadProps(__spreadValues({}, extRecord), {
+      [key]: value
+    })
+  });
+}
+function isInlineCall(event) {
+  return "InlineCall" in event;
+}
+function isSystemNotice(event) {
+  return "SystemNotice" in event;
+}
+function isSystemError(event) {
+  return "SystemError" in event;
+}
+function isAsyncCallback(event) {
+  return "AsyncCallback" in event;
+}
+
 // src/event-emitter.ts
 var TypedEventEmitter = class {
   constructor() {
@@ -1220,20 +1246,6 @@ var TypedEventEmitter = class {
   }
 };
 
-// src/types.ts
-function isInlineCall(event) {
-  return "InlineCall" in event;
-}
-function isSystemNotice(event) {
-  return "SystemNotice" in event;
-}
-function isSystemError(event) {
-  return "SystemError" in event;
-}
-function isAsyncCallback(event) {
-  return "AsyncCallback" in event;
-}
-
 // src/event-unwrap.ts
 function unwrapSystemEvent(event) {
   var _a3;
@@ -1391,7 +1403,7 @@ function isSubsetMatch(expected, actual) {
 }
 var ClientSession = class extends TypedEventEmitter {
   constructor(clientOrOptions, sessionOptions) {
-    var _a3, _b, _c;
+    var _a3, _b, _c, _d, _e;
     super();
     // Internal state
     this.pollTimer = null;
@@ -1408,8 +1420,9 @@ var ClientSession = class extends TypedEventEmitter {
     this.app = (_b = sessionOptions == null ? void 0 : sessionOptions.app) != null ? _b : "default";
     this.publicKey = sessionOptions == null ? void 0 : sessionOptions.publicKey;
     this.apiKey = sessionOptions == null ? void 0 : sessionOptions.apiKey;
-    this.userState = sessionOptions == null ? void 0 : sessionOptions.userState;
-    this.pollIntervalMs = (_c = sessionOptions == null ? void 0 : sessionOptions.pollIntervalMs) != null ? _c : 500;
+    this.userState = (sessionOptions == null ? void 0 : sessionOptions.clientType) ? addUserStateExt((_c = sessionOptions == null ? void 0 : sessionOptions.userState) != null ? _c : {}, "client_type", sessionOptions.clientType) : sessionOptions == null ? void 0 : sessionOptions.userState;
+    this.clientId = (_d = sessionOptions == null ? void 0 : sessionOptions.clientId) != null ? _d : crypto.randomUUID();
+    this.pollIntervalMs = (_e = sessionOptions == null ? void 0 : sessionOptions.pollIntervalMs) != null ? _e : 500;
     this.logger = sessionOptions == null ? void 0 : sessionOptions.logger;
     this.unsubscribeSSE = this.client.subscribeSSE(
       this.sessionId,
@@ -1434,7 +1447,8 @@ var ClientSession = class extends TypedEventEmitter {
       app: this.app,
       publicKey: this.publicKey,
       apiKey: this.apiKey,
-      userState: this.userState
+      userState: this.userState,
+      clientId: this.clientId
     });
     this.assertUserStateAligned(response.user_state);
     this.applyState(response);
@@ -1458,7 +1472,8 @@ var ClientSession = class extends TypedEventEmitter {
       app: this.app,
       publicKey: this.publicKey,
       apiKey: this.apiKey,
-      userState: this.userState
+      userState: this.userState,
+      clientId: this.clientId
     });
     this.assertUserStateAligned(response.user_state);
     this.applyState(response);
@@ -1580,6 +1595,10 @@ var ClientSession = class extends TypedEventEmitter {
       this.publicKey = address;
     }
   }
+  setClientType(clientType) {
+    var _a3;
+    this.resolveUserState(addUserStateExt((_a3 = this.userState) != null ? _a3 : {}, "client_type", clientType));
+  }
   addExtValue(key, value) {
     var _a3;
     const current = (_a3 = this.userState) != null ? _a3 : {};
@@ -1609,7 +1628,7 @@ var ClientSession = class extends TypedEventEmitter {
   }
   async syncUserState() {
     this.assertOpen();
-    const state = await this.client.fetchState(this.sessionId, this.userState);
+    const state = await this.client.fetchState(this.sessionId, this.userState, this.clientId);
     this.assertUserStateAligned(state.user_state);
     this.applyState(state);
     return state;
@@ -1639,7 +1658,8 @@ var ClientSession = class extends TypedEventEmitter {
     try {
       const state = await this.client.fetchState(
         this.sessionId,
-        this.userState
+        this.userState,
+        this.clientId
       );
       if (!this.pollTimer) return;
       this.assertUserStateAligned(state.user_state);
@@ -1760,9 +1780,6 @@ var ClientSession = class extends TypedEventEmitter {
 
 // src/cli/user-state.ts
 function buildCliUserState(publicKey, chainId) {
-  if (publicKey === void 0 && chainId === void 0) {
-    return void 0;
-  }
   const userState = {};
   if (publicKey !== void 0) {
     userState.address = publicKey;
@@ -1771,7 +1788,7 @@ function buildCliUserState(publicKey, chainId) {
   if (chainId !== void 0) {
     userState.chainId = chainId;
   }
-  return userState;
+  return addUserStateExt(userState, "client_type", CLIENT_TYPE_TS_CLI);
 }
 
 // src/cli/context.ts
@@ -1785,7 +1802,8 @@ function getOrCreateSession(runtime) {
       app: config.app,
       apiKey: config.apiKey,
       publicKey: config.publicKey,
-      chainId: config.chain
+      chainId: config.chain,
+      clientId: crypto.randomUUID()
     };
     writeState(state);
   } else {
@@ -1810,21 +1828,23 @@ function getOrCreateSession(runtime) {
       state.chainId = config.chain;
       changed = true;
     }
+    if (!state.clientId) {
+      state.clientId = crypto.randomUUID();
+      changed = true;
+    }
     if (changed) writeState(state);
   }
   const session = new ClientSession(
     { baseUrl: state.baseUrl, apiKey: state.apiKey },
     {
       sessionId: state.sessionId,
+      clientId: state.clientId,
       app: state.app,
       apiKey: state.apiKey,
       publicKey: state.publicKey
     }
   );
-  const userState = buildCliUserState(state.publicKey, state.chainId);
-  if (userState) {
-    session.resolveUserState(userState);
-  }
+  session.resolveUserState(buildCliUserState(state.publicKey, state.chainId));
   return { session, state };
 }
 function createControlClient(runtime) {
@@ -1969,11 +1989,9 @@ async function chatCommand(runtime) {
   const verbose = runtime.parsed.flags["verbose"] === "true" || runtime.parsed.flags["v"] === "true";
   const { session, state } = getOrCreateSession(runtime);
   try {
+    await ingestSecretsIfPresent(runtime, state, session.client);
     await applyRequestedModelIfPresent(runtime, session, state);
-    const userState = buildCliUserState(state.publicKey, state.chainId);
-    if (userState) {
-      session.resolveUserState(userState);
-    }
+    session.resolveUserState(buildCliUserState(state.publicKey, state.chainId));
     const capturedRequests = [];
     let printedAgentCount = 0;
     const seenToolResults = /* @__PURE__ */ new Set();
@@ -2360,7 +2378,7 @@ async function statusCommand(runtime) {
   }
   const { session, state } = getOrCreateSession(runtime);
   try {
-    const apiState = await session.client.fetchState(state.sessionId);
+    const apiState = await session.client.fetchState(state.sessionId, void 0, state.clientId);
     console.log(
       JSON.stringify(
         {
@@ -2640,7 +2658,7 @@ async function logCommand(runtime) {
   }
   const { session, state } = getOrCreateSession(runtime);
   try {
-    const apiState = await session.client.fetchState(state.sessionId);
+    const apiState = await session.client.fetchState(state.sessionId, void 0, state.clientId);
     const messages = (_a3 = apiState.messages) != null ? _a3 : [];
     const pendingTxs = (_b = state.pendingTxs) != null ? _b : [];
     const signedTxs = (_c = state.signedTxs) != null ? _c : [];
@@ -2767,6 +2785,11 @@ async function secretCommand(runtime) {
   if (subcommand === "clear") {
     const { session, state } = getOrCreateSession(runtime);
     try {
+      if (!state.clientId) {
+        console.log("No secrets configured.");
+        printDataFileLocation();
+        return;
+      }
       await session.client.clearSecrets(state.clientId);
       state.secretHandles = {};
       writeState(state);
@@ -2788,7 +2811,7 @@ async function fetchRemoteSessionStats(record) {
     apiKey: record.state.apiKey
   });
   try {
-    const apiState = await client.fetchState(record.sessionId);
+    const apiState = await client.fetchState(record.sessionId, void 0, record.state.clientId);
     const messages = (_a3 = apiState.messages) != null ? _a3 : [];
     return {
       topic: (_b = apiState.title) != null ? _b : "Untitled Session",
@@ -3490,10 +3513,7 @@ function createSessionFromState(state) {
       publicKey: state.publicKey
     }
   );
-  const userState = buildCliUserState(state.publicKey, state.chainId);
-  if (userState) {
-    session.resolveUserState(userState);
-  }
+  session.resolveUserState(buildCliUserState(state.publicKey, state.chainId));
   return session;
 }
 async function persistResolvedSignerState(session, state, address, chainId) {

package/dist/index.cjs

@@ -48,10 +48,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   AomiClient: () => AomiClient,
+  CLIENT_TYPE_TS_CLI: () => CLIENT_TYPE_TS_CLI,
+  CLIENT_TYPE_WEB_UI: () => CLIENT_TYPE_WEB_UI,
   DEFAULT_AA_CONFIG: () => DEFAULT_AA_CONFIG,
   Session: () => ClientSession,
   TypedEventEmitter: () => TypedEventEmitter,
   adaptSmartAccount: () => adaptSmartAccount,
+  addUserStateExt: () => addUserStateExt,
   buildAAExecutionPlan: () => buildAAExecutionPlan,
   createAAProviderState: () => createAAProviderState,
   createAlchemyAAProvider: () => createAlchemyAAProvider,
@@ -615,6 +618,17 @@ var AomiClient = class {
 };
 
 // src/types.ts
+var CLIENT_TYPE_TS_CLI = "ts_cli";
+var CLIENT_TYPE_WEB_UI = "web_ui";
+function addUserStateExt(userState, key, value) {
+  const currentExt = userState["ext"];
+  const extRecord = typeof currentExt === "object" && currentExt !== null && !Array.isArray(currentExt) ? currentExt : {};
+  return __spreadProps(__spreadValues({}, userState), {
+    ext: __spreadProps(__spreadValues({}, extRecord), {
+      [key]: value
+    })
+  });
+}
 function isInlineCall(event) {
   return "InlineCall" in event;
 }
@@ -857,7 +871,7 @@ function isSubsetMatch(expected, actual) {
 }
 var ClientSession = class extends TypedEventEmitter {
   constructor(clientOrOptions, sessionOptions) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     super();
     // Internal state
     this.pollTimer = null;
@@ -874,8 +888,9 @@ var ClientSession = class extends TypedEventEmitter {
     this.app = (_b = sessionOptions == null ? void 0 : sessionOptions.app) != null ? _b : "default";
     this.publicKey = sessionOptions == null ? void 0 : sessionOptions.publicKey;
     this.apiKey = sessionOptions == null ? void 0 : sessionOptions.apiKey;
-    this.userState = sessionOptions == null ? void 0 : sessionOptions.userState;
-    this.pollIntervalMs = (_c = sessionOptions == null ? void 0 : sessionOptions.pollIntervalMs) != null ? _c : 500;
+    this.userState = (sessionOptions == null ? void 0 : sessionOptions.clientType) ? addUserStateExt((_c = sessionOptions == null ? void 0 : sessionOptions.userState) != null ? _c : {}, "client_type", sessionOptions.clientType) : sessionOptions == null ? void 0 : sessionOptions.userState;
+    this.clientId = (_d = sessionOptions == null ? void 0 : sessionOptions.clientId) != null ? _d : crypto.randomUUID();
+    this.pollIntervalMs = (_e = sessionOptions == null ? void 0 : sessionOptions.pollIntervalMs) != null ? _e : 500;
     this.logger = sessionOptions == null ? void 0 : sessionOptions.logger;
     this.unsubscribeSSE = this.client.subscribeSSE(
       this.sessionId,
@@ -900,7 +915,8 @@ var ClientSession = class extends TypedEventEmitter {
       app: this.app,
       publicKey: this.publicKey,
       apiKey: this.apiKey,
-      userState: this.userState
+      userState: this.userState,
+      clientId: this.clientId
     });
     this.assertUserStateAligned(response.user_state);
     this.applyState(response);
@@ -924,7 +940,8 @@ var ClientSession = class extends TypedEventEmitter {
       app: this.app,
       publicKey: this.publicKey,
       apiKey: this.apiKey,
-      userState: this.userState
+      userState: this.userState,
+      clientId: this.clientId
     });
     this.assertUserStateAligned(response.user_state);
     this.applyState(response);
@@ -1046,6 +1063,10 @@ var ClientSession = class extends TypedEventEmitter {
       this.publicKey = address;
     }
   }
+  setClientType(clientType) {
+    var _a;
+    this.resolveUserState(addUserStateExt((_a = this.userState) != null ? _a : {}, "client_type", clientType));
+  }
   addExtValue(key, value) {
     var _a;
     const current = (_a = this.userState) != null ? _a : {};
@@ -1075,7 +1096,7 @@ var ClientSession = class extends TypedEventEmitter {
   }
   async syncUserState() {
     this.assertOpen();
-    const state = await this.client.fetchState(this.sessionId, this.userState);
+    const state = await this.client.fetchState(this.sessionId, this.userState, this.clientId);
     this.assertUserStateAligned(state.user_state);
     this.applyState(state);
     return state;
@@ -1105,7 +1126,8 @@ var ClientSession = class extends TypedEventEmitter {
     try {
       const state = await this.client.fetchState(
         this.sessionId,
-        this.userState
+        this.userState,
+        this.clientId
       );
       if (!this.pollTimer) return;
       this.assertUserStateAligned(state.user_state);
@@ -2029,10 +2051,13 @@ async function createPimlicoAAState(options) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AomiClient,
+  CLIENT_TYPE_TS_CLI,
+  CLIENT_TYPE_WEB_UI,
   DEFAULT_AA_CONFIG,
   Session,
   TypedEventEmitter,
   adaptSmartAccount,
+  addUserStateExt,
   buildAAExecutionPlan,
   createAAProviderState,
   createAlchemyAAProvider,