3 files changed, 17 insertions, 6 deletions
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 053aeabc..248dd9e3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "@google/gemini-code",
+  "name": "@gemini-code/cli",
   "version": "1.0.0",
   "description": "Gemini Code CLI",
   "type": "module",
-  "main": "gemini.js",
+  "main": "src/gemini.js",
   "scripts": {
     "build": "tsc && cp package.json README.md ../../LICENSE dist/ && touch dist/.last_build",
     "start": "node dist/gemini.js",
@@ -16,6 +16,7 @@
   ],
   "dependencies": {
     "@google/genai": "^0.8.0",
+    "@gemini-code/server": "1.0.0",
     "diff": "^7.0.0",
     "dotenv": "^16.4.7",
     "fast-glob": "^3.3.3",
diff --git a/packages/cli/src/gemini.ts b/packages/cli/src/gemini.ts
index f6de65c3..6c4fe3ae 100644
--- a/packages/cli/src/gemini.ts
+++ b/packages/cli/src/gemini.ts
@@ -12,6 +12,10 @@ import { WriteFileTool } from './tools/write-file.tool.js';
 import { WebFetchTool } from './tools/web-fetch.tool.js';
 import { globalConfig } from './config/config.js';
 
+// TODO(b/411707095): remove. left here as an example of how to pull in inter-package deps
+import { helloServer } from '@gemini-code/server'
+helloServer();
+
 async function main() {
   // Configure tools
   registerTools(globalConfig.getTargetDir());
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 0ef2b74f..1571716d 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,13 +1,19 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
+    "outDir": "dist",
+    "rootDir": ".",
     "jsx": "react",
     "lib": ["DOM", "DOM.Iterable", "ES2020"],
     "module": "Node16",
-    "target": "ES2020"
+    "target": "ES2020",
+    "paths": {
+      "@gemini-code/*": ["./packages/*"]
+    }
   },
   "exclude": ["node_modules", "dist"],
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    { "path": "../server" },
+  ]
 }