@xalia/agent 0.5.8 → 0.6.1

package/src/agent/openAILLMStreaming.ts

@@ -47,9 +47,6 @@ function updateToolCallFunction(
   // `arguments` has been observered to arrive in chunks.  The same is
   // probably true of `name`.
 
-  if (!deltaFn) {
-    return;
-  }
   if (deltaFn.name) {
     existingFn.name += deltaFn.name;
   }
@@ -131,8 +128,10 @@ function updateToolCalls(
   if (typeof toolCalls === "undefined") {
     toolCalls = [];
   }
-  const existing = toolCalls[deltaToolCall.index];
-  if (!existing) {
+  if (
+    deltaToolCall.index >= toolCalls.length ||
+    !toolCalls[deltaToolCall.index]
+  ) {
     toolCalls[deltaToolCall.index] = initialToolCall(deltaToolCall);
   } else {
     updateToolCall(toolCalls[deltaToolCall.index], deltaToolCall);
@@ -144,6 +143,7 @@ function initializeCompletionMessage(
   delta: OpenAI.Chat.Completions.ChatCompletionChunk.Choice.Delta
 ): OpenAI.Chat.Completions.ChatCompletionMessage {
   assert(delta.role === undefined || delta.role == "assistant");
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
   assert(!delta.function_call);
 
   //   export interface ChatCompletionChunk.Choice.Delta {
@@ -190,7 +190,9 @@ function updateCompletionMessage(
   message: OpenAI.Chat.Completions.ChatCompletionMessage,
   delta: OpenAI.Chat.Completions.ChatCompletionChunk.Choice.Delta
 ) {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   assert(message.role === "assistant");
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
   assert(!message.function_call);
   assert(!message.audio);
   assert(
@@ -225,6 +227,7 @@ function updateCompletionMessage(
       message.content = delta.content;
     }
   }
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
   assert(!delta.function_call);
   if (delta.refusal) {
     if (message.refusal) {
@@ -303,6 +306,7 @@ function updateCompletionChoice(
   updateCompletionMessage(completionChoice.message, chunkChoice.delta);
   if (chunkChoice.finish_reason) {
     assert(
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       completionChoice.finish_reason === null,
       `finish_reason already set: (${completionChoice.finish_reason})`
     );
@@ -490,13 +494,14 @@ export class OpenAILLMStreaming implements ILLM {
 
     // Check the type casting above
     if (!(chunks as unknown as { iterator: unknown }).iterator) {
-      throw "not a stream";
+      throw new Error("not a stream");
     }
 
     let aggregatedMessage: OpenAI.Chat.Completions.ChatCompletion | undefined;
     for await (const chunk of chunks) {
       logger.debug(`[stream] chunk: ${JSON.stringify(chunk)}`);
 
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       if (chunk.object !== "chat.completion.chunk") {
         // logger.warn("[stream]: unexpected message");
         continue;
@@ -516,6 +521,7 @@ export class OpenAILLMStreaming implements ILLM {
         // we safely access the first choice.
 
         const delta = chunk.choices[0]?.delta;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (delta?.content) {
           await onMessage(delta.content, false);
         }

package/src/agent/promptProvider.ts

@@ -0,0 +1,87 @@
+import { strict as assert } from "assert";
+
+/**
+ * Manage a structured system-prompt, built up of several components which can
+ * be updated at different frequencies.
+ */
+export class SystemPromptProvider {
+  /**
+   * A global prompt, common to all agents.
+   */
+  private static globalPrompt: string = "";
+
+  /**
+   * Specific to this particular agent.  AgentProfile.system_prompt.
+   */
+  private agentPrompt: string;
+
+  /**
+   * Prompt components defined by tools or client code.  Fragments are
+   * identified by ID strings, so they can later be updated or removed.
+   */
+  private fragments: Map<string, string>;
+
+  private fullPrompt: string;
+  private updatePrompt: boolean;
+
+  constructor(agentPrompt: string) {
+    this.agentPrompt = agentPrompt;
+    this.fragments = new Map();
+    this.fullPrompt = "";
+    this.updatePrompt = true;
+  }
+
+  /**
+   * This is not expected to change dynamically, but to be set exactly once at
+   * startup.  Thus existing prompts are not recomputed if this is updated.
+   */
+  static setGlobalPrompt(globalPrompt: string | undefined) {
+    SystemPromptProvider.globalPrompt = globalPrompt || "";
+  }
+
+  getAgentPrompt(): string {
+    return this.agentPrompt;
+  }
+
+  setAgentPrompt(agentPrompt: string) {
+    this.agentPrompt = agentPrompt;
+    this.updatePrompt = true;
+  }
+
+  setFragment(fragmentID: string, prompt: string) {
+    this.fragments.set(fragmentID, prompt);
+    this.updatePrompt = true;
+  }
+
+  removeFragment(fragmentID: string) {
+    this.fragments.delete(fragmentID);
+    this.updatePrompt = true;
+  }
+
+  getSystemPrompt(): string {
+    if (this.updatePrompt) {
+      this.computePrompt();
+    }
+    assert(!this.updatePrompt);
+    return this.fullPrompt;
+  }
+
+  private computePrompt() {
+    const global = SystemPromptProvider.globalPrompt.trimEnd();
+    const globalPost = global.length > 0 ? "\n" : "";
+
+    let prompt =
+      SystemPromptProvider.globalPrompt.trimEnd() +
+      globalPost +
+      this.agentPrompt.trimEnd();
+
+    // TODO: allow some control over the ordering?
+
+    for (const v of this.fragments.values()) {
+      prompt += "\n" + v.trimEnd();
+    }
+
+    this.fullPrompt = prompt;
+    this.updatePrompt = false;
+  }
+}

package/src/agent/repeatLLM.ts

@@ -10,7 +10,7 @@ export class RepeatLLM implements ILLM {
   }
 
   public getUrl(): string {
-    throw "cannot get url for RepeatLLM";
+    throw new Error("cannot get url for RepeatLLM");
   }
 
   public async getConversationResponse(
@@ -18,9 +18,9 @@ export class RepeatLLM implements ILLM {
     _tools?: OpenAI.Chat.Completions.ChatCompletionTool[],
     onMessage?: (msg: string, msgEnd: boolean) => Promise<void>
   ): Promise<OpenAI.Chat.Completions.ChatCompletion> {
-    await new Promise((r) => setTimeout(r, 0));
+    await new Promise((r) => setTimeout(r, 1000));
 
-    const content = `Message number ${this.idx++}`;
+    const content = `Message number ${String(this.idx++)}`;
     const response: OpenAI.Chat.Completions.ChatCompletion.Choice = {
       finish_reason: "stop",
       index: 0,
@@ -33,11 +33,11 @@ export class RepeatLLM implements ILLM {
     };
 
     if (onMessage) {
-      onMessage(content, true);
+      void onMessage(content, true);
     }
 
     return {
-      id: "" + this.idx,
+      id: String(this.idx),
       choices: [response],
       created: Date.now(),
       model: "dummyLlmModel",

package/src/agent/sudoMcpServerManager.ts

@@ -67,7 +67,7 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     private apiClient: ApiClient,
     private serverBriefs: SanitizedServerBrief[],
     private serverBriefsMap: { [serverName: string]: SanitizedServerBrief },
-    private toolCache: { [serverName: string]: Tool[] },
+    private toolCache: Map<string, Tool[]>,
     private openUrl: (
       url: string,
       authResultP: Promise<boolean>,
@@ -106,7 +106,7 @@ export class SkillManager extends McpServerManager implements ISkillManager {
       apiClient,
       mcpServers,
       mcpServersMap,
-      {},
+      new Map(),
       openUrl,
       authorized_url
     );
@@ -121,7 +121,7 @@ export class SkillManager extends McpServerManager implements ISkillManager {
   public async restoreMcpSettings(
     mcpSettings: McpServerSettings
   ): Promise<void> {
-    await this.restoreConfiguration(mcpSettings);
+    return this.restoreConfiguration(mcpSettings);
   }
 
   /**
@@ -156,7 +156,9 @@ export class SkillManager extends McpServerManager implements ISkillManager {
         this.enableTool(serverName, toolName);
       }
     };
-    Object.entries(mcpConfig).map((e) => enableTools(e));
+    Object.entries(mcpConfig).map((e) => {
+      enableTools(e);
+    });
   }
 
   /**
@@ -167,10 +169,10 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     const [mcpServers, mcpServersMap] = buildServersList(servers);
     this.serverBriefs = mcpServers;
     this.serverBriefsMap = mcpServersMap;
-    this.toolCache = {};
+    this.toolCache = new Map();
   }
 
-  public hasServer(serverName: string): boolean {
+  public hasServerBrief(serverName: string): boolean {
     return !!this.serverBriefsMap[serverName];
   }
 
@@ -184,7 +186,7 @@ export class SkillManager extends McpServerManager implements ISkillManager {
    */
   public async getServerTools(serverName: string): Promise<Tool[]> {
     // Check cache
-    let tools = this.toolCache[serverName];
+    let tools = this.toolCache.get(serverName);
     if (tools) {
       return tools;
     }
@@ -192,7 +194,7 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     // Query backend (using the original name)
     const originalName = this.serverBriefsMap[serverName].originalName;
     tools = await this.apiClient.listTools(originalName);
-    this.toolCache[serverName] = tools;
+    this.toolCache.set(serverName, tools);
     return tools;
   }
 
@@ -252,7 +254,7 @@ async function connectServer(
 ): Promise<void> {
   const transport = apiClient.mcpSession(mcpServer);
 
-  await client.connect(transport).catch(async (e) => {
+  await client.connect(transport).catch(async (e: unknown) => {
     if (e instanceof AuthenticationRequired && !noRetry) {
       logger.info("authentication required: " + e.msg);
 
@@ -263,9 +265,9 @@ async function connectServer(
       logger.info(`authenticate at url: ${url}`);
       openUrl(url, authenticatedP, mcpServer.title);
       const authResult = await authenticatedP;
-      logger.info(`authResult: ${authResult}`);
+      logger.info(`authResult: ${String(authResult)}`);
       if (!authResult) {
-        throw "authentication failed";
+        throw new Error("authentication failed");
       }
       return connectServer(
         client,

package/src/agent/tokenAuth.ts

@@ -13,10 +13,10 @@ export class TokenAuth implements OAuthClientProvider {
   }
 
   get redirectUrl(): string {
-    throw "unimpl";
+    throw new Error("unimpl: redirectUrl");
   }
   get clientMetadata(): OAuthClientMetadata {
-    throw "unimpl";
+    throw new Error("unimpl: clientMetadata");
   }
 
   clientInformation(): undefined {
@@ -26,7 +26,7 @@ export class TokenAuth implements OAuthClientProvider {
   saveClientInformation?(
     _clientInformation: OAuthClientInformationFull
   ): void | Promise<void> {
-    throw "unimpl";
+    throw new Error("unimpl: saveClientInformation");
   }
 
   tokens(): OAuthTokens | undefined | Promise<OAuthTokens | undefined> {
@@ -36,15 +36,15 @@ export class TokenAuth implements OAuthClientProvider {
     };
   }
   saveTokens(_tokens: OAuthTokens): void | Promise<void> {
-    throw "unimpl";
+    throw new Error("unimpl: saveTokens");
   }
   redirectToAuthorization(_authorizationUrl: URL): void | Promise<void> {
-    throw "unimpl";
+    throw new Error("unimpl: redirectToAuthorization");
   }
   saveCodeVerifier(_codeVerifier: string): void | Promise<void> {
-    throw "unimpl";
+    throw new Error("unimpl: saveCodeVerifier");
   }
   codeVerifier(): string | Promise<string> {
-    throw "unimpl";
+    throw new Error("unimpl: codeVerifier");
   }
 }

package/src/agent/tools.ts

@@ -45,7 +45,9 @@ export const toolCallbacks: {
     if (!isTemperatureArgs(args) || !args.location) {
       return `Location required`;
     }
-    return `The temperature in ${args.location} is 22 degrees ${args.unit}`;
+    return `The temperature in ${args.location} is 22 degrees ${
+      args.unit ?? "celsius"
+    }`;
   },
 };