revisions

Reviewed-on: kjannette/deClawed-Assity-Kitty#5

.gitignore

@@ -1,11 +1,14 @@
 node_modules/
 build/
 
-# OAuth secrets
+# OAuth secrets (inside accountsAndCredentials/, example files are NOT ignored)
-credentials.json
+accountsAndCredentials/credentials.json
-credentials.*
+accountsAndCredentials/accounts.json
-token*.json
+accountsAndCredentials/token*.json
-accounts.json
+accountsAndCredentials/token.json.bak
+!accountsAndCredentials/*.example.json
 
 # Runtime output
 mailSummaries/
+
+// revised Aug 31

README.md

@@ -2,119 +2,182 @@
 <img src="assets/logo.png" alt="Declawed" width="120" />
 </p>
 
+
 # Declawed: your kuddly assisty-kitty
 
-# Inbox brimming with stank-ass algorithmically-generated turds?
 
-# (Cat) nip that sh*t in the bud!!!
+Inbox brimming with stank?  Wanna cut the crap and get the messaging that matters into calendars, Atlassian, Jira, Asana, Google Calendar/Sheets (etc.) ... in two clicks?  (Cat) nip slop in the bud with Assisty-Kitty!!
 
-###  Declawed is a configurable, prompt purrr-fectable LLM mail management assisty-kitty.
-###  Puuurfect for tedious daily sorts/classification/responses
-###  Cuts down on the frustartion of feeling like you'll never get your paws on that catnip-stuffed mouse dangling from the string.
 
-# Privacy
+# The "why":
 
-# More than the blue-plate crustacean
 
-A local Model Context Protocol (MCP) server integrates with an LLM API you choose -- both of which offer greater ops and privacy control and transparency.
+### Eliminates that frustrating feeling you'll never get your paws around the dangling, catnip-stuffed mouse through haunch-high mail from list you're never signed up for or were re-sold to from ones you have, bot-generated marketing slop, and, of course, nigerians princes that need help claim their lottery jackpot.
 
-# Avoid flakey (molty?) black box installs.
 
-Billed as QUICK AND EASY! ...loaded with  more Trojans than an Olympic Village.
+"deClawed" because: no one should be beholden to one LLM api or local model.  Have you seen that baddie Kimi K3? 
-... Silent processes: data harvest phone-homes, behavioral analytic reporting, telemetry backdoors - all the nasties crawling the dark detritus.  You know lobsters eat poop, right?
 
-# Declawed: **actually** easy
 
-## Stop drilling byzantine menus in mail, scehduling and sheets pltforms to 1. configure filters that don't even work 2. change every three months
+The platform princes are rent extractors.
 
-## Short, declarative prompts are teh equivelent of wrapping slop, bulk-mail's feet in tin foil and tossing it in the bathtub.
 
-###  Prompts are discerning, unlike filters.  For exaple, they keep the gold and bin the junk in forums/feeds where solid-gold insights are only 10% of the signal/noise.
+Open weights are heavy weight champions.
-### With refinement, prompting runs auto: cleaning that stank litter(in)box before you get a whiff.
+
-### Morning greets you with a fresh, spring-meadow aroma of opportunities and insights -- not an avalanche of turds -- like its f*cxing 1998 again.
+
+# The "how"
+
+
+Because It's soooo easy.
+deClawed is configurable, prompt purrr-fectable, LLM-driven mail and task automation for anyone that can cut n' paste a few CLI commands and can type in short declarative sentences.
+More private than other options (not purrfect *yet* - but privacy is our number one goal with every release).
+More accurate actions/results (read on).
+
+
+# Privacy: more than the blue-plate crustacean
+
+
+Your own local Model Context Protocol (MCP) server integrates with your preferred LLM API. Each step in the install, and setup offers greater control, and transparency.  Permissions are 100% configurable.
+
+
+Escape black-box installs stocked with more Trojans than an Olympic Village - silent/dark processes, data harvesting phone-homes, behavioral analytics, telemetry backdoors, corporate surveillance - the nasties lurking in the dark discoverable only by secops edgelords that are masters of the the CLI.
+
+
+# Simplicity
+
+
+### NLP prompts are **actually** easy and  **demonstrably**  more effective
+
+
+Stop drilling down byzantine menus in mail, scheduling and workflow to configure filters and actions that 1. only ever work 20% of the time 2. change in functionality and scope every two months because a project manager needs to justify their salary.
+
+
+Write short, declarative prompts instead. It's like wrapping busywork's paws in tinfoil and tossing it in a bathtub.
+
+
+Prompts
+
+
+1. Use semantic grouping, organizing by message intent, purpose, and context.
+2. The prompt templates in Kitty's "built in" library are evaluated using, for example, cosine similarity, ROUGE scoring and real human eval in the SDLC dev loop.
+3. For example: you'll consistently keep the treasure and trash the junk when you task deClawed with reviewing forums/feeds where actionable insights are gold, but only 10% of the signal.
+
+
+### Prompting: easily configured to cron: cleaning the litter(in)box before the stank wafts through the whole work house.
+### Imagine your morning inbox or summaries brimming with a fresh, spring-meadow aroma of opportunity and insight -- not last night's Kitty kibble.
+
+
+# -- You just might feel like it' s freakin' 1998 again.
+
+
+# Wiring up your kitty
+
+
+Assisty-kitty easily interfaces with mail and calendar and other app APIs (about any other service you want to plug in) ... it keeps things moving so you can go chase laser pointers or enjoy a 19-hour nap in a sunbeam.
 
-# Kitty connex are simple
-Assisty-kitty easily interfaces with mail and calendar and other app APIs (about any other service you want to plug in) ... it keeps things moving so you can go you chase your tail or take a 19-hour nap in a sunbeam.
 
 ---
 
+
 # Scope and Architecture
 
+
 ## Current implementation requires building/using:
--- Claude Desktop (as UI - proprietary UI coming soonish)
+-- Claude Desktop (as UI only - proprietary UI coming soonish)
--- Building/Connecting a Local Model Context Protocol Server
+-- Building/Connecting a Model API or Local Model Context Protocol Server
 -- A DNS-config’d domain, with MX records pointing to:
--- A commercial or self-hosted SMTP Serve
+-- A commercial or self-hosted SMTP Server
+
 
 ## Coming soonish:
--- Our own custom UI
+-- Proprietary, custom UI.
--- Suppost for wiring up local LLMs.
+-- Support for all stripes of models on HugginFFace.
+- Support for local LLMs.
+
 
 # Setup
 
+
 ### 1. Install Node.js (v16+ required).
 
+
 ```bash
 node --version
 npm --version
 ```
 
+
 If not installed, grab it from [nodejs.org](https://nodejs.org/).
 
+
 ### 2. Clone and Install
 
-```bash
-git clone https://github.com/kjannette/deClawed-Assisty-Kitty.git
-cd deClawed-Assity-Kitty
-npm install
-```
 
+```bash
+git clone https://git.sjdev.online/kjannette/deClawed-Assity-Kitty
+cd deClawed-Assity-Kitty
+npm i
+```
 ### 3. Set Up Google Cloud Credentials
 
+
 #### 3a. Create a Google Cloud Project
 
+
 1. Go to [Google Cloud Console](https://console.cloud.google.com/)
 2. Sign in with the Google account that owns the target Gmail
 3. Click the project dropdown (top-left) > **New Project**
 4. Name it (e.g., `assistant-mcp`) and click **Create**
 5. Select the new project from the dropdown
 
+
 #### 3b. Enable APIs
 
+
 In **APIs & Services > Library**, enable:
 - **Gmail API**
 - **Google Sheets API** (if mapping mail to sheets)
 - **Google Calendar API** (if using calendar event creation, etc.s)
 
+
 #### 3c. Configure the OAuth Consent Screen
 
+
 1. Go to **Google Auth Platform > Branding** (or **APIs & Services > OAuth consent screen**)
 2. Set user type to **External**, click **Create**
 3. Fill in app name, support email, and developer contact email
 4. Save and continue
 
+
 #### 3d. Add OAuth Scopes
 
+
 In **Google Auth Platform > Data Access**, add:
 - `https://www.googleapis.com/auth/gmail.modify`
 - `https://www.googleapis.com/auth/spreadsheets` (for Sheets integration)
 - `https://www.googleapis.com/auth/calendar.events` (for Calendar integration)
 
+
 #### 3e. Add Yourself as a Test User
 
+
 Go to **Google Auth Platform > Audience** and add each Gmail address you'll use.
 
+
 #### 3f. Create OAuth Client Credentials
 
+
 1. Go to **Google Auth Platform > Clients** (or **APIs & Services > Credentials**)
 2. Click **Create Client** > Application type: **Desktop app**
 3. **Download the JSON**, rename it to `credentials.json`
 4. Place it in the project root
 
+
 ### 4. Configure Accounts
 
+
 Create file `accounts.json` in the project root. Each key is an account alias with its own token file and optional Sheets/Calendar config:
 
+
 ```json
 {
 "work": {
@@ -130,61 +193,83 @@ Create file `accounts.json` in the project root. Each key is an account alias wi
 }
 ```
 
+
 - **`label`** -- display name (typically the email address)
 - **`tokenFile`** -- per-account OAuth token (auto-generated during auth)
 - **`spreadsheetId`** -- Google Sheets ID for recruiter contact logging (optional)
 - **`calendarId`** -- Google Calendar ID for event creation (optional, `"primary"` uses the default calendar)
 
+
 ### 5. Authorize Gmail Accounts
 
+
 Build and run the auth script for each account:
 
+
 ```bash
 npm run auth              # authorizes the "work" account
 npm run auth -- secondary # authorizes the "secondary" account
 ```
 
-Each run will:
+
+Each run required steps:
+
+
 1. Print a URL -- open it in your browser
 2. Sign in and click **Allow**
 3. You'll land on a "localhost refused to connect" page (normal)
 4. Copy the **entire URL** from the address bar and paste it back into the terminal
 5. The script saves the token file (e.g., `token.json` or `token-secondary.json`)
 
+
 You only need to do this once per account. Tokens auto-refresh.
 
+
 ### 6. Write the Prompts
 
+
 Two plain-text prompt files in `src/prompts/` control the workflow:
 
+
 | File | Phase | Purpose |
 |------|-------|---------|
 | `src/prompts/classify-emails.txt` | 1 -- Classification | Defines categories A/B/C/D and how to sort emails |
-| `src/prompts/take-action-on-emails.txt` | 2 -- Action | Tells the LLM what to do with each category (delete, log, schedule, etc.) |
+| `src/prompts/take-action-on-emails.txt` | 2 -- Action | Tell the LLM what to do with each category (delete, log, schedule, etc.) |
+
 
 **Tips:**
+
+
 - Use clear, explicit category definitions with example language
 - Handle ambiguous cases (e.g., "If an email both acknowledges receipt AND requests action, classify as B")
 - Prompt files are loaded at runtime -- edit them anytime, no rebuild required
 
+
 ### 7. Build
 
+
 ```bash
 npm run build
 ```
 
+
 Compiles `src/**/*.ts` into `build/`.
 
+
 ## 8. Configure Claude Desktop
 
+
 Edit your Claude Desktop config:
 
+
 ```bash
 code ~/Library/Application\ Support/Claude/claude_desktop_config.json
 ```
 
+
 Add the server:
 
+
 ```json
 {
 "mcpServers": {
@@ -198,23 +283,31 @@ Add the server:
 }
 ```
 
+
 Replace paths with the output of `which node` and your actual project location.
 
+
 ## 9. Add/Configure API Keys, Credentials, and Other Secrets
 
+
 Secret files are **gitignored** -- they never leave your machine. Example templates are provided so you know what shape each file needs to be in.
 
+
 #### 9a. `credentials.json`
 
+
 This file holds your Google OAuth client credentials. **You do not write this by hand** -- it is downloaded from the Google Cloud Console (see Step 3f above). Copy the example and then replace it with the real download:
 
+
 ```bash
 cp credentials.example.json credentials.json
 # Now replace credentials.json with the file downloaded from Google Cloud Console.
 ```
 
+
 The structure looks like this (the example file ships with empty values):
 
+
 ```json
 {
 "installed": {
@@ -229,14 +322,18 @@ The structure looks like this (the example file ships with empty values):
 }
 ```
 
+
 #### 9b. `accounts.json`
 
+
 Defines each Gmail account the server manages. Copy the example and fill in your values:
 
+
 ```bash
 cp accounts.example.json accounts.json
 ```
 
+
 | Field | What to put here |
 |-------|-----------------|
 | `label` | The email address for this account (display only) |
@@ -244,28 +341,38 @@ cp accounts.example.json accounts.json
 | `spreadsheetId` | The ID from your Google Sheet URL: `docs.google.com/spreadsheets/d/<THIS_PART>/edit` (optional) |
 | `calendarId` | `"primary"` for your default calendar, or a specific calendar ID (optional) |
 
+
 Add as many accounts as you need. Each key (e.g., `"work"`, `"secondary"`) becomes the account name used in tool calls and auth commands.
 
+
 #### 9c. `token*.json` (auto-generated)
 
+
 Token files are **created automatically** when you run `npm run auth` (Step 5). You do not need to create or edit them manually. A `token.example.json` is provided for reference only -- it shows the structure but the values are populated by the OAuth flow.
 
+
 #### Summary of secret files
 
+
 | Example template | Actual file (gitignored) | How to create |
 |-----------------|--------------------------|---------------|
 | `credentials.example.json` | `credentials.json` | Download from Google Cloud Console |
 | `accounts.example.json` | `accounts.json` | Copy example, fill in your email/sheet/calendar IDs |
 | `token.example.json` | `token.json`, `token-secondary.json`, etc. | Auto-generated by `npm run auth` |
 
+
 ### 10. Restart Claude Desktop
 
+
 Fully quit (**Cmd+Q**, not just close the window) and reopen. The `assistant` server should appear under **Connectors**.
 
+
 ---
 
+
 ## MCP Tools
 
+
 | Tool | Description |
 |------|-------------|
 | `fetch_new_emails` | Fetches unread emails for a given account. Classification and action prompts are automatically appended to the response. |
@@ -274,24 +381,32 @@ Fully quit (**Cmd+Q**, not just close the window) and reopen. The `assistant` se
 | `log_contact` | Logs or updates contact info in a Google Sheet. Merges rows by email + role. |
 | `create_calendar_event` | Creates a Google Calendar event for scheduled calls/meetings. Includes meeting links, attendees and their contact info. |
 
+
 ## MCP Prompts (built in as of now-ish - add your own)
 ### BETTER YET - DO A PR OR FORK
 
+
 | Prompt | Account | Description |
 |--------|---------|-------------|
 | `review_emails` | work | Loads the classification + action prompts for the work inbox |
 | `review_secondary_emails` | secondary | Same workflow, but for a second email account inbox |
 
+
 Invoke these from Claude Desktop's Connectors menu, or just type "Review my inbox" / "Review my secondary inbox."
 
+
 ---
 
+
 ## Two-Phase Workflow
 
+
 **Phase 1 -- Classify**
 
+
 The LLM calls `fetch_new_emails`, which returns email data with the classification instructions from `classify-emails.txt` appended. Each email is sorted into:
 
+
 | Category | Meaning | Action |
 |----------|---------|--------|
 | **A** | Acknowledgement / auto-reply | Delete |
@@ -299,18 +414,23 @@ The LLM calls `fetch_new_emails`, which returns email data with the classificati
 | **C** | Rejection | Delete |
 | **D** | Other / uncategorized | Summarize + log |
 
+
 **Phase 2 -- Act**
 
+
 Using `take-action-on-emails.txt`, the LLM:
 - Calls `delete_emails` for A + C
 - Calls `append_to_summary` for B + D
 - Calls `log_recruiter_contact` to track contacts in Sheets (if configured)
 - Calls `create_calendar_event` for any scheduled interviews/calls (if configured)
 
+
 ---
 
+
 ## Key Commands
 
+
 | Command | Purpose |
 |---------|---------|
 | `npm run build` | Recompile after editing source files |
@@ -319,10 +439,13 @@ Using `take-action-on-emails.txt`, the LLM:
 | `npm test` | Run the test suite |
 | `npm run test:watch` | Run tests in watch mode |
 
+
 ---
 
+
 ## Project Structure
 
+
 ```
 deClawed-Assity-Kitty/
 ├── src/
@@ -340,6 +463,14 @@ deClawed-Assity-Kitty/
 │       ├── tools-email.ts               # fetch, delete, append_to_summary
 │       ├── tools-calendar.ts            # create_calendar_event
 │       └── tools-spreadsheet.ts         # log_recruiter_contact
+├── accountsAndCredentials/
+│   ├── accounts.json                    # Multi-account configuration (gitignored)
+│   ├── accounts.example.json            # Template for accounts.json
+│   ├── credentials.json                 # Google OAuth client credentials (gitignored)
+│   ├── credentials.example.json         # Template for credentials.json
+│   ├── token.json                       # OAuth token -- work account (gitignored, auto-generated)
+│   ├── token-secondary.json             # OAuth token -- secondary account (gitignored, auto-generated)
+│   └── token.example.json              # Template showing token structure
 ├── test/
 │   ├── fixtures/
 │   │   └── mock-emails.ts              # Mock Gmail API responses
@@ -347,21 +478,14 @@ deClawed-Assity-Kitty/
 │   │   └── email-workflow.test.ts       # Integration tests
 │   └── unit/
 │       └── email-parsing.test.ts        # Unit tests for parsing helpers
-├── mailSummaries/                       # Per-account summary output (auto-generated)
+├── mailSummaries/                       # Per-account summary output (gitignored, auto-generated)
 ├── build/                               # Compiled JS (auto-generated)
-├── accounts.json                        # Multi-account configuration
+├── assets/
-├── credentials.json                     # Google OAuth client credentials
+│   └── logo.png                         # Project logo
-├── token*.json                          # Per-account OAuth tokens (auto-generated)
 ├── package.json
 ├── tsconfig.json
 ├── vitest.config.ts
+├── .gitignore
 └── README.md
 ```
-
+// revised Aug 31
-
-
-
-
-
-
-

accounts.example.json

@@ -1,12 +0,0 @@
-{
-  "work": {
-    "label": "",
-    "tokenFile": "token.json",
-    "spreadsheetId": "",
-    "calendarId": "primary"
-  },
-  "secondary": {
-    "label": "",
-    "tokenFile": "token-secondary.json"
-  }
-}

accountsAndCredentials/accounts.example.json

@@ -0,0 +1,12 @@
+{
+    "work": {
+        "label": "",
+        "tokenFile": "token.json",
+        "spreadsheetId": "",
+        "calendarId": "primary"
+    },
+    "secondary": {
+        "label": "",
+        "tokenFile": "token-secondary.json"
+    }
+}

accountsAndCredentials/credentials.example.json

@@ -0,0 +1,13 @@
+{
+    "installed": {
+        "client_id": "",
+        "project_id": "",
+        "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+        "token_uri": "https://oauth2.googleapis.com/token",
+        "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+        "client_secret": "",
+        "redirect_uris": [
+            "http://localhost"
+        ]
+    }
+}

accountsAndCredentials/token.example.json

@@ -0,0 +1,7 @@
+{
+    "access_token": "",
+    "refresh_token": "",
+    "scope": "https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/gmail.modify https://www.googleapis.com/auth/calendar.events",
+    "token_type": "Bearer",
+    "expiry_date": 0
+}

package-lock.json

@@ -9,7 +9,7 @@
             "version": "1.0.0",
             "license": "ISC",
             "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.26.0",
+                "@modelcontextprotocol/sdk": "^1.30.0",
                 "googleapis": "^171.4.0",
                 "zod": "^3.25.76"
             },
@@ -501,12 +501,12 @@
             "license": "MIT"
         },
         "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.26.0",
+            "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.26.0.tgz",
+            "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.30.0.tgz",
-      "integrity": "sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==",
+            "integrity": "sha512-xKd8OIzlqNzcqcNumGAa6g+PW2kjD5vrpcKOnfldAUPP3j7lnqMPwlTXQm8gF+UwH72z0lqaRbjr9hqGz0eITA==",
             "license": "MIT",
             "dependencies": {
-        "@hono/node-server": "^1.19.9",
+                "@hono/node-server": "^1.19.9 || ^2.0.5",
                 "ajv": "^8.17.1",
                 "ajv-formats": "^3.0.1",
                 "content-type": "^1.0.5",

package.json

@@ -19,7 +19,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.26.0",
+        "@modelcontextprotocol/sdk": "^1.30.0",
         "googleapis": "^171.4.0",
         "zod": "^3.25.76"
     },

src/McpServer.ts

@@ -4,3 +4,5 @@ export const server = new McpServer({
   name: "assistant",
   version: "1.0.0",
 });
+
+// revised Aug 31

src/auth.ts

@@ -5,8 +5,9 @@ import readline from "readline";
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 const PROJECT_ROOT = path.resolve(__dirname, "..");
-const CREDENTIALS_PATH = path.join(PROJECT_ROOT, "credentials.json");
+const SECRETS_DIR = path.join(PROJECT_ROOT, "accountsAndCredentials");
-const ACCOUNTS_PATH = path.join(PROJECT_ROOT, "accounts.json");
+const CREDENTIALS_PATH = path.join(SECRETS_DIR, "credentials.json");
+const ACCOUNTS_PATH = path.join(SECRETS_DIR, "accounts.json");
 
 const SCOPES = [
   "https://www.googleapis.com/auth/gmail.modify",
@@ -26,7 +27,7 @@ function resolveTokenPath(accountKey: string): string {
       `Unknown account "${accountKey}". Available: ${available}`
     );
   }
-  return path.join(PROJECT_ROOT, acct.tokenFile);
+  return path.join(SECRETS_DIR, acct.tokenFile);
 }
 
 async function authorize(): Promise<void> {
@@ -44,7 +45,7 @@ async function authorize(): Promise<void> {
         "1. Go to https://console.cloud.google.com/\n" +
         "2. Create a project and enable the Gmail, Sheets, and Calendar APIs\n" +
         "3. Create OAuth 2.0 credentials (Desktop app type)\n" +
-        "4. Download the JSON and save it as credentials.json in the project root\n"
+        "4. Download the JSON and save it as credentials.json in the accountsAndCredentials/ folder\n"
     );
     process.exit(1);
   }
@@ -116,3 +117,5 @@ authorize().catch((err) => {
   console.error("Authorization failed:", err);
   process.exit(1);
 });
+
+// revised Aug 31

src/index.ts

@@ -18,3 +18,5 @@ main().catch((error) => {
   console.error("Fatal error in main():", error);
   process.exit(1);
 });
+
+// revised Aug 31

src/loaders/prompt-config-loaders.ts

@@ -3,18 +3,20 @@ import { google, gmail_v1, sheets_v4, calendar_v3 } from "googleapis";
 import { OAuth2Client } from "google-auth-library";
 import fs from "fs";
 import path from "path";
-
+import { fileURLToPath } from "url";
 // ---------------------------------------------------------------------------
 // Paths
 // ---------------------------------------------------------------------------
-const __dirname = path.dirname(new URL(import.meta.url).pathname);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 export const PROJECT_ROOT = path.resolve(__dirname, "..", "..");
-const CREDENTIALS_PATH = path.join(PROJECT_ROOT, "credentials.json");
+const SECRETS_DIR = path.join(PROJECT_ROOT, "accountsAndCredentials");
-const ACCOUNTS_PATH = path.join(PROJECT_ROOT, "accounts.json");
+const CREDENTIALS_PATH = path.join(SECRETS_DIR, "credentials.json");
-const CLASSIFY_PROMPT_PATH = path.join(PROJECT_ROOT, "classify-emails.txt");
+const ACCOUNTS_PATH = path.join(SECRETS_DIR, "accounts.json");
-const ACTION_PROMPT_PATH = path.join(
+const PROMPTS_DIR = path.join(PROJECT_ROOT, "src", "prompts");
-  PROJECT_ROOT, "src", "prompts", "take-action-on-emails.txt"
+const CLASSIFY_PROMPT_PATH = path.join(PROMPTS_DIR, "classify-emails.txt");
-);
+const ACTION_PROMPT_PATH = path.join(PROMPTS_DIR, "take-action-on-emails.txt");
 
 // ---------------------------------------------------------------------------
 // Account configuration
@@ -46,7 +48,7 @@ export const getTokenPath = (account: string): string => {
             `Unknown account "${account}". Available accounts: ${available}`
         );
     }
-  return path.join(PROJECT_ROOT, acct.tokenFile);
+    return path.join(SECRETS_DIR, acct.tokenFile);
 };
 
 export const getSummaryPath = (account: string): string => {
@@ -147,3 +149,5 @@ export const getSpreadsheetId = (account: string): string => {
 
 export const getCalendarId = (account: string): string =>
     accounts[account]?.calendarId ?? "primary";
+
+// revised Aug 31

src/prompt-controller-service/prompt-controller-service.ts

@@ -6,27 +6,23 @@ import {
 } from "../loaders/prompt-config-loaders.js";
 
 // ---------------------------------------------------------------------------
-// Prompt: review_emails (work account)
+// Prompt: Classify Emails (Phase 1)
 // ---------------------------------------------------------------------------
 server.registerPrompt(
-  "review_emails",
+    "classify-emails",
     {
-    description:
+        description: "Phase 1: Organize, prioritize, and summarize incoming recruiter emails.",
-      `Review WORK inbox (${accounts.work?.label ?? "work"}): classify emails, delete A+C, summarize B+D, log B to spreadsheet, create calendar events.`,
     },
     () => {
         const phase1 = loadClassificationPrompt();
-    const phase2 = loadActionPrompt();
         return {
             messages: [
                 {
                     role: "user" as const,
                     content: {
                         type: "text" as const,
-            text:
+                        text: `ACCOUNT: Use account = "work" for ALL tool calls in this session.\n\n` +
-              `ACCOUNT: Use account = "work" for ALL tool calls in this session.\n\n` +
+                            (phase1 || "Review my new emails and classify them by job application category.")
-              (phase1 || "Review my new emails and classify them by job application category.") +
-              (phase2 ? `\n\n${phase2}` : ""),
                     },
                 },
             ],
@@ -35,16 +31,14 @@ server.registerPrompt(
 );
 
 // ---------------------------------------------------------------------------
-// Prompt: review_secondary_emails (secondary account)
+// Prompt: Take Action on Emails (Phase 2)
 // ---------------------------------------------------------------------------
 server.registerPrompt(
-  "review_secondary_emails",
+    "take-action-on-emails",
     {
-    description:
+        description: "Phase 2: Log Category B recruiters to spreadsheet and create calendar events.",
-      `Review SECONDARY inbox (${accounts.secondary?.label ?? "secondary"}): classify emails, delete A+C, summarize B+D, log B to spreadsheet, create calendar events.`,
     },
     () => {
-    const phase1 = loadClassificationPrompt();
         const phase2 = loadActionPrompt();
         return {
             messages: [
@@ -52,13 +46,13 @@ server.registerPrompt(
                     role: "user" as const,
                     content: {
                         type: "text" as const,
-            text:
+                        text: `ACCOUNT: Use account = "work" for ALL tool calls in this session.\n\n` +
-              `ACCOUNT: Use account = "secondary" for ALL tool calls in this session.\n\n` +
+                            (phase2 || "Process remaining action items for flagged recruiters.")
-              (phase1 || "Review my new emails and classify them by job application category.") +
-              (phase2 ? `\n\n${phase2}` : ""),
                     },
                 },
             ],
         };
     }
 );
+
+// revised Aug 31

src/prompts/classify-emails.txt

@@ -1,17 +1,17 @@
-You are an expert Executive Assistant AI specialized in email management and productivity. Your goal is to organize, prioritize, and summarize incoming emails to maximize user efficiency.
+You are an expert Executive Assistant AI specialized in email management and productivity. Your goal is to organize, prioritize, and summarize incoming emails to maximize user efficiency. I have been applying for jobs, which generates a large volume of responses. 
 
-I have been applying for jobs, which generates a large volume of responses. Review my inbox and apply the following instructions to all new emails.
+Review the first 200 emails in my inbox. Apply the following instructions to those emails.
 
 STEP 1: Constraints
 - Do not make up information.
 
 STEP 2: CLASSIFY each email into exactly one category.
-
 Category A - Acknowledgement Only
 The employer confirms receipt of my application but requires no action from me. Typical language: "We received your application," "Your application is under review," "We will contact you if selected." No next steps are requested.
 
 Category B - Advancement to Next Step
 The employer wants to move forward. This includes: invitations to schedule a phone screen or interview, requests to complete an assessment or assignment, requests for additional information or documents, or any communication that requires a response or action from me. If an email both acknowledges receipt AND requests action, classify it as B.
+This does *not* include Greenhouse "security code" emails, other "confirm identity codes" or "identity-confirmation" type emails, "verify candidate account" type emails, 
 
 Category C - Rejection
 The employer declines to move forward. Typical language: "We have decided to pursue other candidates," "Unfortunately, you were not selected," "We will not be moving forward with your application."
@@ -19,13 +19,44 @@ The employer declines to move forward. Typical language: "We have decided to pur
 Category D - Other
 The email does not fit into categories A, B, or C. This includes non-job-application emails, newsletters, promotional content, or ambiguous messages that do not clearly match another category.
 
-STEP 3: DELETE emails classified as Category A and Category C.
+STEP 3: STAR REVIEWED EMAILS
+- For EVERY single email processed and reviewed in this run (Categories A, B, C, and D), apply the Gmail "STARRED" system label or use your email tool to add a star to the message. 
 
-STEP 4: ("Anti step") -  NEVER DELETE Category B emails.
+STEP 4: Confirm, via natural language output in the chat window, the total number of emails fetched for review and starred.
 
-STEP 5: SUMMARIZE emails classified as Category B and Category D. For each, include:
+STEP 5: SUMMARIZE emails classified as Category B and Category D, under separate headers, in the chat.
+For each, state:
 1. Sender name and email address
 2. Email subject line
 3. Date and time received
 4. Category (B or D)
 5. Suggested action I should take
+
+STEP 6: **STRICT COMPLIANCE REQUIRED** **DO NOT FORGET***:
+Summarize all "Category B" emails in the chat. 
+Star all reviewed email
+
+Next,  perform the following actions for each "Category B" email:
+
+STEP 7: CREATE CALENDAR EVENTS
+Immediately after logging to the spreadsheet, check whether ANY of these fields were populated or updated:
+- Recruiter Call Scheduled
+- Company First Interview
+- Company Second Interview
+
+For EACH of the above fields that contains a date/time, create a Google Calendar event using the create_calendar_event tool:
+- Title format: "[<Recruiter Name> Call] Company - Role" or "[First Interview] Company - Role" or "[Second Interview] Company - Role"
+- Start date/time: extracted from the email (convert to ISO 8601)
+- Duration: 30 minutes unless otherwise specified in the email
+- Location: the video meeting link, phone number, or platform name
+- Description: include recruiter or company contact name/email/phone, and note whether they have your cell number
+
+STRICT CONSTRAINTS:
+- Do not make up phone numbers, links, dates, or anything at all. If it does not exist in text within a verifiable email, IT DOES NOT EXIST.
+- PAST-DATE CHECK: Before creating a calendar event: 1) verify today's date from an external, reliable source; 2) compare the proposed meeting date/time against today's date; 3) if the meeting date has already passed, do NOT create a calendar event for it. Still log it to the spreadsheet, but skip the calendar step. The tool will also enforce this server-side.
+- As described in more detail below, each new date/time value in a scheduling column = one new calendar event. Never skip this.
+- Always use the same account for calendar events as was used for email fetching.
+- Do not create duplicate calendar events for the same meeting (same company representative && same job description | same company && same date time)
+- If information is not present in the email, leave that field empty (it's OK!) - do not guess or make up information.
+
+// revised Aug 31

src/prompts/take-action-on-emails.txt

@@ -1,45 +1,25 @@
 PHASE 2: TAKE ACTION ON CATEGORY B EMAILS
-
 After completing classification (Phase 1), perform the following actions for each email classified as Category B (Advancement to Next Step).
 
-STEP 1: LOG TO SPREADSHEET
+STEP 1: CREATE CALENDAR EVENTS
-For each Category B email, extract as much of the following information as possible from the email contents and log it using the log_recruiter_contact tool:
-
-A column exists for:
-
-- Recruiter Name
-- Recruiter Email
-- Recruiter Phone/Tel
-- Company/Role the recruiter seeks to fill
-- First Contact: the date and time the email was received
-- Subsequent Contacts: any follow-up communication with this recruiter about this role
-- Recruiter Call Scheduled: if the email contains scheduling information, extract ALL details — date, time, platform (Zoom, MS Teams, Google Meet, etc.), meeting link, phone number to call — and note whether they confirm having your cell number or might not have it
-
-A row should already exists for the same recruiter email + company/role combination (from a previous email), the tool will UPDATE the existing row. Provide all available fields and the tool handles merging.
-
-STEP 2: CREATE CALENDAR EVENTS
 Immediately after logging to the spreadsheet, check whether ANY of these fields were populated or updated:
 - Recruiter Call Scheduled
 - Company First Interview
 - Company Second Interview
 
 For EACH of the above fields that contains a date/time, create a Google Calendar event using the create_calendar_event tool:
-- Title format: "[<Recruiter NaME> Call] Company - Role" or "[First Interview] Company - Role" or "[Second Interview] Company - Role"
+- Title format: "[<Recruiter Name> Call] Company - Role" or "[First Interview] Company - Role" or "[Second Interview] Company - Role"
 - Start date/time: extracted from the email (convert to ISO 8601)
 - Duration: 30 minutes unless otherwise specified in the email
 - Location: the video meeting link, phone number, or platform name
 - Description: include recruiter or company contact name/email/phone, and note whether they have your cell number
 
-STEP 3: COMPANY INTERVIEW TRACKING
-When an email indicates advancement beyond the recruiter screen to a company interview:
-- Populate the Company First Interview or Company Second Interview field with details
-- Those details should include company contact info (interviewer name, email, phone)
-- Then immeidately create a calendar event for the new interview date/time including interviewer name, email, phone
-
 STRICT CONSTRAINTS:
-- Do not make up phone numbers, links, dates, or anything at all.  If it does not exist in text wihtin a verifiable email, IT DOES NOT EXIST.
+- Do not make up phone numbers, links, dates, or anything at all. If it does not exist in text within a verifiable email, IT DOES NOT EXIST.
-- PAST-DATE CHECK: Before creating a calendar event, compare the proposed meeting date/time against today's date. If the meeting date has already passed, do NOT create a calendar event for it. Still log it to the spreadsheet, but skip the calendar step. The tool will also enforce this server-side.
+- PAST-DATE CHECK: Before creating a calendar event: 1) verify today's date from an external, reliable source; 2) compare the proposed meeting date/time against today's date; 3) if the meeting date has already passed, do NOT create a calendar event for it. Still log it to the spreadsheet, but skip the calendar step. The tool will also enforce this server-side.
 - As described in more detail below, each new date/time value in a scheduling column = one new calendar event. Never skip this.
 - Always use the same account for calendar events as was used for email fetching.
-- Do not create duplicate calendar events for the same meeting.
+- Do not create duplicate calendar events for the same meeting (same company representative && same job description | same company && same date time)
-- If information is not present in the email, leave that field empty do ot guess.
+- If information is not present in the email, leave that field empty (it's OK!) - do not guess or make up information.
+
+// revised Aug 31

src/tools/tools-calendar.ts

@@ -109,3 +109,5 @@ server.registerTool(
     }
   }
 );
+
+// revised Aug 31

src/tools/tools-email.ts

@@ -56,14 +56,14 @@ server.registerTool(
         description:
             "Fetch unread emails from a Gmail inbox. Returns sender, date, " +
             "subject, message ID, and body text for each message. The message IDs " +
-      "can be passed to delete_emails later. Specify which account to fetch from.",
+            "must be passed to star_emails after evaluation. Specify which account to fetch from.",
         inputSchema: {
             account: accountSchema,
             maxResults: z
                 .number()
                 .min(1)
-        .max(100)
+                .max(200)
-        .describe("Maximum number of unread emails to fetch (1-100)"),
+                .describe("Maximum number of unread emails to fetch (1-200)"),
         },
     },
     async ({ account, maxResults }) => {
@@ -303,3 +303,60 @@ server.registerTool(
         }
     }
 );
+// --------------------------------------------------------------------------- //
+// Tool: star_emails
+// --------------------------------------------------------------------------- //
+server.registerTool(
+    "star_emails",
+    {
+        description: "Mark reviewed emails with a star and mark them as read in Gmail. " +
+            "Use this for all reviewed messages (Categories A, B, C, and D) " +
+            "to signal they have been processed. Specify which account the emails belong to.",
+        inputSchema: {
+            account: accountSchema,
+            messageIds: z
+                .array(z.string())
+                .describe("Array of Gmail message IDs to star and mark read"),
+        },
+    },
+    async ({ account, messageIds }) => {
+        try {
+            if (messageIds.length === 0) {
+                return { content: [{ type: "text" as const, text: "No message IDs provided." }] };
+            }
+
+            const gmail = getGmailClient(account);
+
+            // Batch modify allows updating up to 1000 messages in a single API call
+            await gmail.users.messages.batchModify({
+                userId: "me",
+                requestBody: {
+                    ids: messageIds,
+                    addLabelIds: ["STARRED"],
+                    removeLabelIds: ["UNREAD"]
+                }
+            });
+
+            return {
+                content: [
+                    {
+                        type: "text" as const,
+                        text: `Successfully starred and marked read ${messageIds.length} email(s).`,
+                    },
+                ],
+            };
+        } catch (error) {
+            const errMsg = error instanceof Error ? error.message : String(error);
+            return {
+                content: [
+                    {
+                        type: "text" as const,
+                        text: `Error starring emails: ${errMsg}`,
+                    },
+                ],
+            };
+        }
+    }
+);
+
+// revised Aug 31

src/tools/tools-spreadsheet.ts

@@ -177,3 +177,5 @@ server.registerTool(
     }
   }
 );
+
+// revised Aug 31

test/fixtures/mock-emails.ts

@@ -165,3 +165,5 @@ export const RAW_BODIES = {
   "msg-cat-c-001": catCBody,
   "msg-cat-d-001": catDBody,
 };
+
+// revised Aug 31

test/integration/email-workflow.test.ts

@@ -285,3 +285,5 @@ describe("Phase 1: Email Review Workflow", () => {
     });
   });
 });
+
+// revised Aug 31

test/unit/email-parsing.test.ts

@@ -84,3 +84,5 @@ describe("decodeBody", () => {
     expect(decodeBody(msg)).toBe(htmlContent);
   });
 });
+
+// revised Aug 31

tsconfig.json

@@ -10,6 +10,12 @@
         "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true
     },
-  "include": ["src/**/*"],
+    "include": [
-  "exclude": ["node_modules", "test", "vitest.config.ts"]
+        "src/**/*"
+    ],
+    "exclude": [
+        "node_modules",
+        "test",
+        "vitest.config.ts"
+    ]
 }

vitest.config.ts

@@ -6,3 +6,5 @@ export default defineConfig({
     globals: true,
   },
 });
+
+// revised Aug 31