@autohq/cli 0.1.131 → 0.1.133

package/dist/agent-bridge.js

@@ -19683,7 +19683,6 @@ var SessionRunCommandIdSchema2 = OpaqueIdSchema2.brand();
 var RuntimeIdSchema2 = OpaqueIdSchema2.brand();
 var RuntimeBridgeLeaseIdSchema2 = OpaqueIdSchema2.brand();
 var EnvironmentSetupSnapshotIdSchema = OpaqueIdSchema2.brand();
-var ToolIdSchema = OpaqueIdSchema2.brand();
 var UserIdSchema = OpaqueIdSchema2.brand();
 
 // ../../packages/schemas/src/auth.ts
@@ -21092,9 +21091,7 @@ var ToolSpecSchema = external_exports.discriminatedUnion("kind", [
   RemoteMcpToolSchema,
   LocalToolSchema
 ]);
-var ToolResourceSchema = resourceEnvelopeSchema(ToolSpecSchema);
-var ToolApplyRequestSchema = resourceApplySchema(ToolSpecSchema);
-var ToolConnectRequestSchema = external_exports.object({
+var SessionToolConnectRequestSchema = external_exports.object({
   redirectUri: external_exports.string().trim().url().refine(
     (value2) => {
       const url3 = new URL(value2);
@@ -21104,21 +21101,23 @@ var ToolConnectRequestSchema = external_exports.object({
       return url3.protocol === "http:" && (url3.hostname === "localhost" || url3.hostname === "127.0.0.1");
     },
     {
-      message: "Tool OAuth redirect URIs must use https, except localhost loopback callbacks may use http"
+      message: "Session tool OAuth redirect URIs must use https, except localhost loopback callbacks may use http"
     }
   ).optional()
 });
-var ToolConnectResponseSchema = external_exports.discriminatedUnion("status", [
+var SessionToolConnectResponseSchema = external_exports.discriminatedUnion("status", [
   external_exports.object({
     status: external_exports.literal("authorization_required"),
+    session: ResourceNameSchema,
     tool: ResourceNameSchema,
     connection: ResourceNameSchema,
     authorizationUrl: external_exports.string().trim().url(),
     message: external_exports.string().trim().min(1)
   })
 ]);
-var ToolConnectCompleteResponseSchema = external_exports.object({
+var SessionToolConnectCompleteResponseSchema = external_exports.object({
   status: external_exports.literal("connected"),
+  session: ResourceNameSchema.optional(),
   tool: ResourceNameSchema,
   connection: ResourceNameSchema,
   projectId: ProjectIdSchema
@@ -21975,22 +21974,14 @@ var ProjectApplyResponseSchema = external_exports.object({
   plan: external_exports.array(
     external_exports.object({
       action: external_exports.enum(["create", "update", "unchanged", "archive"]),
-      kind: external_exports.enum([
-        RESOURCE_KIND_ENVIRONMENT,
-        RESOURCE_KIND_IDENTITY,
-        RESOURCE_KIND_SESSION
-      ]),
+      kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
       name: external_exports.string().min(1),
       uid: external_exports.string().min(1).optional()
     })
   ).default([]),
   pruned: external_exports.array(
     external_exports.object({
-      kind: external_exports.enum([
-        RESOURCE_KIND_ENVIRONMENT,
-        RESOURCE_KIND_IDENTITY,
-        RESOURCE_KIND_SESSION
-      ]),
+      kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
       name: external_exports.string().min(1),
       uid: external_exports.string().min(1)
     })
@@ -22101,18 +22092,11 @@ var SessionRunRecordSchema = external_exports.object({
   sessionSnapshot: SessionResourceSchema,
   environmentSnapshot: EnvironmentResourceSchema,
   toolSnapshots: external_exports.array(
-    external_exports.discriminatedUnion("source", [
-      external_exports.object({
-        source: external_exports.literal("inline"),
-        alias: ToolAliasSchema,
-        spec: RemoteMcpToolSchema.or(LocalToolSchema).or(GithubToolSchema)
-      }),
-      external_exports.object({
-        source: external_exports.literal("resource"),
-        alias: ToolAliasSchema,
-        resource: ToolResourceSchema
-      })
-    ])
+    external_exports.object({
+      source: external_exports.literal("inline"),
+      alias: ToolAliasSchema,
+      spec: RemoteMcpToolSchema.or(LocalToolSchema).or(GithubToolSchema)
+    })
   ),
   input: JsonValueSchema2,
   createdAt: external_exports.string().datetime(),
@@ -26264,7 +26248,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.131",
+  version: "0.1.133",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"

package/dist/index.js

@@ -16052,7 +16052,7 @@ var init_zod = __esm({
 });
 
 // ../../packages/schemas/src/ids.ts
-var OpaqueIdSchema, ProfileIdSchema, EnvironmentIdSchema, IdentityIdSchema, ConnectionIdSchema, ExternalAccountIdSchema, OrganizationIdSchema, ProjectIdSchema, ProviderGrantIdSchema, ServiceAccountIdSchema, SessionIdSchema, SessionRunIdSchema, SessionRunCommandIdSchema, RuntimeIdSchema, RuntimeBridgeLeaseIdSchema, EnvironmentSetupSnapshotIdSchema, ToolIdSchema, UserIdSchema;
+var OpaqueIdSchema, ProfileIdSchema, EnvironmentIdSchema, IdentityIdSchema, ConnectionIdSchema, ExternalAccountIdSchema, OrganizationIdSchema, ProjectIdSchema, ProviderGrantIdSchema, ServiceAccountIdSchema, SessionIdSchema, SessionRunIdSchema, SessionRunCommandIdSchema, RuntimeIdSchema, RuntimeBridgeLeaseIdSchema, EnvironmentSetupSnapshotIdSchema, UserIdSchema;
 var init_ids = __esm({
   "../../packages/schemas/src/ids.ts"() {
     "use strict";
@@ -16073,7 +16073,6 @@ var init_ids = __esm({
     RuntimeIdSchema = OpaqueIdSchema.brand();
     RuntimeBridgeLeaseIdSchema = OpaqueIdSchema.brand();
     EnvironmentSetupSnapshotIdSchema = OpaqueIdSchema.brand();
-    ToolIdSchema = OpaqueIdSchema.brand();
     UserIdSchema = OpaqueIdSchema.brand();
   }
 });
@@ -17603,7 +17602,7 @@ function remoteMcpToolSchema(input) {
     ]).default({ kind: "none" })
   });
 }
-var REMOTE_MCP_TRANSPORTS, LOCAL_TOOL_IMPLEMENTATIONS, SecretReferenceSchema, NoToolAuthSchema, McpOAuthToolAuthSchema, ConnectionToolAuthSchema, ConnectionsToolAuthSchema, ToolAliasSchema, RemoteMcpToolSchema, LocalAutoToolSchema, LocalPingToolSchema, LocalChatToolSchema, LocalToolSchema, GithubToolSchema, ToolSpecSchema, ToolResourceSchema, ToolApplyRequestSchema, ToolConnectRequestSchema, ToolConnectResponseSchema, ToolConnectCompleteResponseSchema, InlineSessionToolSchema, SessionToolRefSchema, SessionToolsSchema;
+var REMOTE_MCP_TRANSPORTS, LOCAL_TOOL_IMPLEMENTATIONS, SecretReferenceSchema, NoToolAuthSchema, McpOAuthToolAuthSchema, ConnectionToolAuthSchema, ConnectionsToolAuthSchema, ToolAliasSchema, RemoteMcpToolSchema, LocalAutoToolSchema, LocalPingToolSchema, LocalChatToolSchema, LocalToolSchema, GithubToolSchema, ToolSpecSchema, SessionToolConnectRequestSchema, SessionToolConnectResponseSchema, SessionToolConnectCompleteResponseSchema, InlineSessionToolSchema, SessionToolRefSchema, SessionToolsSchema;
 var init_tools = __esm({
   "../../packages/schemas/src/tools.ts"() {
     "use strict";
@@ -17675,9 +17674,7 @@ var init_tools = __esm({
       RemoteMcpToolSchema,
       LocalToolSchema
     ]);
-    ToolResourceSchema = resourceEnvelopeSchema(ToolSpecSchema);
-    ToolApplyRequestSchema = resourceApplySchema(ToolSpecSchema);
-    ToolConnectRequestSchema = external_exports.object({
+    SessionToolConnectRequestSchema = external_exports.object({
       redirectUri: external_exports.string().trim().url().refine(
         (value) => {
           const url2 = new URL(value);
@@ -17687,21 +17684,23 @@ var init_tools = __esm({
           return url2.protocol === "http:" && (url2.hostname === "localhost" || url2.hostname === "127.0.0.1");
         },
         {
-          message: "Tool OAuth redirect URIs must use https, except localhost loopback callbacks may use http"
+          message: "Session tool OAuth redirect URIs must use https, except localhost loopback callbacks may use http"
         }
       ).optional()
     });
-    ToolConnectResponseSchema = external_exports.discriminatedUnion("status", [
+    SessionToolConnectResponseSchema = external_exports.discriminatedUnion("status", [
       external_exports.object({
         status: external_exports.literal("authorization_required"),
+        session: ResourceNameSchema,
         tool: ResourceNameSchema,
         connection: ResourceNameSchema,
         authorizationUrl: external_exports.string().trim().url(),
         message: external_exports.string().trim().min(1)
       })
     ]);
-    ToolConnectCompleteResponseSchema = external_exports.object({
+    SessionToolConnectCompleteResponseSchema = external_exports.object({
       status: external_exports.literal("connected"),
+      session: ResourceNameSchema.optional(),
       tool: ResourceNameSchema,
       connection: ResourceNameSchema,
       projectId: ProjectIdSchema
@@ -18682,22 +18681,14 @@ var init_project_resources = __esm({
       plan: external_exports.array(
         external_exports.object({
           action: external_exports.enum(["create", "update", "unchanged", "archive"]),
-          kind: external_exports.enum([
-            RESOURCE_KIND_ENVIRONMENT,
-            RESOURCE_KIND_IDENTITY,
-            RESOURCE_KIND_SESSION
-          ]),
+          kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
           name: external_exports.string().min(1),
           uid: external_exports.string().min(1).optional()
         })
       ).default([]),
       pruned: external_exports.array(
         external_exports.object({
-          kind: external_exports.enum([
-            RESOURCE_KIND_ENVIRONMENT,
-            RESOURCE_KIND_IDENTITY,
-            RESOURCE_KIND_SESSION
-          ]),
+          kind: external_exports.enum(PROJECT_RESOURCE_KINDS),
           name: external_exports.string().min(1),
           uid: external_exports.string().min(1)
         })
@@ -18846,18 +18837,11 @@ var init_session_runs = __esm({
       sessionSnapshot: SessionResourceSchema,
       environmentSnapshot: EnvironmentResourceSchema,
       toolSnapshots: external_exports.array(
-        external_exports.discriminatedUnion("source", [
-          external_exports.object({
-            source: external_exports.literal("inline"),
-            alias: ToolAliasSchema,
-            spec: RemoteMcpToolSchema.or(LocalToolSchema).or(GithubToolSchema)
-          }),
-          external_exports.object({
-            source: external_exports.literal("resource"),
-            alias: ToolAliasSchema,
-            resource: ToolResourceSchema
-          })
-        ])
+        external_exports.object({
+          source: external_exports.literal("inline"),
+          alias: ToolAliasSchema,
+          spec: RemoteMcpToolSchema.or(LocalToolSchema).or(GithubToolSchema)
+        })
       ),
       input: JsonValueSchema,
       createdAt: external_exports.string().datetime(),
@@ -19634,10 +19618,6 @@ function createResourceApi(context) {
     path: "/sessions",
     applyResponseSchema: SessionApplyResponseSchema
   });
-  const tools = projectResource(context, {
-    path: "/tools",
-    applyResponseSchema: ToolResourceSchema
-  });
   const identities = projectResource(
     context,
     {
@@ -19655,19 +19635,17 @@ function createResourceApi(context) {
       options ?? {}
     ),
     applySessionResource: sessions.apply,
-    applyToolResource: tools.apply,
     createProjectServiceAccount: (request, options) => createProjectServiceAccount(context, request, options ?? {}),
     deleteProjectResource: (request, options) => deleteProjectResource(context, request, options ?? {}),
     listEnvironments: environments.list,
     listIdentities: identities.list,
     listProjectServiceAccounts: (options) => listProjectServiceAccounts(context, options ?? {}),
     listSessions: sessions.list,
-    listTools: tools.list,
     getSessionPresence: (request, options) => getSessionPresence(context, request, options ?? {}),
     connectSessionPresence: (request, options) => connectSessionPresence(context, request, options ?? {}),
     recordSessionPresenceIcon: (request, options) => recordSessionPresenceIcon(context, request, options ?? {}),
-    startToolConnection: (request, options) => startToolConnection(context, request, options ?? {}),
-    completeToolConnection: (request, options) => completeToolConnection(context, request, options ?? {}),
+    startSessionToolConnection: (request, options) => startSessionToolConnection(context, request, options ?? {}),
+    completeSessionToolConnection: (request, options) => completeSessionToolConnection(context, request, options ?? {}),
     removeProjectServiceAccount: (request, options) => removeProjectServiceAccount(context, request, options ?? {}),
     rotateProjectServiceAccountToken: (request, options) => rotateProjectServiceAccountToken(context, request, options ?? {}),
     updateProjectServiceAccount: (request, options) => updateProjectServiceAccount(context, request, options ?? {})
@@ -19813,13 +19791,13 @@ async function recordSessionPresenceIcon(context, request, options) {
   }
   return SessionPresenceIconResponseSchema.parse(await response.json());
 }
-async function startToolConnection(context, request, options) {
+async function startSessionToolConnection(context, request, options) {
   const project = await context.activeProject();
   const response = await context.authenticatedFetch(
     context.apiUrl(
       projectApiPath(
         project,
-        `/tools/${encodeURIComponent(request.name)}/connections`
+        `/sessions/${encodeURIComponent(request.sessionName)}/tools/${encodeURIComponent(request.toolAlias)}/connections`
       ),
       options.apiBaseUrl
     ),
@@ -19837,9 +19815,9 @@ async function startToolConnection(context, request, options) {
   if (!response.ok) {
     throw new Error(await responseErrorMessage(response));
   }
-  return ToolConnectResponseSchema.parse(await response.json());
+  return SessionToolConnectResponseSchema.parse(await response.json());
 }
-async function completeToolConnection(context, request, options) {
+async function completeSessionToolConnection(context, request, options) {
   const url2 = new URL(
     context.apiUrl(apiPath("/mcp/oauth/callback"), options.apiBaseUrl)
   );
@@ -19853,7 +19831,7 @@ async function completeToolConnection(context, request, options) {
   if (!response.ok) {
     throw new Error(await responseErrorMessage(response));
   }
-  return ToolConnectCompleteResponseSchema.parse(await response.json());
+  return SessionToolConnectCompleteResponseSchema.parse(await response.json());
 }
 async function createProjectServiceAccount(context, request, options) {
   const project = await context.activeProject();
@@ -21205,7 +21183,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.131",
+      version: "0.1.133",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -21268,133 +21246,6 @@ var init_version = __esm({
   }
 });
 
-// src/commands/tools/connect.ts
-async function connectTool(input) {
-  if (input.manual) {
-    const result = await input.client.startToolConnection(
-      {
-        name: input.tool
-      },
-      {
-        apiBaseUrl: input.apiBaseUrl
-      }
-    );
-    writeConnectionStart(input.writeOutput, result);
-    return;
-  }
-  let connection;
-  const activeSelection = input.client.getActiveSelection();
-  let scopeContext = toolConnectionScopeContext({
-    activeSelection
-  });
-  const scopeContextPromise = resolveToolConnectionScopeContext({
-    activeSelection,
-    apiBaseUrl: input.apiBaseUrl,
-    client: input.client
-  });
-  const callback = await createOAuthLoopbackCallback({
-    successHtml: () => renderOAuthLoopbackPage({
-      status: "success",
-      eyebrow: "Auto Tool",
-      title: `${connection?.tool ?? input.tool} is authorized`,
-      message: "Auto received the provider authorization. The CLI will finish the token exchange in your terminal.",
-      details: [
-        { label: "Tool", value: connection?.tool ?? input.tool },
-        { label: "Connection", value: connection?.connection },
-        { label: "Organization", value: scopeContext.organization },
-        { label: "Project", value: scopeContext.project }
-      ]
-    }),
-    failureHtml: () => renderOAuthLoopbackPage({
-      status: "failure",
-      eyebrow: "Auto Tool",
-      title: `${connection?.tool ?? input.tool} was not authorized`,
-      message: "The provider rejected the authorization request. Return to your terminal to see the error details.",
-      details: [
-        { label: "Tool", value: connection?.tool ?? input.tool },
-        { label: "Connection", value: connection?.connection },
-        { label: "Organization", value: scopeContext.organization },
-        { label: "Project", value: scopeContext.project }
-      ]
-    })
-  });
-  try {
-    const result = await input.client.startToolConnection(
-      {
-        name: input.tool,
-        redirectUri: callback.redirectUri
-      },
-      {
-        apiBaseUrl: input.apiBaseUrl
-      }
-    );
-    scopeContext = await scopeContextPromise;
-    connection = result;
-    writeConnectionStart(input.writeOutput, result);
-    input.writeOutput("Waiting for browser authorization...");
-    openBrowser(result.authorizationUrl);
-    const authorized = await callback.result;
-    if (!authorized.state) {
-      throw new Error("OAuth callback is missing state");
-    }
-    const completed = await input.client.completeToolConnection(
-      {
-        code: authorized.code,
-        state: authorized.state
-      },
-      {
-        apiBaseUrl: input.apiBaseUrl
-      }
-    );
-    input.writeOutput(
-      `connected tool/${completed.tool} connection/${completed.connection}`
-    );
-  } finally {
-    callback.close();
-  }
-}
-async function resolveToolConnectionScopeContext(input) {
-  if (!input.activeSelection.organizationId || !input.activeSelection.projectId) {
-    return toolConnectionScopeContext({
-      activeSelection: input.activeSelection
-    });
-  }
-  try {
-    const response = await input.client.listProjects({
-      apiBaseUrl: input.apiBaseUrl
-    });
-    const activeProject = response.projects.find(
-      (project) => project.organizationId === input.activeSelection.organizationId && project.projectId === input.activeSelection.projectId
-    );
-    return toolConnectionScopeContext({
-      activeProject,
-      activeSelection: input.activeSelection
-    });
-  } catch {
-    return toolConnectionScopeContext({
-      activeSelection: input.activeSelection
-    });
-  }
-}
-function toolConnectionScopeContext(input) {
-  return {
-    organization: input.activeProject ? `${input.activeProject.organizationName} (${input.activeProject.organizationSlug})` : input.activeSelection.organizationId,
-    project: input.activeProject ? `${input.activeProject.projectName} (${input.activeProject.projectSlug})` : input.activeSelection.projectId
-  };
-}
-function writeConnectionStart(writeOutput, result) {
-  writeOutput(result.message);
-  writeOutput(`connect tool/${result.tool} connection/${result.connection}`);
-  writeOutput(`authorization_url ${result.authorizationUrl}`);
-}
-var init_connect = __esm({
-  "src/commands/tools/connect.ts"() {
-    "use strict";
-    init_browser();
-    init_loopback();
-  }
-});
-
 // src/commands/apply/assets.ts
 async function resolveApplyAssets(input) {
   const entries = Object.entries(input.request.assets);
@@ -21559,15 +21410,21 @@ function appliedResourceKind(request, response, index) {
   }
   return kind;
 }
-function mcpOAuthToolConnectionsFromApplyRequest(request) {
+function mcpOAuthSessionToolConnectionsFromApplyRequest(request) {
   return request.resources.filter((resource) => resource.kind === RESOURCE_KIND_SESSION).flatMap((resource) => {
-    return mcpOAuthToolConnectionsFromSessionTools(resource.spec.tools);
+    return mcpOAuthSessionToolConnectionsFromSessionTools({
+      session: resource.metadata.name,
+      tools: resource.spec.tools
+    });
   });
 }
-function mcpOAuthToolConnectionsFromAppliedResources(resources) {
+function mcpOAuthSessionToolConnectionsFromAppliedResources(resources) {
   return resources.filter((item) => item.kind === RESOURCE_KIND_SESSION).flatMap((item) => {
     const resource = item.resource;
-    return mcpOAuthToolConnectionsFromSessionTools(resource.spec.tools);
+    return mcpOAuthSessionToolConnectionsFromSessionTools({
+      session: resource.metadata.name,
+      tools: resource.spec.tools
+    });
   });
 }
 function applyFiles(root) {
@@ -21590,12 +21447,18 @@ function applyFiles(root) {
   }
   return files;
 }
-function mcpOAuthToolConnectionsFromSessionTools(tools) {
-  return Object.entries(tools).flatMap(([alias, tool]) => {
+function mcpOAuthSessionToolConnectionsFromSessionTools(input) {
+  return Object.entries(input.tools).flatMap(([alias, tool]) => {
     if (tool.kind !== "mcp_remote" || tool.disabled || tool.auth.kind !== "mcp_oauth") {
       return [];
     }
-    return [{ tool: alias, connection: tool.auth.connection }];
+    return [
+      {
+        session: input.session,
+        tool: alias,
+        connection: tool.auth.connection
+      }
+    ];
   });
 }
 function readApplyDocumentFile(path2) {
@@ -21808,6 +21671,139 @@ var init_files = __esm({
   }
 });
 
+// src/commands/apply/session-tool-connect.ts
+async function connectSessionTool(input) {
+  if (input.manual) {
+    const result = await input.client.startSessionToolConnection(
+      {
+        sessionName: input.session,
+        toolAlias: input.tool
+      },
+      {
+        apiBaseUrl: input.apiBaseUrl
+      }
+    );
+    writeConnectionStart(input.writeOutput, result);
+    return;
+  }
+  let connection;
+  const activeSelection = input.client.getActiveSelection();
+  let scopeContext = sessionToolConnectionScopeContext({
+    activeSelection
+  });
+  const scopeContextPromise = resolveSessionToolConnectionScopeContext({
+    activeSelection,
+    apiBaseUrl: input.apiBaseUrl,
+    client: input.client
+  });
+  const callback = await createOAuthLoopbackCallback({
+    successHtml: () => renderOAuthLoopbackPage({
+      status: "success",
+      eyebrow: "Auto Tool",
+      title: `${connection?.tool ?? input.tool} is authorized`,
+      message: "Auto received the provider authorization. The CLI will finish the token exchange in your terminal.",
+      details: [
+        { label: "Session", value: connection?.session ?? input.session },
+        { label: "Tool", value: connection?.tool ?? input.tool },
+        { label: "Connection", value: connection?.connection },
+        { label: "Organization", value: scopeContext.organization },
+        { label: "Project", value: scopeContext.project }
+      ]
+    }),
+    failureHtml: () => renderOAuthLoopbackPage({
+      status: "failure",
+      eyebrow: "Auto Tool",
+      title: `${connection?.tool ?? input.tool} was not authorized`,
+      message: "The provider rejected the authorization request. Return to your terminal to see the error details.",
+      details: [
+        { label: "Session", value: connection?.session ?? input.session },
+        { label: "Tool", value: connection?.tool ?? input.tool },
+        { label: "Connection", value: connection?.connection },
+        { label: "Organization", value: scopeContext.organization },
+        { label: "Project", value: scopeContext.project }
+      ]
+    })
+  });
+  try {
+    const result = await input.client.startSessionToolConnection(
+      {
+        sessionName: input.session,
+        toolAlias: input.tool,
+        redirectUri: callback.redirectUri
+      },
+      {
+        apiBaseUrl: input.apiBaseUrl
+      }
+    );
+    scopeContext = await scopeContextPromise;
+    connection = result;
+    writeConnectionStart(input.writeOutput, result);
+    input.writeOutput("Waiting for browser authorization...");
+    openBrowser(result.authorizationUrl);
+    const authorized = await callback.result;
+    if (!authorized.state) {
+      throw new Error("OAuth callback is missing state");
+    }
+    const completed = await input.client.completeSessionToolConnection(
+      {
+        code: authorized.code,
+        state: authorized.state
+      },
+      {
+        apiBaseUrl: input.apiBaseUrl
+      }
+    );
+    input.writeOutput(
+      `connected session/${completed.session ?? input.session} tool/${completed.tool} connection/${completed.connection}`
+    );
+  } finally {
+    callback.close();
+  }
+}
+async function resolveSessionToolConnectionScopeContext(input) {
+  if (!input.activeSelection.organizationId || !input.activeSelection.projectId) {
+    return sessionToolConnectionScopeContext({
+      activeSelection: input.activeSelection
+    });
+  }
+  try {
+    const response = await input.client.listProjects({
+      apiBaseUrl: input.apiBaseUrl
+    });
+    const activeProject = response.projects.find(
+      (project) => project.organizationId === input.activeSelection.organizationId && project.projectId === input.activeSelection.projectId
+    );
+    return sessionToolConnectionScopeContext({
+      activeProject,
+      activeSelection: input.activeSelection
+    });
+  } catch {
+    return sessionToolConnectionScopeContext({
+      activeSelection: input.activeSelection
+    });
+  }
+}
+function sessionToolConnectionScopeContext(input) {
+  return {
+    organization: input.activeProject ? `${input.activeProject.organizationName} (${input.activeProject.organizationSlug})` : input.activeSelection.organizationId,
+    project: input.activeProject ? `${input.activeProject.projectName} (${input.activeProject.projectSlug})` : input.activeSelection.projectId
+  };
+}
+function writeConnectionStart(writeOutput, result) {
+  writeOutput(result.message);
+  writeOutput(
+    `connect session/${result.session} tool/${result.tool} connection/${result.connection}`
+  );
+  writeOutput(`authorization_url ${result.authorizationUrl}`);
+}
+var init_session_tool_connect = __esm({
+  "src/commands/apply/session-tool-connect.ts"() {
+    "use strict";
+    init_browser();
+    init_loopback();
+  }
+});
+
 // src/commands/apply/actions.ts
 async function applyResource(input) {
   if (input.commandOptions.connect && input.commandOptions.json) {
@@ -21870,12 +21866,12 @@ async function applyProjectInput(input) {
       );
     }
     if (input.commandOptions.connect) {
-      for (const item of mcpOAuthToolConnectionsFromApplyRequest(
+      for (const item of mcpOAuthSessionToolConnectionsFromApplyRequest(
         input.request
       )) {
         input.writeOutput(
           style.dim(
-            `would connect tool/${item.tool} connection/${item.connection}`
+            `would connect session/${item.session} tool/${item.tool} connection/${item.connection}`
           )
         );
       }
@@ -21911,12 +21907,13 @@ async function applyProjectInput(input) {
   }
   writeDiagnostics(response.diagnostics, input.writeOutput, style);
   if (input.commandOptions.connect) {
-    const connections = mcpOAuthToolConnectionsFromAppliedResources(resources);
+    const connections = mcpOAuthSessionToolConnectionsFromAppliedResources(resources);
     for (const item of connections) {
-      await connectTool({
+      await connectSessionTool({
         apiBaseUrl: input.commandOptions.apiBaseUrl,
         client: input.client,
         manual: input.commandOptions.manualConnect,
+        session: item.session,
         tool: item.tool,
         writeOutput: input.writeOutput
       });
@@ -21949,9 +21946,9 @@ var init_actions = __esm({
   "src/commands/apply/actions.ts"() {
     "use strict";
     init_style();
-    init_connect();
     init_assets();
     init_files();
+    init_session_tool_connect();
   }
 });
 
@@ -24702,7 +24699,6 @@ function useSwitchProject() {
       for (const queryKey of [
         ["sessions"],
         ["environments"],
-        ["tools"],
         ["service-accounts"],
         ["connections"],
         ["connection-providers"]
@@ -24999,7 +24995,6 @@ var init_queries = __esm({
       environments: (apiUrl) => ["environments", apiUrl],
       identities: (apiUrl) => ["identities", apiUrl],
       sessions: (apiUrl) => ["sessions", apiUrl],
-      tools: (apiUrl) => ["tools", apiUrl],
       projects: (apiUrl) => ["projects", apiUrl],
       serviceAccounts: (apiUrl) => ["service-accounts", apiUrl],
       connections: (apiUrl) => ["connections", apiUrl],
@@ -29620,7 +29615,10 @@ function registerApplyCommands(program, context) {
   program.command("apply").description("Apply Auto resources from a file or the .auto directory.").option("-f, --file <file>", "single resource file to apply instead").option(
     "--directory <directory>",
     "directory containing Auto resource files"
-  ).option("--dry-run", "print the apply plan without changing resources").option("--no-prune", "leave omitted .auto resources unchanged").option("--connect", "connect MCP OAuth tools after applying resources").option(
+  ).option("--dry-run", "print the apply plan without changing resources").option("--no-prune", "leave omitted .auto resources unchanged").option(
+    "--connect",
+    "connect MCP OAuth session tools after applying resources"
+  ).option(
     "--manual-connect",
     "print MCP OAuth authorization URLs instead of opening a browser"
   ).option("--json", "print the apply response as JSON").option("--api-url <url>", "Auto API base URL").option("--api-base-url <url>", "Auto API base URL").action(async (commandOptions) => {
@@ -30897,7 +30895,7 @@ Docs and help: auto --help
 `;
 
 // src/commands/onboard/skill-content.generated.ts
-var onboardingSkillMarkdown = "# Intent\n\nYou are onboarding a user onto auto. Achieve three goals, in roughly this order, as rapidly as the user's pace allows:\n\n1. **Educate** \u2014 teach the user what auto is and how it works, and get them genuinely excited about it.\n2. **Magic moment** \u2014 get a tailor-made, deployed, proactive workflow live that solves a *real* problem for them, and have them witness it working end to end.\n3. **Self-sufficiency** \u2014 leave them with the building blocks (mental model, CI/CD, a self-improvement loop) to iterate on their auto system rapidly and safely on their own.\n\n# Background\n\n**What is auto?**\n\nauto lets you program software factories the same way you program CI/CD.\n\nCompose agents and triggers into workflows using simple YAML files, and deploy them into the cloud on merge.\n\nYou can use auto to build simple (but effective) automations:\n\n- Ticket / feedback triage and resolution\n- Automated incident / bug response\n- Custom tailored code review agents\n\nYou can also use auto to push the frontier of agentic labor:\n\n- Organized fleets of agents on long-horizon tasks\n- Multi-agent autoresearch / optimization loops\n- Agentic BDR and outbound lead engines\n- \u221E more ideas we've yet to dream up\n\nAnything that can be described in a standard operating procedure can be translated into a \"chart\" of agents and triggers in auto \u2014 the only limit is your imagination.\n\n# Reference material\n\nThis skill ships with documentation and worked examples. Read them before you onboard anyone; cite and copy from them as you go.\n\n| Path | What it covers |\n| --- | --- |\n| `docs/index.md` | The mental model: resources, events, triggers, runs. Start here. |\n| `docs/resource-model.md` | The `.auto/` directory, resource envelopes, and `auto apply` semantics. |\n| `docs/sessions-and-triggers.md` | Sessions, the trigger/event/routing vocabulary, filters, and PR checks. |\n| `docs/environments-and-profiles.md` | Sandbox images, setup steps and caching, and reusable agent profiles. |\n| `docs/tools-and-connections.md` | MCP tools, chat tools, provider connections, secrets, and the runtime tool surface agents see. |\n| `docs/cli.md` | The `auto` CLI command reference. |\n| `docs/ci-cd.md` | Service accounts and GitHub Actions for apply-on-merge. |\n| `examples/index.md` | Prose outline of every example \u2014 read this to know what's on the shelf. |\n| `examples/` | Complete, copyable `.auto/` directories \u2014 one per workflow archetype, each with a README explaining the moving parts. |\n\nIf these relative paths are not available (for example this playbook was printed by `auto onboard --agent` rather than installed as a skill directory), fetch the same content from the skills mirror: `npx skills add auto-dot-sh/skills`, or browse https://github.com/auto-dot-sh/skills.\n\n# Operating principles\n\nHold these throughout the onboarding:\n\n- **Trust live command output over this document.** The CLI evolves; run `auto --help` early and whenever in doubt, and when a command's real output disagrees with anything written here, trust the command output over this document and adapt.\n- **Converse, don't lecture.** Short messages, one question at a time, and adapt your vocabulary to the user's technical level. The pitch should take seconds, not paragraphs.\n- **Ask before changing anything outside `.auto/`.** The onboarding's write surface is the `.auto/` directory (plus the CI workflow in Beat 7, which ships as a PR). Any other file in the user's repo gets touched only with their explicit go-ahead.\n- **Warn before browsers open, and surface the link either way.** `auto auth login`, `auto connect`, `auto tools connect`, and `auto sessions connect` open a browser window *and* print the authorization URL. Give a one-sentence heads-up first (\"this will open your browser to install the GitHub App\") so it doesn't feel like something hijacked their machine. If the browser doesn't pop (some environments can't open one), don't leave the user hunting through command output \u2014 repeat the printed authorization URL back to them on its own line as a clickable fallback, one provider at a time, and tell them plainly to click it.\n- **Signal before going quiet.** Deep repo exploration and waiting on async runs both involve silence. Say what you're about to do and roughly how long it will take.\n- **Enlist the user as the second pair of hands.** They trigger the inputs you can't (tagging a bot in Slack, commenting on a PR) and verify the outputs you can't see (a Slack message arriving). Make those asks explicit and specific.\n- **Hand off, don't hint.** When the user needs to do something, spell it out the *first* time \u2014 before they have to ask. Name the exact trigger (which label, which channel, which command), where to click, and what they'll see when it works. \"Label the issue whenever you're ready\" assumes they can see what's in your head and the YAML you wrote; a numbered \"in Linear: create an issue \u2192 add the `auto-triage` label \u2192 that label is the trigger\" does not. If you catch yourself about to post a one-line \"go ahead and \u2026\", expand it.\n- **Set expectations once, then stay quiet.** When you start watching an async run, tell the user up front roughly how long it takes and what \"normal\" looks like (\"the coder run provisions a sandbox first \u2014 expect a quiet couple of minutes\"), then hold until something *they'd care about* changes. Don't narrate every monitor tick or re-report the same event from a second watcher \u2014 a stream of \"still queued / still running / no news\" reads as noise, not reassurance.\n- **Expect trouble; own the troubleshooting.** OAuth flows fail, secrets get mistyped, webhooks misfire. When something breaks, diagnose it with the CLI (`auto runs list`, `auto runs show`, `auto runs conversation`, `auto apply --dry-run`) rather than asking the user to debug.\n- **Asynchronous means asynchronous.** Triggered runs take time to spawn and act. Tell the user when a wait is expected, and tail run state rather than declaring failure early.\n- **Never fabricate success.** Verify each step actually worked (the apply plan, the trigger receipt, the run conversation) before telling the user it did.\n- **Celebrate real wins.** When a workflow completes end to end for the first time, mark the moment \u2014 emoji, a pun, a little flourish. This should feel fun.\n\n# Procedure\n\nWork through the following beats in order. They are a roadmap, not a script \u2014 skip or reorder when the user's situation clearly calls for it (for example, a user who already has an account and connections can jump straight to Beat 3).\n\n## Beat 0: Learn auto\n\nBefore talking to the user, make sure you have a working command of the system: read `docs/index.md` for the mental model, skim the rest of `docs/`, and look through `examples/` to internalize what complete workflows look like. You will be drawing on the examples heavily in Beats 3-5.\n\n## Beat 1: Establish rapport\n\n**Your very first message after launching is a plain-language pitch, not a form.** Two or three sentences on what auto is and where it's valuable, then *one* opening question. Do **not** open with `AskUserQuestion` or a multiple-choice menu \u2014 that skips the *Educate* goal and makes the onboarding feel like a config wizard. Lead with words; reach for `AskUserQuestion` only once you're past the pitch and genuinely offering discrete choices (e.g. the hero workflow in Beat 3).\n\nAfter the pitch, shift into lightly interviewing the user. You want to learn:\n\n1. **Who they are and their professional context.**\n   - Hobbyist, or evaluating auto for a real business?\n   - How technical are they? Engineer, or a more managerial / operational role?\n2. **Where the work that matters most to them happens.**\n   - Do they have a GitHub account / organization? Is there a repo that would make a good home for their auto system \u2014 better yet, are you running inside it right now?\n   - Do they work out of Slack day-to-day, and could they install auto there?\n   - What else is in their operating loop? Linear, Datadog, Sentry, PostHog, Notion, Telegram, internal webhooks, and so on.\n\nKeep this light \u2014 a few questions, not a survey. You're gathering enough signal to propose workflows that will land.\n\n## Beat 2: Get up to speed\n\nIf you are running inside a repo the user has indicated is their focus, tell them you're going to explore it for a few minutes (and that you'll go quiet while a research agent reads the repo) \u2014 then **dispatch a subagent to do the deep read in parallel** rather than reading file-by-file in the main thread. This keeps the conversation responsive and your own context clean, and it forces real exploration instead of leaning on whatever `CLAUDE.md` / `AGENTS.md` happened to load.\n\nSpawn one general-purpose / Explore subagent (or a small fan-out of them for a large monorepo) and have it read **both**:\n\n- **The repo:** what the project does, how the team works (CI, review culture, issue-tracker and chat integrations), the conventions written down in `CLAUDE.md`/`AGENTS.md`/`docs/`, and \u2014 most importantly \u2014 where the recurring, automatable toil is.\n- **This skill's `docs/` and `examples/`**, so the ideas it returns are already expressed in auto's vocabulary (sessions, triggers, profiles) and mapped to a concrete archetype.\n\nHave the subagent return a structured shortlist: for each candidate workflow, a one-line description, the matching archetype, the trigger/event that would fire it, and the *specific evidence in this repo* that the toil is real (a file, a workflow, a documented rule, a past incident). That shortlist is the raw material for Beat 3.\n\nWhen the agent returns, don't just move on \u2014 **surface 1-2 concrete observations to the user** (\"you renumber migrations by hand and a missed renumber caused a prod outage; your `postman/collection.json` updates are marked NOT OPTIONAL\") so they see the exploration paid off and trust that your pitches are grounded in *their* code. If `CLAUDE.md` already told you something, say so and confirm it against the repo rather than presenting it as discovery.\n\n## Beat 3: Present some options\n\nCombine what you know about the user, their goals, and their codebase, and brainstorm at least three workflows they could deploy *today*. Anchor on the archetypes in `examples/index.md` \u2014 code review, issue triage, incident response, chat assistant, scheduled digest, an orchestrated agent fleet, a research/optimization loop, an outbound lead engine \u2014 but tailor each pitch to their actual stack and pain points (\"a review agent that enforces *your* `docs/style.md`\", not \"a code review bot\"). The archetypes are anchors, not a menu: if the user's situation suggests a useful workflow that matches none of them, it is absolutely fair game \u2014 pitch it. Calibrate ambition to the user: the simple automations land the magic moment fastest, while the frontier examples (fleet, research loop) make better second acts unless the user is clearly hungry for them.\n\nPresent the options as a question, one line each on what the workflow would do for them, and let them pick \u2014 including the option to propose their own idea instead. The winner becomes the hero use case.\n\n## Beat 4: Setup & smoke test\n\nGet the user from zero to a deployed, *hollow* version of the hero workflow \u2014 a shell that proves every input and output is wired up before you invest in the real logic. In practice:\n\n1. **Install the CLI**: `npm install -g @autohq/cli` (requires Node 20+). Verify with `auto --version`.\n2. **Sign in**: `auto auth login` (heads-up: opens a browser; account creation happens there too). You're blocked on the user completing the flow either way, so wait for them \u2014 don't busy yourself with other work mid-sign-in, which only confuses things. When you're driving from a terminal with no browser, `auto auth login --device` prints a code the user enters in their browser.\n3. **Create the org and project**: `auto orgs create` / `auto projects create`. Ask the user what they want to name them \u2014 don't pick names for them.\n4. **Connect providers**: `auto connections list --available` to see what's offered, then `auto connect <provider>` for each one the workflow needs (heads-up: browser again). GitHub connects as an App installation; Slack and Linear as OAuth grants.\n5. **Scaffold `.auto/`**: create the directory in their repo and draft the minimal resources \u2014 an environment, a profile, any tool definitions, and a session with the workflow's trigger. Copy from the matching example and strip it down.\n6. **Apply**: `auto apply --dry-run` first, show the user the plan, then `auto apply`.\n\nThen run the smoke test. Its exact shape depends on the use case, but the goal is always the same: verify that the trigger fires and the agent's output surfaces reach the user. A workflow almost always involves some communication channel, so a good smoke test \"breaks the fourth wall\" \u2014 have the hollow agent send the user a hello in Slack (or wherever they live).\n\nEnlist the user, and **hand off, don't hint** (see the operating principle): when you ask them to fire the input only they can fire, give the full, numbered steps the first time \u2014 *which* label on *which* issue, *which* channel to create, the exact command to run, and what they'll see when it lands. Don't post \"go ahead and label the issue\" and assume they know a label is the trigger; that one-liner is what makes a user ask \"wait, what exactly do I do?\". Right after `auto apply`, before you start watching, tell them in plain words what just deployed and what their next action is. Then **set expectations once** \u2014 \"the run takes a minute or two to spawn; I'll tell you when it acts\" \u2014 and watch progress yourself with `auto runs list` and `auto attach <run-id>` (live stream; `auto runs conversation <run-id>` for a snapshot), surfacing only meaningful changes rather than every tick. Troubleshoot until the smoke test passes.\n\nIf a channel install is blocked \u2014 for example the Slack workspace requires admin approval \u2014 don't stall the onboarding on it. Pick an output surface the user can verify without the channel (a PR comment, a GitHub check, the run transcript via `auto runs conversation`), continue the beats, and circle back to realize the channel identity once the approval lands.\n\n## Beat 5: Build the real thing\n\nWith inputs and outputs proven, flesh the workflow out to its real form in `.auto/` \u2014 the full profile instructions, the real prompt, the filters and routing that make it production-shaped. Tell the user what you're changing, then apply it.\n\nTest end to end: trigger the workflow for real, follow the run, and enlist the user again for out-of-band inputs and output verification. Iterate until you've witnessed one complete, successful run of the real workflow.\n\nThen celebrate. This is the magic moment \u2014 act like it. \u{1F389}\n\n## Beat 6: Bring the user up to speed\n\nWalk the user through what you built, piece by piece: which environment, profile, tools, session, and triggers you composed, how an event flows through them to become a run, and where each file lives in `.auto/`. Show short snippets from the actual files rather than describing them abstractly.\n\nThen ask: anything they want to dig into further, or shall we set up CI/CD?\n\n## Beat 7: Set up CI/CD\n\nMake merges to their default branch the deployment mechanism for their auto system (this is the \"program software factories like CI/CD\" promise made literal). Following `docs/ci-cd.md`:\n\n1. Create a service account: have the *user* run `auto service-account create ci-apply --preset applier` in their own terminal (and a second `--preset read-only` account for PR dry-runs if they want plan-on-PR). The token prints exactly once and goes straight into a repo secret \u2014 it must never be pasted into the conversation, and if you run the command yourself it lands in your transcript.\n2. Add a GitHub Actions workflow that runs `auto apply --dry-run` on pull requests and `auto apply` on pushes to the default branch.\n3. Tell the user exactly which secret to create where in their repo settings (the service-account token, shown once at creation).\n4. Open a PR containing `.auto/` and the new workflow, and ask the user to merge it.\n\nWhen the merge lands, verify the apply ran cleanly in Actions, and congratulate them \u2014 their factory now ships itself.\n\n## Beat 8: Set up a self-improvement loop\n\nTell the user there's one last step we've found high-leverage: a workflow that watches their auto system itself \u2014 sweeping recent runs for failures, bottlenecks, and drift, and proposing improvements. Explain that it's just another auto workflow, fully theirs to tune.\n\nIf they're in, copy `examples/self-improvement/` and tailor it to their setup (their channel, their sessions, their cadence). Since CI/CD is now live, do **not** run `auto apply` yourself \u2014 open a PR and let them merge it. That's the new normal, and modeling it is the point.\n\n## Beat 9: Conclusion\n\nTell the user they're all set: a live workflow, CI/CD for their auto system, and a loop that helps it improve. Recap in two or three lines what now exists. Offer to help them build or optimize additional workflows \u2014 Beat 3's runner-up ideas are natural next candidates.\n";
+var onboardingSkillMarkdown = "# Intent\n\nYou are onboarding a user onto auto. Achieve three goals, in roughly this order, as rapidly as the user's pace allows:\n\n1. **Educate** \u2014 teach the user what auto is and how it works, and get them genuinely excited about it.\n2. **Magic moment** \u2014 get a tailor-made, deployed, proactive workflow live that solves a *real* problem for them, and have them witness it working end to end.\n3. **Self-sufficiency** \u2014 leave them with the building blocks (mental model, CI/CD, a self-improvement loop) to iterate on their auto system rapidly and safely on their own.\n\n# Background\n\n**What is auto?**\n\nauto lets you program software factories the same way you program CI/CD.\n\nCompose agents and triggers into workflows using simple YAML files, and deploy them into the cloud on merge.\n\nYou can use auto to build simple (but effective) automations:\n\n- Ticket / feedback triage and resolution\n- Automated incident / bug response\n- Custom tailored code review agents\n\nYou can also use auto to push the frontier of agentic labor:\n\n- Organized fleets of agents on long-horizon tasks\n- Multi-agent autoresearch / optimization loops\n- Agentic BDR and outbound lead engines\n- \u221E more ideas we've yet to dream up\n\nAnything that can be described in a standard operating procedure can be translated into a \"chart\" of agents and triggers in auto \u2014 the only limit is your imagination.\n\n# Reference material\n\nThis skill ships with documentation and worked examples. Read them before you onboard anyone; cite and copy from them as you go.\n\n| Path | What it covers |\n| --- | --- |\n| `docs/index.md` | The mental model: resources, events, triggers, runs. Start here. |\n| `docs/resource-model.md` | The `.auto/` directory, resource envelopes, and `auto apply` semantics. |\n| `docs/sessions-and-triggers.md` | Sessions, the trigger/event/routing vocabulary, filters, and PR checks. |\n| `docs/environments-and-profiles.md` | Sandbox images, setup steps and caching, and reusable agent profiles. |\n| `docs/tools-and-connections.md` | MCP tools, chat tools, provider connections, secrets, and the runtime tool surface agents see. |\n| `docs/cli.md` | The `auto` CLI command reference. |\n| `docs/ci-cd.md` | Service accounts and GitHub Actions for apply-on-merge. |\n| `examples/index.md` | Prose outline of every example \u2014 read this to know what's on the shelf. |\n| `examples/` | Complete, copyable `.auto/` directories \u2014 one per workflow archetype, each with a README explaining the moving parts. |\n\nIf these relative paths are not available (for example this playbook was printed by `auto onboard --agent` rather than installed as a skill directory), fetch the same content from the skills mirror: `npx skills add auto-dot-sh/skills`, or browse https://github.com/auto-dot-sh/skills.\n\n# Operating principles\n\nHold these throughout the onboarding:\n\n- **Trust live command output over this document.** The CLI evolves; run `auto --help` early and whenever in doubt, and when a command's real output disagrees with anything written here, trust the command output over this document and adapt.\n- **Converse, don't lecture.** Short messages, one question at a time, and adapt your vocabulary to the user's technical level. The pitch should take seconds, not paragraphs.\n- **Ask before changing anything outside `.auto/`.** The onboarding's write surface is the `.auto/` directory (plus the CI workflow in Beat 7, which ships as a PR). Any other file in the user's repo gets touched only with their explicit go-ahead.\n- **Warn before browsers open, and surface the link either way.** `auto auth login`, `auto connect`, and `auto sessions connect` open a browser window *and* print the authorization URL. Give a one-sentence heads-up first (\"this will open your browser to install the GitHub App\") so it doesn't feel like something hijacked their machine. If the browser doesn't pop (some environments can't open one), don't leave the user hunting through command output \u2014 repeat the printed authorization URL back to them on its own line as a clickable fallback, one provider at a time, and tell them plainly to click it.\n- **Signal before going quiet.** Deep repo exploration and waiting on async runs both involve silence. Say what you're about to do and roughly how long it will take.\n- **Enlist the user as the second pair of hands.** They trigger the inputs you can't (tagging a bot in Slack, commenting on a PR) and verify the outputs you can't see (a Slack message arriving). Make those asks explicit and specific.\n- **Hand off, don't hint.** When the user needs to do something, spell it out the *first* time \u2014 before they have to ask. Name the exact trigger (which label, which channel, which command), where to click, and what they'll see when it works. \"Label the issue whenever you're ready\" assumes they can see what's in your head and the YAML you wrote; a numbered \"in Linear: create an issue \u2192 add the `auto-triage` label \u2192 that label is the trigger\" does not. If you catch yourself about to post a one-line \"go ahead and \u2026\", expand it.\n- **Set expectations once, then stay quiet.** When you start watching an async run, tell the user up front roughly how long it takes and what \"normal\" looks like (\"the coder run provisions a sandbox first \u2014 expect a quiet couple of minutes\"), then hold until something *they'd care about* changes. Don't narrate every monitor tick or re-report the same event from a second watcher \u2014 a stream of \"still queued / still running / no news\" reads as noise, not reassurance.\n- **Expect trouble; own the troubleshooting.** OAuth flows fail, secrets get mistyped, webhooks misfire. When something breaks, diagnose it with the CLI (`auto runs list`, `auto runs show`, `auto runs conversation`, `auto apply --dry-run`) rather than asking the user to debug.\n- **Asynchronous means asynchronous.** Triggered runs take time to spawn and act. Tell the user when a wait is expected, and tail run state rather than declaring failure early.\n- **Never fabricate success.** Verify each step actually worked (the apply plan, the trigger receipt, the run conversation) before telling the user it did.\n- **Celebrate real wins.** When a workflow completes end to end for the first time, mark the moment \u2014 emoji, a pun, a little flourish. This should feel fun.\n\n# Procedure\n\nWork through the following beats in order. They are a roadmap, not a script \u2014 skip or reorder when the user's situation clearly calls for it (for example, a user who already has an account and connections can jump straight to Beat 3).\n\n## Beat 0: Learn auto\n\nBefore talking to the user, make sure you have a working command of the system: read `docs/index.md` for the mental model, skim the rest of `docs/`, and look through `examples/` to internalize what complete workflows look like. You will be drawing on the examples heavily in Beats 3-5.\n\n## Beat 1: Establish rapport\n\n**Your very first message after launching is a plain-language pitch, not a form.** Two or three sentences on what auto is and where it's valuable, then *one* opening question. Do **not** open with `AskUserQuestion` or a multiple-choice menu \u2014 that skips the *Educate* goal and makes the onboarding feel like a config wizard. Lead with words; reach for `AskUserQuestion` only once you're past the pitch and genuinely offering discrete choices (e.g. the hero workflow in Beat 3).\n\nAfter the pitch, shift into lightly interviewing the user. You want to learn:\n\n1. **Who they are and their professional context.**\n   - Hobbyist, or evaluating auto for a real business?\n   - How technical are they? Engineer, or a more managerial / operational role?\n2. **Where the work that matters most to them happens.**\n   - Do they have a GitHub account / organization? Is there a repo that would make a good home for their auto system \u2014 better yet, are you running inside it right now?\n   - Do they work out of Slack day-to-day, and could they install auto there?\n   - What else is in their operating loop? Linear, Datadog, Sentry, PostHog, Notion, Telegram, internal webhooks, and so on.\n\nKeep this light \u2014 a few questions, not a survey. You're gathering enough signal to propose workflows that will land.\n\n## Beat 2: Get up to speed\n\nIf you are running inside a repo the user has indicated is their focus, tell them you're going to explore it for a few minutes (and that you'll go quiet while a research agent reads the repo) \u2014 then **dispatch a subagent to do the deep read in parallel** rather than reading file-by-file in the main thread. This keeps the conversation responsive and your own context clean, and it forces real exploration instead of leaning on whatever `CLAUDE.md` / `AGENTS.md` happened to load.\n\nSpawn one general-purpose / Explore subagent (or a small fan-out of them for a large monorepo) and have it read **both**:\n\n- **The repo:** what the project does, how the team works (CI, review culture, issue-tracker and chat integrations), the conventions written down in `CLAUDE.md`/`AGENTS.md`/`docs/`, and \u2014 most importantly \u2014 where the recurring, automatable toil is.\n- **This skill's `docs/` and `examples/`**, so the ideas it returns are already expressed in auto's vocabulary (sessions, triggers, profiles) and mapped to a concrete archetype.\n\nHave the subagent return a structured shortlist: for each candidate workflow, a one-line description, the matching archetype, the trigger/event that would fire it, and the *specific evidence in this repo* that the toil is real (a file, a workflow, a documented rule, a past incident). That shortlist is the raw material for Beat 3.\n\nWhen the agent returns, don't just move on \u2014 **surface 1-2 concrete observations to the user** (\"you renumber migrations by hand and a missed renumber caused a prod outage; your `postman/collection.json` updates are marked NOT OPTIONAL\") so they see the exploration paid off and trust that your pitches are grounded in *their* code. If `CLAUDE.md` already told you something, say so and confirm it against the repo rather than presenting it as discovery.\n\n## Beat 3: Present some options\n\nCombine what you know about the user, their goals, and their codebase, and brainstorm at least three workflows they could deploy *today*. Anchor on the archetypes in `examples/index.md` \u2014 code review, issue triage, incident response, chat assistant, scheduled digest, an orchestrated agent fleet, a research/optimization loop, an outbound lead engine \u2014 but tailor each pitch to their actual stack and pain points (\"a review agent that enforces *your* `docs/style.md`\", not \"a code review bot\"). The archetypes are anchors, not a menu: if the user's situation suggests a useful workflow that matches none of them, it is absolutely fair game \u2014 pitch it. Calibrate ambition to the user: the simple automations land the magic moment fastest, while the frontier examples (fleet, research loop) make better second acts unless the user is clearly hungry for them.\n\nPresent the options as a question, one line each on what the workflow would do for them, and let them pick \u2014 including the option to propose their own idea instead. The winner becomes the hero use case.\n\n## Beat 4: Setup & smoke test\n\nGet the user from zero to a deployed, *hollow* version of the hero workflow \u2014 a shell that proves every input and output is wired up before you invest in the real logic. In practice:\n\n1. **Install the CLI**: `npm install -g @autohq/cli` (requires Node 20+). Verify with `auto --version`.\n2. **Sign in**: `auto auth login` (heads-up: opens a browser; account creation happens there too). You're blocked on the user completing the flow either way, so wait for them \u2014 don't busy yourself with other work mid-sign-in, which only confuses things. When you're driving from a terminal with no browser, `auto auth login --device` prints a code the user enters in their browser.\n3. **Create the org and project**: `auto orgs create` / `auto projects create`. Ask the user what they want to name them \u2014 don't pick names for them.\n4. **Connect providers**: `auto connections list --available` to see what's offered, then `auto connect <provider>` for each one the workflow needs (heads-up: browser again). GitHub connects as an App installation; Slack and Linear as OAuth grants.\n5. **Scaffold `.auto/`**: create the directory in their repo and draft the minimal resources \u2014 an environment, a profile, any tool definitions, and a session with the workflow's trigger. Copy from the matching example and strip it down.\n6. **Apply**: `auto apply --dry-run` first, show the user the plan, then `auto apply`.\n\nThen run the smoke test. Its exact shape depends on the use case, but the goal is always the same: verify that the trigger fires and the agent's output surfaces reach the user. A workflow almost always involves some communication channel, so a good smoke test \"breaks the fourth wall\" \u2014 have the hollow agent send the user a hello in Slack (or wherever they live).\n\nEnlist the user, and **hand off, don't hint** (see the operating principle): when you ask them to fire the input only they can fire, give the full, numbered steps the first time \u2014 *which* label on *which* issue, *which* channel to create, the exact command to run, and what they'll see when it lands. Don't post \"go ahead and label the issue\" and assume they know a label is the trigger; that one-liner is what makes a user ask \"wait, what exactly do I do?\". Right after `auto apply`, before you start watching, tell them in plain words what just deployed and what their next action is. Then **set expectations once** \u2014 \"the run takes a minute or two to spawn; I'll tell you when it acts\" \u2014 and watch progress yourself with `auto runs list` and `auto attach <run-id>` (live stream; `auto runs conversation <run-id>` for a snapshot), surfacing only meaningful changes rather than every tick. Troubleshoot until the smoke test passes.\n\nIf a channel install is blocked \u2014 for example the Slack workspace requires admin approval \u2014 don't stall the onboarding on it. Pick an output surface the user can verify without the channel (a PR comment, a GitHub check, the run transcript via `auto runs conversation`), continue the beats, and circle back to realize the channel identity once the approval lands.\n\n## Beat 5: Build the real thing\n\nWith inputs and outputs proven, flesh the workflow out to its real form in `.auto/` \u2014 the full profile instructions, the real prompt, the filters and routing that make it production-shaped. Tell the user what you're changing, then apply it.\n\nTest end to end: trigger the workflow for real, follow the run, and enlist the user again for out-of-band inputs and output verification. Iterate until you've witnessed one complete, successful run of the real workflow.\n\nThen celebrate. This is the magic moment \u2014 act like it. \u{1F389}\n\n## Beat 6: Bring the user up to speed\n\nWalk the user through what you built, piece by piece: which environment, profile, tools, session, and triggers you composed, how an event flows through them to become a run, and where each file lives in `.auto/`. Show short snippets from the actual files rather than describing them abstractly.\n\nThen ask: anything they want to dig into further, or shall we set up CI/CD?\n\n## Beat 7: Set up CI/CD\n\nMake merges to their default branch the deployment mechanism for their auto system (this is the \"program software factories like CI/CD\" promise made literal). Following `docs/ci-cd.md`:\n\n1. Create a service account: have the *user* run `auto service-account create ci-apply --preset applier` in their own terminal (and a second `--preset read-only` account for PR dry-runs if they want plan-on-PR). The token prints exactly once and goes straight into a repo secret \u2014 it must never be pasted into the conversation, and if you run the command yourself it lands in your transcript.\n2. Add a GitHub Actions workflow that runs `auto apply --dry-run` on pull requests and `auto apply` on pushes to the default branch.\n3. Tell the user exactly which secret to create where in their repo settings (the service-account token, shown once at creation).\n4. Open a PR containing `.auto/` and the new workflow, and ask the user to merge it.\n\nWhen the merge lands, verify the apply ran cleanly in Actions, and congratulate them \u2014 their factory now ships itself.\n\n## Beat 8: Set up a self-improvement loop\n\nTell the user there's one last step we've found high-leverage: a workflow that watches their auto system itself \u2014 sweeping recent runs for failures, bottlenecks, and drift, and proposing improvements. Explain that it's just another auto workflow, fully theirs to tune.\n\nIf they're in, copy `examples/self-improvement/` and tailor it to their setup (their channel, their sessions, their cadence). Since CI/CD is now live, do **not** run `auto apply` yourself \u2014 open a PR and let them merge it. That's the new normal, and modeling it is the point.\n\n## Beat 9: Conclusion\n\nTell the user they're all set: a live workflow, CI/CD for their auto system, and a loop that helps it improve. Recap in two or three lines what now exists. Offer to help them build or optimize additional workflows \u2014 Beat 3's runner-up ideas are natural next candidates.\n";
 
 // src/commands/onboard/commands.ts
 function registerOnboardCommands(program, context) {
@@ -32971,21 +32969,6 @@ function registerSessionCommands(program, context) {
   });
 }
 
-// src/commands/tools/commands.ts
-init_connect();
-function registerToolCommands(program, context) {
-  const tools = program.command("tools").description("Manage Tool resources.");
-  tools.command("connect").description("Start an OAuth connection flow for a remote MCP Tool.").argument("<tool>", "tool resource name").option("--manual", "print the authorization URL without opening a browser").option("--api-url <url>", "Auto API base URL").option("--api-base-url <url>", "Auto API base URL").action(async (tool, commandOptions) => {
-    await connectTool({
-      tool,
-      apiBaseUrl: apiUrlFromOptions(context, commandOptions),
-      manual: commandOptions.manual,
-      client: createContextApiClient(context),
-      writeOutput: context.writeOutput
-    });
-  });
-}
-
 // src/cli/program.ts
 init_path();
 init_profiles();
@@ -33153,7 +33136,6 @@ function createProgram(options = {}) {
   registerProjectCommands(program, context);
   registerConnectionCommands(program, context);
   registerSecretCommands(program, context);
-  registerToolCommands(program, context);
   registerSessionCommands(program, context);
   registerRunCommands(program, context);
   return program;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.131",
+  "version": "0.1.133",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"