@agentrix/shared 1.0.4 → 1.0.6

package/dist/index.cjs

@@ -71,10 +71,10 @@ const SignatureAuthRequestSchema = zod.z.object({
   // Base64-encoded random challenge
   signature: zod.z.string(),
   // Base64-encoded Ed25519 signature
-  salt: zod.z.string(),
-  // Salt for PIN code encryption (base64)
-  encryptedSecret: zod.z.string()
-  // Encrypted secret (base64)
+  salt: zod.z.string().optional(),
+  // Salt for password encryption (base64) - optional, set after login
+  encryptedSecret: zod.z.string().optional()
+  // Encrypted secret (base64) - optional, set after login
 });
 const SignatureAuthResponseSchema = zod.z.object({
   token: zod.z.string(),
@@ -82,8 +82,10 @@ const SignatureAuthResponseSchema = zod.z.object({
 });
 const UserProfileResponseSchema = zod.z.object({
   user: UserBasicInfoSchema.extend({
-    encryptedSecret: zod.z.string(),
-    secretSalt: zod.z.string(),
+    encryptedSecret: zod.z.string().nullable(),
+    // Can be null before password is set
+    secretSalt: zod.z.string().nullable(),
+    // Can be null before password is set
     createdAt: DateSchema,
     oauthAccounts: zod.z.array(OAuthAccountInfoSchema).optional()
   })
@@ -113,10 +115,10 @@ const OAuthLoginQuerySchema = zod.z.object({
   // Base64-encoded random challenge
   signatureProof: zod.z.string(),
   // Base64-encoded Ed25519 signature
-  salt: zod.z.string(),
-  // Salt for PIN code encryption (base64)
-  encryptedSecret: zod.z.string()
-  // Encrypted secret (base64)
+  salt: zod.z.string().optional(),
+  // Salt for password encryption (base64) - optional, set after login
+  encryptedSecret: zod.z.string().optional()
+  // Encrypted secret (base64) - optional, set after login
 });
 const OAuthCallbackQuerySchema = zod.z.object({
   code: zod.z.string(),
@@ -198,6 +200,8 @@ const StartTaskRequestSchema = zod.z.object({
   repositoryId: zod.z.string().optional(),
   baseBranch: zod.z.string().optional(),
   // Base branch for the repository
+  repositorySourceType: zod.z.enum(["temporary", "directory", "git-server"]).optional(),
+  // Repository source type
   dataEncryptionKey: zod.z.string().optional()
   // base64 sealed-box: app public key encrypted by machine public key
 }).refine((data) => data.machineId || data.cloudId, {
@@ -247,6 +251,8 @@ const TaskItemSchema = zod.z.object({
   dataEncryptionKey: zod.z.string().nullable(),
   cwd: zod.z.string().nullable(),
   // Current working directory from CLI worker
+  repositorySourceType: zod.z.enum(["temporary", "directory", "git-server"]).nullable(),
+  // Repository source type
   pullRequestNumber: zod.z.number().nullable(),
   pullRequestUrl: zod.z.string().nullable(),
   pullRequestState: zod.z.enum(["open", "closed", "merged"]).nullable(),
@@ -258,6 +264,8 @@ const TaskItemSchema = zod.z.object({
     totalDeletions: zod.z.number(),
     files: zod.z.array(FileStatsSchema)
   }).nullable(),
+  totalDuration: zod.z.number().nullable(),
+  // Cumulative execution time (milliseconds)
   createdAt: zod.z.string(),
   // ISO 8601 string
   updatedAt: zod.z.string()
@@ -860,6 +868,41 @@ const GitServerSchema = zod.z.object({
 const ListGitServersResponseSchema = zod.z.array(GitServerSchema);
 const GetGitServerResponseSchema = GitServerSchema;
 
+const AskUserOptionSchema = zod.z.object({
+  label: zod.z.string(),
+  // Option label (1-5 words)
+  description: zod.z.string()
+  // Option explanation
+});
+const AskUserQuestionSchema = zod.z.object({
+  question: zod.z.string(),
+  // Complete question text
+  header: zod.z.string().max(12),
+  // Short label (max 12 chars)
+  multiSelect: zod.z.boolean(),
+  // Allow multiple selections
+  options: zod.z.array(AskUserOptionSchema).min(2).max(5)
+  // 2-5 options (CLI may add "Other")
+});
+const AskUserMessageSchema = zod.z.object({
+  type: zod.z.literal("ask_user"),
+  questions: zod.z.array(AskUserQuestionSchema).min(1).max(4)
+  // 1-4 questions
+});
+const AskUserResponseMessageSchema = zod.z.object({
+  type: zod.z.literal("ask_user_response"),
+  answers: zod.z.array(zod.z.string())
+  // Array of answers (labels), one per question
+});
+function isAskUserMessage(message) {
+  return typeof message === "object" && message !== null && "type" in message && message.type === "ask_user";
+}
+function isAskUserResponseMessage(message) {
+  return typeof message === "object" && message !== null && "type" in message && message.type === "ask_user_response";
+}
+function isSDKMessage(message) {
+  return typeof message === "object" && message !== null && "type" in message && message.type !== "ask_user" && message.type !== "ask_user_response";
+}
 const EventBaseSchema = zod.z.object({
   eventId: zod.z.string()
 });
@@ -895,7 +938,9 @@ const WorkerInitializingSchema = EventBaseSchema.extend({
 const WorkerReadySchema = EventBaseSchema.extend({
   taskId: zod.z.string(),
   machineId: zod.z.string(),
-  timestamp: zod.z.string()
+  timestamp: zod.z.string(),
+  duration: zod.z.number().optional()
+  // Duration of this execution round (milliseconds)
 });
 const WorkerAliveEventSchema = EventBaseSchema.extend({
   taskId: zod.z.string(),
@@ -986,12 +1031,14 @@ const StopTaskSchema = EventBaseSchema.extend({
 const TaskMessageSchema = EventBaseSchema.extend({
   taskId: zod.z.string(),
   from: zod.z.enum(["app", "api-server", "machine", "worker"]),
+  opCode: zod.z.string().optional(),
+  // eventId of the message this is responding to (e.g., ask_user_response → ask_user)
   message: zod.z.custom(
     (data) => {
       return typeof data === "object" && data !== null && "type" in data;
     },
     {
-      message: "Invalid SDKMessage format"
+      message: "Invalid TaskMessagePayload format"
     }
   ).optional(),
   encryptedMessage: zod.z.string().optional()
@@ -1004,18 +1051,6 @@ const TaskMessageSchema = EventBaseSchema.extend({
     message: "Exactly one of message or encryptedMessage must be provided"
   }
 );
-const RequirePermissionSchema = EventBaseSchema.extend({
-  taskId: zod.z.string(),
-  toolName: zod.z.string(),
-  toolInput: zod.z.record(zod.z.unknown())
-});
-const RequirePermissionResponseSchema = EventBaseSchema.extend({
-  taskId: zod.z.string(),
-  opCode: zod.z.string(),
-  // Echoed back, equals to eventId in RequirePermissionRequest
-  behavior: zod.z.enum(["allow", "deny"]),
-  message: zod.z.string().optional()
-});
 const TaskArtifactsUpdatedEventSchema = EventBaseSchema.extend({
   taskId: zod.z.string(),
   commitHash: zod.z.string(),
@@ -1163,10 +1198,6 @@ const EventSchemaMap = {
   "update-task-agent-session-id": UpdateTaskAgentSessionIdEventSchema,
   // Artifacts events
   "task-artifacts-updated": TaskArtifactsUpdatedEventSchema,
-  // Permission events
-  "require-permission": RequirePermissionSchema,
-  "require-permission-response": RequirePermissionResponseSchema,
-  // Git operation events
   // Merge request events
   "merge-request": MergeRequestEventSchema,
   // System message events
@@ -1187,7 +1218,6 @@ const workerTaskEvents = [
   "change-task-title",
   "update-task-agent-session-id",
   "task-artifacts-updated",
-  "require-permission",
   "merge-request"
 ];
 
@@ -1231,20 +1261,6 @@ const AgentMetadataSchema = zod.z.object({
   version: zod.z.string(),
   description: zod.z.string().optional()
 });
-const MCPServerConfigSchema = zod.z.object({
-  name: zod.z.string(),
-  command: zod.z.string().optional(),
-  args: zod.z.array(zod.z.string()).optional(),
-  env: zod.z.record(zod.z.string()).optional(),
-  url: zod.z.string().url().optional(),
-  transport: zod.z.enum(["stdio", "http"]).optional()
-});
-const SkillConfigSchema = zod.z.object({
-  name: zod.z.string(),
-  description: zod.z.string().optional(),
-  enabled: zod.z.boolean(),
-  implementation: zod.z.string().optional()
-});
 const ClaudeConfigSchema = zod.z.object({
   // SDK native model configuration
   model: zod.z.string().optional(),
@@ -1260,13 +1276,9 @@ const ClaudeConfigSchema = zod.z.object({
     permissionMode: zod.z.enum(["default", "acceptEdits", "bypassPermissions", "plan"]).optional(),
     allowedTools: zod.z.array(zod.z.string()).optional()
   }).optional(),
-  mcpServers: zod.z.object({
-    enabled: zod.z.array(zod.z.string()),
-    directory: zod.z.string()
-  }).optional(),
-  skills: zod.z.object({
-    enabled: zod.z.array(zod.z.string()),
-    directory: zod.z.string()
+  pullRequestPrompt: zod.z.object({
+    path: zod.z.string(),
+    mode: zod.z.enum(["append", "replace"]).optional().default("append")
   }).optional()
 });
 
@@ -1372,71 +1384,15 @@ function assertAgentExists(agentDir, agentId) {
   }
 }
 
-async function loadMcpServers(mcpServersDir, enabledServers) {
-  const loaded = {};
-  if (!node_fs.existsSync(mcpServersDir)) {
-    return loaded;
+function discoverPlugins(pluginsDir) {
+  if (!node_fs.existsSync(pluginsDir)) {
+    return [];
   }
-  const serverDirs = node_fs.readdirSync(mcpServersDir, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
-  for (const serverName of enabledServers) {
-    if (!serverDirs.includes(serverName)) {
-      throw new AgentLoadError(
-        `MCP server "${serverName}" is enabled but directory not found`
-      );
-    }
-    const serverDir = node_path.join(mcpServersDir, serverName);
-    try {
-      const config = await loadMcpServerConfig(serverDir, serverName);
-      const instance = await createMcpServerInstance(config);
-      loaded[serverName] = {
-        name: serverName,
-        config,
-        instance
-      };
-    } catch (error) {
-      throw new AgentLoadError(
-        `Failed to load MCP server "${serverName}": ${error instanceof Error ? error.message : String(error)}`,
-        error instanceof Error ? error : void 0
-      );
-    }
-  }
-  return loaded;
+  return node_fs.readdirSync(pluginsDir, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => node_path.join(pluginsDir, dirent.name)).filter((pluginPath) => isValidPluginDirectory(pluginPath));
 }
-async function loadMcpServerConfig(serverDir, serverName) {
-  const configPath = node_path.join(serverDir, "config.json");
-  if (!node_fs.existsSync(configPath)) {
-    throw new AgentLoadError(`MCP server "${serverName}" missing config.json`);
-  }
-  try {
-    const content = node_fs.readFileSync(configPath, "utf-8");
-    const rawConfig = JSON.parse(content);
-    const validatedConfig = MCPServerConfigSchema.parse(rawConfig);
-    return validatedConfig;
-  } catch (error) {
-    if (error instanceof SyntaxError) {
-      throw new AgentConfigValidationError(
-        `Invalid JSON in MCP server config: ${serverName}`
-      );
-    }
-    throw new AgentConfigValidationError(
-      `Invalid MCP server configuration for "${serverName}": ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-async function createMcpServerInstance(config) {
-  if (config.transport === "stdio" && config.command) {
-    throw new AgentLoadError(
-      "stdio transport for MCP servers not yet implemented. Use inline MCP servers for now."
-    );
-  }
-  if (config.transport === "http" && config.url) {
-    throw new AgentLoadError(
-      "HTTP transport for MCP servers not yet implemented"
-    );
-  }
-  throw new AgentLoadError(
-    `Cannot create MCP server instance: unsupported configuration for "${config.name}"`
-  );
+function isValidPluginDirectory(pluginDir) {
+  const manifestPath = node_path.join(pluginDir, ".claude-plugin", "plugin.json");
+  return node_fs.existsSync(manifestPath);
 }
 
 async function loadAgentConfig(options) {
@@ -1506,19 +1462,17 @@ async function loadClaudeConfiguration(agentDir, metadata) {
   if (config.systemPrompt) {
     systemPrompt = await loadSystemPrompt(claudeDir, config.systemPrompt.path);
   }
-  const mcpServers = config.mcpServers ? await loadMcpServers(
-    node_path.join(claudeDir, config.mcpServers.directory),
-    config.mcpServers.enabled
-  ) : {};
-  const skills = config.skills ? await loadSkills(
-    node_path.join(claudeDir, config.skills.directory),
-    config.skills.enabled
-  ) : [];
+  let prPromptTemplate;
+  if (config.pullRequestPrompt) {
+    prPromptTemplate = await loadSystemPrompt(claudeDir, config.pullRequestPrompt.path);
+  }
+  const pluginsDir = node_path.join(claudeDir, "plugins");
+  const plugins = discoverPlugins(pluginsDir);
   return {
     config,
     systemPrompt,
-    mcpServers,
-    skills
+    prPromptTemplate,
+    plugins
   };
 }
 async function loadClaudeConfig(claudeDir) {
@@ -1553,43 +1507,6 @@ async function loadSystemPrompt(claudeDir, promptFile) {
     );
   }
 }
-async function loadSkills(skillsDir, enabledSkills) {
-  const skills = [];
-  if (!node_fs.existsSync(skillsDir)) {
-    return skills;
-  }
-  const skillDirs = node_fs.readdirSync(skillsDir, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
-  for (const skillName of enabledSkills) {
-    if (!skillDirs.includes(skillName)) {
-      throw new AgentLoadError(
-        `Skill "${skillName}" is enabled but directory not found`
-      );
-    }
-    const skillDir = node_path.join(skillsDir, skillName);
-    const skillConfigPath = node_path.join(skillDir, "skill.json");
-    if (!node_fs.existsSync(skillConfigPath)) {
-      throw new MissingAgentFileError(
-        `skills/${skillName}/skill.json`
-      );
-    }
-    try {
-      const content = node_fs.readFileSync(skillConfigPath, "utf-8");
-      const rawSkill = JSON.parse(content);
-      const skill = SkillConfigSchema.parse(rawSkill);
-      skills.push(skill);
-    } catch (error) {
-      if (error instanceof SyntaxError) {
-        throw new AgentConfigValidationError(
-          `Invalid JSON in skills/${skillName}/skill.json`
-        );
-      }
-      throw new AgentConfigValidationError(
-        `Invalid skill configuration for "${skillName}": ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  return skills;
-}
 
 const cryptoModule = typeof globalThis.crypto !== "undefined" ? globalThis.crypto : (async () => {
   try {
@@ -1614,7 +1531,11 @@ async function hmac_sha512(key, data) {
     false,
     ["sign"]
   );
-  const signature = await crypto.subtle.sign("HMAC", cryptoKey, data);
+  const signature = await crypto.subtle.sign(
+    "HMAC",
+    cryptoKey,
+    data
+  );
   return new Uint8Array(signature);
 }
 
@@ -1836,6 +1757,10 @@ exports.AppAliveEventSchema = AppAliveEventSchema;
 exports.ApprovalStatusResponseSchema = ApprovalStatusResponseSchema;
 exports.ArchiveTaskRequestSchema = ArchiveTaskRequestSchema;
 exports.ArchiveTaskResponseSchema = ArchiveTaskResponseSchema;
+exports.AskUserMessageSchema = AskUserMessageSchema;
+exports.AskUserOptionSchema = AskUserOptionSchema;
+exports.AskUserQuestionSchema = AskUserQuestionSchema;
+exports.AskUserResponseMessageSchema = AskUserResponseMessageSchema;
 exports.BillingStatsResponseSchema = BillingStatsResponseSchema;
 exports.BranchSchema = BranchSchema;
 exports.CancelTaskRequestSchema = CancelTaskRequestSchema;
@@ -1916,7 +1841,6 @@ exports.ListTransactionsQuerySchema = ListTransactionsQuerySchema;
 exports.ListTransactionsResponseSchema = ListTransactionsResponseSchema;
 exports.LocalMachineSchema = LocalMachineSchema;
 exports.LogoutResponseSchema = LogoutResponseSchema;
-exports.MCPServerConfigSchema = MCPServerConfigSchema;
 exports.MachineAliveEventSchema = MachineAliveEventSchema;
 exports.MachineApprovalRequestSchema = MachineApprovalRequestSchema;
 exports.MachineApprovalStatusQuerySchema = MachineApprovalStatusQuerySchema;
@@ -1944,8 +1868,6 @@ exports.QueryEventsRequestSchema = QueryEventsRequestSchema;
 exports.RechargeResponseSchema = RechargeResponseSchema;
 exports.RemoveChatMemberRequestSchema = RemoveChatMemberRequestSchema;
 exports.RepositorySchema = RepositorySchema;
-exports.RequirePermissionResponseSchema = RequirePermissionResponseSchema;
-exports.RequirePermissionSchema = RequirePermissionSchema;
 exports.ResetSecretRequestSchema = ResetSecretRequestSchema;
 exports.ResetSecretResponseSchema = ResetSecretResponseSchema;
 exports.ResumeTaskRequestSchema = ResumeTaskRequestSchema;
@@ -1954,7 +1876,6 @@ exports.ShutdownMachineSchema = ShutdownMachineSchema;
 exports.SignatureAuthRequestSchema = SignatureAuthRequestSchema;
 exports.SignatureAuthResponseSchema = SignatureAuthResponseSchema;
 exports.SimpleSuccessSchema = SimpleSuccessSchema;
-exports.SkillConfigSchema = SkillConfigSchema;
 exports.StartTaskRequestSchema = StartTaskRequestSchema;
 exports.StartTaskResponseSchema = StartTaskResponseSchema;
 exports.StatsQuerySchema = StatsQuerySchema;
@@ -2008,6 +1929,7 @@ exports.decryptFileContent = decryptFileContent;
 exports.decryptMachineEncryptionKey = decryptMachineEncryptionKey;
 exports.decryptSdkMessage = decryptSdkMessage;
 exports.decryptWithEphemeralKey = decryptWithEphemeralKey;
+exports.discoverPlugins = discoverPlugins;
 exports.encodeBase64 = encodeBase64;
 exports.encodeBase64Url = encodeBase64Url;
 exports.encryptAES = encryptAES;
@@ -2019,8 +1941,10 @@ exports.generateAESKey = generateAESKey;
 exports.generateAESKeyBase64 = generateAESKeyBase64;
 exports.getAgentContext = getAgentContext;
 exports.getRandomBytes = getRandomBytes;
+exports.isAskUserMessage = isAskUserMessage;
+exports.isAskUserResponseMessage = isAskUserResponseMessage;
+exports.isSDKMessage = isSDKMessage;
 exports.loadAgentConfig = loadAgentConfig;
-exports.loadMcpServers = loadMcpServers;
 exports.machineAuth = machineAuth;
 exports.permissionResponseRequestSchema = permissionResponseRequestSchema;
 exports.resumeTaskRequestSchema = resumeTaskRequestSchema;