diff --git a/packages/cli/__tests__/commands/dashboard.test.ts b/packages/cli/__tests__/commands/dashboard.test.ts
index c776f7820..f96396e88 100644
--- a/packages/cli/__tests__/commands/dashboard.test.ts
+++ b/packages/cli/__tests__/commands/dashboard.test.ts
@@ -12,9 +12,9 @@ vi.mock("../../src/lib/shell.js", () => ({
   exec: mockExec,
 }));
 
-vi.mock("@composio/ao-core", async (importOriginal) => {
+vi.mock("@aoagents/ao-core", async (importOriginal) => {
   // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  const actual = await importOriginal<typeof import("@composio/ao-core")>();
+  const actual = await importOriginal<typeof import("@aoagents/ao-core")>();
   return {
     ...actual,
     findPidByPort: mockFindPidByPort,
diff --git a/packages/cli/__tests__/lib/script-runner.test.ts b/packages/cli/__tests__/lib/script-runner.test.ts
index 45215e57e..5777dc660 100644
--- a/packages/cli/__tests__/lib/script-runner.test.ts
+++ b/packages/cli/__tests__/lib/script-runner.test.ts
@@ -22,12 +22,12 @@ vi.mock("node:url", () => ({
   fileURLToPath: vi.fn(() => "/mock/cli/src/lib/script-runner.ts"),
 }));
 
-vi.mock("@composio/ao-core", () => ({
+vi.mock("@aoagents/ao-core", () => ({
   isWindows: vi.fn(() => false),
 }));
 
 import * as childProcess from "node:child_process";
-import * as core from "@composio/ao-core";
+import * as core from "@aoagents/ao-core";
 import { runRepoScript } from "../../src/lib/script-runner.js";
 
 const mockIsWindows = core.isWindows as ReturnType<typeof vi.fn>;
diff --git a/packages/cli/__tests__/lib/shell.test.ts b/packages/cli/__tests__/lib/shell.test.ts
index ae1579973..827e7830f 100644
--- a/packages/cli/__tests__/lib/shell.test.ts
+++ b/packages/cli/__tests__/lib/shell.test.ts
@@ -11,7 +11,7 @@ vi.mock("node:child_process", () => ({
   execFile: mockExecFile,
 }));
 
-vi.mock("@composio/ao-core", () => ({
+vi.mock("@aoagents/ao-core", () => ({
   killProcessTree: mockKillProcessTree,
 }));
 
diff --git a/packages/cli/__tests__/lifecycle-service.test.ts b/packages/cli/__tests__/lifecycle-service.test.ts
index 945885247..d0fa369f9 100644
--- a/packages/cli/__tests__/lifecycle-service.test.ts
+++ b/packages/cli/__tests__/lifecycle-service.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import * as fs from "node:fs";
-import * as aoCore from "@composio/ao-core";
-import type { OrchestratorConfig } from "@composio/ao-core";
+import * as aoCore from "@aoagents/ao-core";
+import type { OrchestratorConfig } from "@aoagents/ao-core";
 
 vi.mock("node:fs", () => ({
   existsSync: vi.fn(),
@@ -13,9 +13,9 @@ vi.mock("node:fs", () => ({
   closeSync: vi.fn(),
 }));
 
-vi.mock("@composio/ao-core", async (importOriginal) => {
+vi.mock("@aoagents/ao-core", async (importOriginal) => {
   // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  const actual = await importOriginal<typeof import("@composio/ao-core")>();
+  const actual = await importOriginal<typeof import("@aoagents/ao-core")>();
   return {
     ...actual,
     getProjectBaseDir: vi.fn(() => "/mock/project"),
diff --git a/packages/cli/src/commands/dashboard.ts b/packages/cli/src/commands/dashboard.ts
index 1fa600384..82f2828f8 100644
--- a/packages/cli/src/commands/dashboard.ts
+++ b/packages/cli/src/commands/dashboard.ts
@@ -2,7 +2,7 @@ import { spawn } from "node:child_process";
 import { resolve } from "node:path";
 import chalk from "chalk";
 import type { Command } from "commander";
-import { findPidByPort, isWindows, killProcessTree, loadConfig } from "@composio/ao-core";
+import { findPidByPort, isWindows, killProcessTree, loadConfig } from "@aoagents/ao-core";
 import { findWebDir, buildDashboardEnv, waitForPortAndOpen } from "../lib/web-dir.js";
 import { forwardSignalsToChild } from "../lib/shell.js";
 import {
diff --git a/packages/cli/src/lib/dashboard-rebuild.ts b/packages/cli/src/lib/dashboard-rebuild.ts
index 98cb367dd..8684e9710 100644
--- a/packages/cli/src/lib/dashboard-rebuild.ts
+++ b/packages/cli/src/lib/dashboard-rebuild.ts
@@ -6,7 +6,7 @@
 import { resolve } from "node:path";
 import { existsSync, rmSync } from "node:fs";
 import ora from "ora";
-import { findPidByPort } from "@composio/ao-core";
+import { findPidByPort } from "@aoagents/ao-core";
 import { exec } from "./shell.js";
 
 /**
diff --git a/packages/cli/src/lib/lifecycle-service.ts b/packages/cli/src/lib/lifecycle-service.ts
index 95c0968bf..b08601fd7 100644
--- a/packages/cli/src/lib/lifecycle-service.ts
+++ b/packages/cli/src/lib/lifecycle-service.ts
@@ -9,7 +9,7 @@ import {
   writeFileSync,
 } from "node:fs";
 import { join } from "node:path";
-import { getProjectBaseDir, isWindows, killProcessTree, type OrchestratorConfig } from "@composio/ao-core";
+import { getProjectBaseDir, isWindows, killProcessTree, type OrchestratorConfig } from "@aoagents/ao-core";
 
 const LIFECYCLE_PID_FILE = "lifecycle-worker.pid";
 const LIFECYCLE_LOG_FILE = "lifecycle-worker.log";
diff --git a/packages/cli/src/lib/script-runner.ts b/packages/cli/src/lib/script-runner.ts
index afe0c2f1d..22cf8c303 100644
--- a/packages/cli/src/lib/script-runner.ts
+++ b/packages/cli/src/lib/script-runner.ts
@@ -2,7 +2,7 @@ import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { isWindows } from "@composio/ao-core";
+import { isWindows } from "@aoagents/ao-core";
 
 const DEFAULT_REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "../../../../");
 
diff --git a/packages/cli/src/lib/shell.ts b/packages/cli/src/lib/shell.ts
index fba9c15a2..84bb459b4 100644
--- a/packages/cli/src/lib/shell.ts
+++ b/packages/cli/src/lib/shell.ts
@@ -1,6 +1,6 @@
 import { type ChildProcess, execFile as execFileCb } from "node:child_process";
 import { promisify } from "node:util";
-import { killProcessTree } from "@composio/ao-core";
+import { killProcessTree } from "@aoagents/ao-core";
 
 const execFileAsync = promisify(execFileCb);
 
diff --git a/packages/plugins/agent-claude-code/src/index.test.ts b/packages/plugins/agent-claude-code/src/index.test.ts
index 0e25d12ea..93838fc99 100644
--- a/packages/plugins/agent-claude-code/src/index.test.ts
+++ b/packages/plugins/agent-claude-code/src/index.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import type { Session, RuntimeHandle, AgentLaunchConfig, WorkspaceHooksConfig } from "@composio/ao-core";
+import type { Session, RuntimeHandle, AgentLaunchConfig, WorkspaceHooksConfig } from "@aoagents/ao-core";
 
 // ---------------------------------------------------------------------------
 // Hoisted mocks — available inside vi.mock factories
@@ -55,7 +55,7 @@ vi.mock("node:os", () => ({
   homedir: mockHomedir,
 }));
 
-vi.mock("@composio/ao-core", async (importOriginal) => {
+vi.mock("@aoagents/ao-core", async (importOriginal) => {
   const actual = (await importOriginal()) as Record<string, unknown>;
   return {
     ...actual,
diff --git a/packages/plugins/runtime-process/src/__tests__/index.test.ts b/packages/plugins/runtime-process/src/__tests__/index.test.ts
index 205141939..18525627f 100644
--- a/packages/plugins/runtime-process/src/__tests__/index.test.ts
+++ b/packages/plugins/runtime-process/src/__tests__/index.test.ts
@@ -21,9 +21,9 @@ vi.mock("node:child_process", async (importOriginal) => {
   };
 });
 
-vi.mock("@composio/ao-core", async (importOriginal) => {
+vi.mock("@aoagents/ao-core", async (importOriginal) => {
   // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  const actual = await importOriginal<typeof import("@composio/ao-core")>();
+  const actual = await importOriginal<typeof import("@aoagents/ao-core")>();
   return {
     ...actual,
     getShell: mockGetShell,
diff --git a/packages/plugins/runtime-process/src/index.ts b/packages/plugins/runtime-process/src/index.ts
index 4eb32aa8f..d17515cfc 100644
--- a/packages/plugins/runtime-process/src/index.ts
+++ b/packages/plugins/runtime-process/src/index.ts
@@ -9,7 +9,7 @@ import {
   type RuntimeHandle,
   type RuntimeMetrics,
   type AttachInfo,
-} from "@composio/ao-core";
+} from "@aoagents/ao-core";
 
 export const manifest = {
   name: "process",
diff --git a/packages/plugins/workspace-clone/src/__tests__/index.test.ts b/packages/plugins/workspace-clone/src/__tests__/index.test.ts
index d38b520ba..c67ff6c8a 100644
--- a/packages/plugins/workspace-clone/src/__tests__/index.test.ts
+++ b/packages/plugins/workspace-clone/src/__tests__/index.test.ts
@@ -10,7 +10,7 @@ vi.mock("node:child_process", () => {
   return { execFile: mockExecFile };
 });
 
-vi.mock("@composio/ao-core", () => ({
+vi.mock("@aoagents/ao-core", () => ({
   getShell: vi.fn(() => ({ cmd: "sh", args: (c: string) => ["-c", c] })),
 }));
 
@@ -56,7 +56,7 @@ function makeProject(overrides?: Partial<ProjectConfig>): ProjectConfig {
 
 // Import after mocks are set up
 import clonePlugin, { manifest, create } from "../index.js";
-import * as core from "@composio/ao-core";
+import * as core from "@aoagents/ao-core";
 
 const mockGetShell = core.getShell as ReturnType<typeof vi.fn>;
 
diff --git a/packages/plugins/workspace-clone/src/index.ts b/packages/plugins/workspace-clone/src/index.ts
index b69813162..075fc3119 100644
--- a/packages/plugins/workspace-clone/src/index.ts
+++ b/packages/plugins/workspace-clone/src/index.ts
@@ -3,7 +3,7 @@ import { promisify } from "node:util";
 import { existsSync, rmSync, mkdirSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { getShell, type PluginModule, type Workspace, type WorkspaceCreateConfig, type WorkspaceInfo, type ProjectConfig } from "@composio/ao-core";
+import { getShell, type PluginModule, type Workspace, type WorkspaceCreateConfig, type WorkspaceInfo, type ProjectConfig } from "@aoagents/ao-core";
 
 const execFileAsync = promisify(execFile);
 
diff --git a/packages/plugins/workspace-worktree/src/__tests__/index.test.ts b/packages/plugins/workspace-worktree/src/__tests__/index.test.ts
index 398789ed8..e9a273a3b 100644
--- a/packages/plugins/workspace-worktree/src/__tests__/index.test.ts
+++ b/packages/plugins/workspace-worktree/src/__tests__/index.test.ts
@@ -22,7 +22,7 @@ vi.mock("node:fs", () => ({
   readdirSync: vi.fn(),
 }));
 
-vi.mock("@composio/ao-core", () => ({
+vi.mock("@aoagents/ao-core", () => ({
   getShell: vi.fn(() => ({ cmd: "sh", args: (c: string) => ["-c", c] })),
   isWindows: vi.fn(() => false),
 }));
@@ -37,7 +37,7 @@ vi.mock("node:os", () => ({
 
 import * as childProcess from "node:child_process";
 import { existsSync, lstatSync, symlinkSync, cpSync, rmSync, mkdirSync, readdirSync } from "node:fs";
-import * as core from "@composio/ao-core";
+import * as core from "@aoagents/ao-core";
 import { create, manifest } from "../index.js";
 
 // ---------------------------------------------------------------------------
diff --git a/packages/plugins/workspace-worktree/src/index.ts b/packages/plugins/workspace-worktree/src/index.ts
index 78c78dc02..cf4f0a4fb 100644
--- a/packages/plugins/workspace-worktree/src/index.ts
+++ b/packages/plugins/workspace-worktree/src/index.ts
@@ -4,7 +4,7 @@ import * as fs from "node:fs";
 import { existsSync, lstatSync, symlinkSync, rmSync, mkdirSync, readdirSync } from "node:fs";
 import { join, resolve, basename, dirname, sep } from "node:path";
 import { homedir } from "node:os";
-import { getShell, isWindows, type PluginModule, type Workspace, type WorkspaceCreateConfig, type WorkspaceInfo, type ProjectConfig } from "@composio/ao-core";
+import { getShell, isWindows, type PluginModule, type Workspace, type WorkspaceCreateConfig, type WorkspaceInfo, type ProjectConfig } from "@aoagents/ao-core";
 
 /** Timeout for git commands (30 seconds) */
 const GIT_TIMEOUT = 30_000;