diff --git a/AgentCompany-New/src/main/services/chat-service.ts b/AgentCompany-New/src/main/services/chat-service.ts
index 3b9c8c51..370d87f0 100644
--- a/AgentCompany-New/src/main/services/chat-service.ts
+++ b/AgentCompany-New/src/main/services/chat-service.ts
@@ -18,7 +18,15 @@ import { ChatMessageMutationService } from "./chat-message-mutation-service";
 import { recordChatMentions, resolveChatMentions, type ResolvedMention } from "./chat-mentions";
 import { FileHandoffService, type FileHandoffAttachment } from "./file-handoff-service";
 
-const SPACE_TYPES = new Set<CreateChatSpaceInput["spaceType"]>(["company", "department", "project", "direct"]);
+const SPACE_TYPES = new Set<CreateChatSpaceInput["spaceType"]>([
+  "company",
+  "division",
+  "department",
+  "project",
+  "pod",
+  "ad_hoc",
+  "direct",
+]);
 const SPACE_VISIBILITIES = new Set<CreateChatSpaceInput["visibility"]>(["workspace", "restricted"]);
 const RETENTION_POLICIES = new Set(["standard_365d", "restricted_365d"]);
 
diff --git a/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx b/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx
index b5893e95..7ce26917 100644
--- a/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx
+++ b/AgentCompany-New/src/renderer/src/pages/ChatPage.tsx
@@ -14,7 +14,7 @@ import { ROLE_KEY } from "../../../shared/domain";
 import type { PageProps } from "./types";
 import { activeOrgId, requireActiveEmployee } from "./types";
 
-type SpaceType = "company" | "department" | "project" | "direct";
+type SpaceType = "company" | "division" | "department" | "project" | "pod" | "ad_hoc" | "direct";
 type Visibility = "workspace" | "restricted";
 
 function value(form: FormData, key: string): string {
@@ -274,8 +274,11 @@ export function ChatPage({ snapshot, actions }: PageProps) {
         <Field label="Type">
           <select className="input" name="spaceType" defaultValue="project">
             <option value="company">Company</option>
+            <option value="division">Division</option>
             <option value="department">Department</option>
             <option value="project">Project</option>
+            <option value="pod">Pod</option>
+            <option value="ad_hoc">Ad-hoc</option>
             <option value="direct">Direct</option>
           </select>
         </Field>
diff --git a/AgentCompany-New/src/shared/commands.ts b/AgentCompany-New/src/shared/commands.ts
index 3784a4a0..e824efe2 100644
--- a/AgentCompany-New/src/shared/commands.ts
+++ b/AgentCompany-New/src/shared/commands.ts
@@ -140,7 +140,7 @@ export interface DeleteMessageInput {
 
 export interface CreateChatSpaceInput {
   orgId: string;
-  spaceType: "company" | "department" | "project" | "direct";
+  spaceType: "company" | "division" | "department" | "project" | "pod" | "ad_hoc" | "direct";
   name: string;
   topic: string;
   visibility: "workspace" | "restricted";