diff --git a/README.md b/README.md
index 337bf75..eb50827 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,13 @@ mycoder -f prompt.txt
 
 # Disable user prompts for fully automated sessions
 mycoder --enableUserPrompt false "Generate a basic Express.js server"
+# or using the alias
+mycoder --userPrompt false "Generate a basic Express.js server"
 
-# Enable GitHub mode
+# Enable GitHub mode via CLI option (overrides config)
+mycoder --githubMode "Work with GitHub issues and PRs"
+
+# Enable GitHub mode via config
 mycoder config set githubMode true
 ```
 
diff --git a/packages/cli/src/commands/$default.ts b/packages/cli/src/commands/$default.ts
index 6b4d1a0..8bf9a45 100644
--- a/packages/cli/src/commands/$default.ts
+++ b/packages/cli/src/commands/$default.ts
@@ -172,7 +172,11 @@ export const command: CommandModule<SharedOptions, DefaultArgs> = {
 
       const tools = getTools({
         enableUserPrompt:
-          argv.enableUserPrompt !== undefined ? argv.enableUserPrompt : true,
+          argv.userPrompt !== undefined
+            ? argv.userPrompt
+            : argv.enableUserPrompt !== undefined
+              ? argv.enableUserPrompt
+              : true,
       });
 
       // Error handling
@@ -209,12 +213,16 @@ export const command: CommandModule<SharedOptions, DefaultArgs> = {
         pageFilter: argv.pageFilter ?? config.pageFilter,
         workingDirectory: '.',
         tokenTracker,
-        githubMode: config.githubMode,
+        githubMode: argv.githubMode ?? config.githubMode,
         customPrompt: config.customPrompt,
         tokenCache:
           argv.tokenCache !== undefined ? argv.tokenCache : config.tokenCache,
         enableUserPrompt:
-          argv.enableUserPrompt !== undefined ? argv.enableUserPrompt : true,
+          argv.userPrompt !== undefined
+            ? argv.userPrompt
+            : argv.enableUserPrompt !== undefined
+              ? argv.enableUserPrompt
+              : true,
       });
 
       const output =
diff --git a/packages/cli/src/options.ts b/packages/cli/src/options.ts
index e865bc9..f5d928e 100644
--- a/packages/cli/src/options.ts
+++ b/packages/cli/src/options.ts
@@ -17,6 +17,8 @@ export type SharedOptions = {
   readonly profile?: boolean;
   readonly tokenCache?: boolean;
   readonly enableUserPrompt?: boolean;
+  readonly userPrompt?: boolean;
+  readonly githubMode?: boolean;
 };
 
 export const sharedOptions = {
@@ -109,4 +111,15 @@ export const sharedOptions = {
       'Enable or disable the userPrompt tool (disable for fully automated sessions)',
     default: true,
   } as const,
+  userPrompt: {
+    type: 'boolean',
+    description:
+      'Alias for enableUserPrompt: enable or disable the userPrompt tool',
+    default: true,
+  } as const,
+  githubMode: {
+    type: 'boolean',
+    description: 'Enable GitHub mode for working with issues and PRs',
+    default: false,
+  } as const,
 };