Merge pull request #75 from salmonumbrella/feat/calendar-propose-time

Add calendar propose-time, tasks repeat, auth alias, and more

Author: steipete

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Gmail: show attachment info (incl. humanized sizes) for `gmail get` full/metadata output, with JSON `sizeHuman`. (#83) — thanks @jeanregisser.
+- CLI: calendar propose-time, event types, tasks repeat + get, auth aliases, time now, enable-commands, and day-of-week JSON fields. (#75) — thanks @salmonumbrella.
 
 ### Fixed
 
@@ -15,6 +16,7 @@
 - Classroom: scan pages when filtering coursework/materials by topic. (#73) — thanks @salmonumbrella.
 - CLI: enable shell completions and stop flag suggestions after `--`. (#77) — thanks @salmonumbrella.
 - Timezone: honor `--timezone local` and allow env/config defaults for Gmail + Calendar output. (#79) — thanks @salmonumbrella.
+- Calendar/Tasks: propose-time decline sends updates and repeat-until keeps due time. (#75) — thanks @salmonumbrella.
 
 ### Build
 

README.md

@@ -303,10 +303,11 @@ gog keep get <noteId> --account you@yourdomain.com
 
 ### Environment Variables
 
-- `GOG_ACCOUNT` - Default account email to use (avoids repeating `--account`; otherwise uses keyring default or a single stored token)
+- `GOG_ACCOUNT` - Default account email or alias to use (avoids repeating `--account`; otherwise uses keyring default or a single stored token)
 - `GOG_JSON` - Default JSON output
 - `GOG_PLAIN` - Default plain output
 - `GOG_COLOR` - Color mode: `auto` (default), `always`, or `never`
+- `GOG_ENABLE_COMMANDS` - Comma-separated allowlist of top-level commands (e.g., `calendar,tasks`)
 
 ### Config File (JSON5)
 
@@ -324,8 +325,21 @@ Example (JSON5 supports comments and trailing commas):
 {
   // Avoid macOS Keychain prompts
   keyring_backend: "file",
+  // Optional account aliases
+  account_aliases: {
+    work: "work@company.com",
+    personal: "me@gmail.com",
+  },
 }
 ```
+
+### Account Aliases
+
+```bash
+gog auth alias set work work@company.com
+gog auth alias list
+gog auth alias unset work
+```
 
 ## Security
 
@@ -538,6 +552,25 @@ gog calendar update <calendarId> <eventId> \
   --from 2025-01-15T11:00:00Z \
   --to 2025-01-15T12:00:00Z
 
+# Special event types via --event-type (focus-time/out-of-office/working-location)
+gog calendar create primary \
+  --event-type focus-time \
+  --from 2025-01-15T13:00:00Z \
+  --to 2025-01-15T14:00:00Z
+
+gog calendar create primary \
+  --event-type out-of-office \
+  --from 2025-01-20 \
+  --to 2025-01-21 \
+  --all-day
+
+gog calendar create primary \
+  --event-type working-location \
+  --working-location-type office \
+  --working-office-label "HQ" \
+  --from 2025-01-22 \
+  --to 2025-01-23
+
 # Add attendees without replacing existing attendees/RSVP state
 gog calendar update <calendarId> <eventId> \
   --add-attendee "alice@example.com,bob@example.com"
@@ -558,6 +591,13 @@ gog calendar conflicts --calendars "primary,work@example.com" \
   --today                             # Today's conflicts
 ```
 
+### Time
+
+```bash
+gog time now
+gog time now --timezone UTC
+```
+
 ### Drive
 
 ```bash
@@ -655,12 +695,16 @@ gog tasks lists create <title>
 
 # Tasks in a list
 gog tasks list <tasklistId> --max 50
+gog tasks get <tasklistId> <taskId>
 gog tasks add <tasklistId> --title "Task title"
+gog tasks add <tasklistId> --title "Weekly sync" --due 2025-02-01 --repeat weekly --repeat-count 4
 gog tasks update <tasklistId> <taskId> --title "New title"
 gog tasks done <tasklistId> <taskId>
 gog tasks undo <tasklistId> <taskId>
 gog tasks delete <tasklistId> <taskId>
 gog tasks clear <tasklistId>
+
+# Note: Google Tasks treats due dates as date-only; time components may be ignored.
 ```
 
 ### Sheets
@@ -880,7 +924,8 @@ gog --verbose gmail search 'newer_than:7d'
 
 All commands support these flags:
 
-- `--account <email>` - Account to use (overrides GOG_ACCOUNT)
+- `--account <email|alias|auto>` - Account to use (overrides GOG_ACCOUNT)
+- `--enable-commands <csv>` - Allowlist top-level commands (e.g., `calendar,tasks`)
 - `--json` - Output JSON to stdout (best for scripting)
 - `--plain` - Output stable, parseable text to stdout (TSV; no colors)
 - `--color <mode>` - Color mode: `auto`, `always`, or `never` (default: auto)

docs/spec.md

@@ -121,12 +121,14 @@ We intentionally avoid storing refresh tokens in plain JSON on disk.
 
 Environment:
 
-- `GOG_ACCOUNT=you@gmail.com` (used when `--account` is not set; otherwise uses keyring default or a single stored token)
+- `GOG_ACCOUNT=you@gmail.com` (email or alias; used when `--account` is not set; otherwise uses keyring default or a single stored token)
 - `GOG_KEYRING_PASSWORD=...` (used when keyring falls back to encrypted file backend in non-interactive environments)
 - `GOG_KEYRING_BACKEND={auto|keychain|file}` (force backend; use `file` to avoid Keychain prompts and pair with `GOG_KEYRING_PASSWORD` for non-interactive)
 - `GOG_TIMEZONE=America/New_York` (default output timezone; IANA name or `UTC`; `local` forces local timezone)
+- `GOG_ENABLE_COMMANDS=calendar,tasks` (optional allowlist of top-level commands)
 - `config.json` can also set `keyring_backend` (JSON5; env vars take precedence)
 - `config.json` can also set `default_timezone` (IANA name or `UTC`)
+- `config.json` can also set `account_aliases` for `gog auth alias` (JSON5)
 
 Flag aliases:
 - `--out` also accepts `--output`.
@@ -141,6 +143,9 @@ Flag aliases:
 - `gog auth services [--markdown]`
 - `gog auth keep <email> --key <service-account.json>` (Google Keep; Workspace only)
 - `gog auth list`
+- `gog auth alias list`
+- `gog auth alias set <alias> <email>`
+- `gog auth alias unset <alias>`
 - `gog auth status`
 - `gog auth remove <email>`
 - `gog auth tokens list`
@@ -169,11 +174,12 @@ Flag aliases:
 - `gog calendar acl <calendarId>`
 - `gog calendar events <calendarId> [--from RFC3339] [--to RFC3339] [--max N] [--page TOKEN] [--query Q]`
 - `gog calendar event <calendarId> <eventId>`
-- `gog calendar create <calendarId> --summary S --from DT --to DT [--description D] [--location L] [--attendees a@b.com,c@d.com] [--all-day]`
-- `gog calendar update <calendarId> <eventId> [--summary S] [--from DT] [--to DT] [--description D] [--location L] [--attendees ...] [--add-attendee ...] [--all-day]`
+- `gog calendar create <calendarId> --summary S --from DT --to DT [--description D] [--location L] [--attendees a@b.com,c@d.com] [--all-day] [--event-type TYPE]`
+- `gog calendar update <calendarId> <eventId> [--summary S] [--from DT] [--to DT] [--description D] [--location L] [--attendees ...] [--add-attendee ...] [--all-day] [--event-type TYPE]`
 - `gog calendar delete <calendarId> <eventId>`
 - `gog calendar freebusy <calendarIds> --from RFC3339 --to RFC3339`
 - `gog calendar respond <calendarId> <eventId> --status accepted|declined|tentative [--send-updates all|none|externalOnly]`
+- `gog time now [--timezone TZ]`
 - `gog classroom courses [--state ...] [--max N] [--page TOKEN]`
 - `gog classroom courses get <courseId>`
 - `gog classroom courses create --name NAME [--owner me] [--state ACTIVE|...]`
@@ -255,8 +261,9 @@ Flag aliases:
 - `gog tasks lists [--max N] [--page TOKEN]`
 - `gog tasks lists create <title>`
 - `gog tasks list <tasklistId> [--max N] [--page TOKEN]`
-- `gog tasks add <tasklistId> --title T [--notes N] [--due RFC3339] [--parent ID] [--previous ID]`
-- `gog tasks update <tasklistId> <taskId> [--title T] [--notes N] [--due RFC3339] [--status needsAction|completed]`
+- `gog tasks get <tasklistId> <taskId>`
+- `gog tasks add <tasklistId> --title T [--notes N] [--due RFC3339|YYYY-MM-DD] [--repeat daily|weekly|monthly|yearly] [--repeat-count N] [--repeat-until DT] [--parent ID] [--previous ID]`
+- `gog tasks update <tasklistId> <taskId> [--title T] [--notes N] [--due RFC3339|YYYY-MM-DD] [--status needsAction|completed]`
 - `gog tasks done <tasklistId> <taskId>`
 - `gog tasks undo <tasklistId> <taskId>`
 - `gog tasks delete <tasklistId> <taskId>`

internal/cmd/account.go

@@ -4,17 +4,38 @@ import (
 	"os"
 	"strings"
 
+	"github.com/steipete/gogcli/internal/config"
 	"github.com/steipete/gogcli/internal/secrets"
 )
 
 var openSecretsStoreForAccount = secrets.OpenDefault
 
 func requireAccount(flags *RootFlags) (string, error) {
 	if v := strings.TrimSpace(flags.Account); v != "" {
-		return v, nil
+		if resolved, ok, err := resolveAccountAlias(v); err != nil {
+			return "", err
+		} else if ok {
+			return resolved, nil
+		}
+		if shouldAutoSelectAccount(v) {
+			v = ""
+		}
+		if v != "" {
+			return v, nil
+		}
 	}
 	if v := strings.TrimSpace(os.Getenv("GOG_ACCOUNT")); v != "" {
-		return v, nil
+		if resolved, ok, err := resolveAccountAlias(v); err != nil {
+			return "", err
+		} else if ok {
+			return resolved, nil
+		}
+		if shouldAutoSelectAccount(v) {
+			v = ""
+		}
+		if v != "" {
+			return v, nil
+		}
 	}
 
 	if store, err := openSecretsStoreForAccount(); err == nil {
@@ -35,3 +56,20 @@ func requireAccount(flags *RootFlags) (string, error) {
 
 	return "", usage("missing --account (or set GOG_ACCOUNT, set default via `gog auth manage`, or store exactly one token)")
 }
+
+func resolveAccountAlias(value string) (string, bool, error) {
+	value = strings.TrimSpace(value)
+	if value == "" || strings.Contains(value, "@") || shouldAutoSelectAccount(value) {
+		return "", false, nil
+	}
+	return config.ResolveAccountAlias(value)
+}
+
+func shouldAutoSelectAccount(value string) bool {
+	switch strings.ToLower(strings.TrimSpace(value)) {
+	case "auto", "default":
+		return true
+	default:
+		return false
+	}
+}

internal/cmd/account_test.go

@@ -2,8 +2,10 @@ package cmd
 
 import (
 	"errors"
+	"path/filepath"
 	"testing"
 
+	"github.com/steipete/gogcli/internal/config"
 	"github.com/steipete/gogcli/internal/secrets"
 )
 
@@ -51,6 +53,66 @@ func TestRequireAccount_UsesEnv(t *testing.T) {
 	}
 }
 
+func TestRequireAccount_ResolvesAliasFlag(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, "xdg-config"))
+	if err := config.WriteConfig(config.File{
+		AccountAliases: map[string]string{"work": "alias@example.com"},
+	}); err != nil {
+		t.Fatalf("write config: %v", err)
+	}
+
+	flags := &RootFlags{Account: "work"}
+	got, err := requireAccount(flags)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if got != "alias@example.com" {
+		t.Fatalf("got %q", got)
+	}
+}
+
+func TestRequireAccount_ResolvesAliasEnv(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, "xdg-config"))
+	if err := config.WriteConfig(config.File{
+		AccountAliases: map[string]string{"work": "alias@example.com"},
+	}); err != nil {
+		t.Fatalf("write config: %v", err)
+	}
+
+	t.Setenv("GOG_ACCOUNT", "work")
+	flags := &RootFlags{}
+	got, err := requireAccount(flags)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if got != "alias@example.com" {
+		t.Fatalf("got %q", got)
+	}
+}
+
+func TestRequireAccount_AutoUsesDefault(t *testing.T) {
+	t.Setenv("GOG_ACCOUNT", "")
+	flags := &RootFlags{Account: "auto"}
+
+	prev := openSecretsStoreForAccount
+	t.Cleanup(func() { openSecretsStoreForAccount = prev })
+	openSecretsStoreForAccount = func() (secrets.Store, error) {
+		return &fakeSecretsStore{defaultAccount: "default@example.com"}, nil
+	}
+
+	got, err := requireAccount(flags)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if got != "default@example.com" {
+		t.Fatalf("got %q", got)
+	}
+}
+
 func TestRequireAccount_Missing(t *testing.T) {
 	t.Setenv("GOG_ACCOUNT", "")
 	flags := &RootFlags{}

internal/cmd/auth.go

@@ -53,6 +53,7 @@ type AuthCmd struct {
 	Add         AuthAddCmd            `cmd:"" name:"add" help:"Authorize and store a refresh token"`
 	Services    AuthServicesCmd       `cmd:"" name:"services" help:"List supported auth services and scopes"`
 	List        AuthListCmd           `cmd:"" name:"list" help:"List stored accounts"`
+	Aliases     AuthAliasCmd          `cmd:"" name:"alias" help:"Manage account aliases"`
 	Status      AuthStatusCmd         `cmd:"" name:"status" help:"Show auth configuration and keyring backend"`
 	Keyring     AuthKeyringCmd        `cmd:"" name:"keyring" help:"Configure keyring backend"`
 	Remove      AuthRemoveCmd         `cmd:"" name:"remove" help:"Remove a stored refresh token"`