From 2504a264dba8527bf7d167c633291d452236a5c4 Mon Sep 17 00:00:00 2001
From: Sehoon Shon <sshon@google.com>
Date: Tue, 21 Apr 2026 16:56:01 -0700
Subject: [PATCH] fix(cli): add folder trust check for /note and fix subcommand
 collision

---
 packages/cli/src/services/BuiltinCommandLoader.ts | 5 +++--
 packages/cli/src/ui/commands/noteCommand.ts       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/services/BuiltinCommandLoader.ts b/packages/cli/src/services/BuiltinCommandLoader.ts
index 4b390e8af6..7127e23329 100644
--- a/packages/cli/src/services/BuiltinCommandLoader.ts
+++ b/packages/cli/src/services/BuiltinCommandLoader.ts
@@ -185,8 +185,9 @@ export class BuiltinCommandLoader implements ICommandLoader {
         : [mcpCommand]),
       memoryCommand,
       modelCommand,
-      noteCommand,
-      ...(this.config?.getFolderTrust() ? [permissionsCommand] : []),
+      ...(this.config?.getFolderTrust()
+        ? [permissionsCommand, noteCommand]
+        : []),
       ...(this.config?.isPlanEnabled() ? [planCommand] : []),
       policiesCommand,
       privacyCommand,
diff --git a/packages/cli/src/ui/commands/noteCommand.ts b/packages/cli/src/ui/commands/noteCommand.ts
index 4c56de5bbb..f7dc7df3ad 100644
--- a/packages/cli/src/ui/commands/noteCommand.ts
+++ b/packages/cli/src/ui/commands/noteCommand.ts
@@ -19,6 +19,7 @@ export const noteCommand: SlashCommand = {
       description: 'View the current workspace notes',
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
+      takesArgs: false,
       action: async () => {
         const workspaceRoot = process.cwd();
         const notesFile = path.join(workspaceRoot, 'notes.md');