From 680bd433f49ae8f8be7d05c7e038166074edbac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=20=E9=A7=BF=E7=94=AB=20=28Shunsuke=20Hayashi=29?=
 <supernovasyun@gmail.com>
Date: Wed, 15 Apr 2026 09:33:57 +0900
Subject: [PATCH] fix: resolve set -euo pipefail silent exits and 3 related
 bugs

Root cause: bin/garc uses set -euo pipefail. Any command substitution
$(...) that returns exit 1 caused the entire garc process to exit
immediately with no output, making errors look silent.

Fixes:
- ingress.sh: add || true to all _find_queue_file $() assignments
  so set -e does not silently kill the process on missing queue items
- ingress.sh: _ingress_update_status returns 1 silently (callers
  print their own error); _ingress_done/fail print "Queue item not
  found" exactly once
- ingress.sh: _ingress_next result also guarded with || true
- drive.sh: garc drive info with no args now shows GARC workspace
  folder info instead of printing usage and exiting
- garc-core.py: replaced 210-line duplicate with a 3-line re-export
  from garc_core.py to prevent future divergence

Verified: verify/done/fail all print clear error on bad ID (exit 1),
drive info no-arg shows workspace folder, no regressions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 lib/drive.sh         |  12 ++-
 lib/ingress.sh       |  24 ++---
 scripts/garc-core.py | 210 +------------------------------------------
 3 files changed, 26 insertions(+), 220 deletions(-)

diff --git a/lib/drive.sh b/lib/drive.sh
index f6206c2..877953f 100644
--- a/lib/drive.sh
+++ b/lib/drive.sh
@@ -82,7 +82,17 @@ garc_drive_search() {
 }
 
 garc_drive_info() {
-  [[ -z "${1:-}" ]] && { echo "Usage: garc drive info <file_id>"; return 1; }
+  # No arg → show workspace folder info
+  if [[ -z "${1:-}" ]]; then
+    local folder_id="${GARC_DRIVE_FOLDER_ID:-}"
+    if [[ -z "${folder_id}" ]]; then
+      echo "No GARC_DRIVE_FOLDER_ID set. Run 'garc setup all' first."
+      echo "Usage: garc drive info <file_id>"
+      return 1
+    fi
+    python3 "${DRIVE_HELPER}" info "${folder_id}"
+    return $?
+  fi
   python3 "${DRIVE_HELPER}" info "$1"
 }
 
diff --git a/lib/ingress.sh b/lib/ingress.sh
index 4bffe63..0a11a1d 100644
--- a/lib/ingress.sh
+++ b/lib/ingress.sh
@@ -289,7 +289,7 @@ _ingress_run_once() {
   done
 
   local next_raw
-  next_raw=$(_ingress_next --agent "${agent}")
+  next_raw=$(_ingress_next --agent "${agent}") || true
 
   if [[ "${next_raw}" == "(no pending items)" ]]; then
     echo "✅ Queue is empty — nothing to run."
@@ -367,8 +367,8 @@ _ingress_execute_stub() {
   [[ -z "${queue_id}" ]] && { echo "Usage: garc ingress execute-stub --queue-id <id>"; return 1; }
 
   local queue_file
-  queue_file=$(_find_queue_file "${queue_id}")
-  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}" >&2; return 1; }
+  queue_file=$(_find_queue_file "${queue_id}") || true
+  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}"; return 1; }
 
   python3 "${INGRESS_HELPER}" execute-stub --queue-file "${queue_file}"
 }
@@ -390,8 +390,8 @@ _ingress_context() {
   [[ -z "${queue_id}" ]] && { echo "Usage: garc ingress context --queue-id <id>"; return 1; }
 
   local queue_file
-  queue_file=$(_find_queue_file "${queue_id}")
-  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}" >&2; return 1; }
+  queue_file=$(_find_queue_file "${queue_id}") || true
+  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}"; return 1; }
 
   local agent_id="${GARC_DEFAULT_AGENT:-main}"
   local context_path="${GARC_CACHE_DIR:-${HOME}/.garc/cache}/workspace/${agent_id}/AGENT_CONTEXT.md"
@@ -453,8 +453,8 @@ _ingress_delegate() {
   }
 
   local queue_file
-  queue_file=$(_find_queue_file "${queue_id}")
-  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}" >&2; return 1; }
+  queue_file=$(_find_queue_file "${queue_id}") || true
+  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}"; return 1; }
 
   python3 - <<PY
 import json
@@ -518,7 +518,7 @@ _ingress_done() {
   [[ -z "${queue_id}" ]] && { echo "Usage: garc ingress done --queue-id <id> [--note <text>]"; return 1; }
 
   _ingress_update_status "${queue_id}" "done" "${note}" \
-    || { echo "Queue item not found: ${queue_id}" >&2; return 1; }
+    || { echo "Queue item not found: ${queue_id}"; return 1; }
   echo "✅ Queue item ${queue_id} — done."
   [[ -n "${note}" ]] && echo "   Note: ${note}"
 
@@ -546,7 +546,7 @@ _ingress_fail() {
   [[ -z "${queue_id}" ]] && { echo "Usage: garc ingress fail --queue-id <id> [--note <text>]"; return 1; }
 
   _ingress_update_status "${queue_id}" "failed" "${note}" \
-    || { echo "Queue item not found: ${queue_id}" >&2; return 1; }
+    || { echo "Queue item not found: ${queue_id}"; return 1; }
   echo "❌ Queue item ${queue_id} — failed."
   [[ -n "${note}" ]] && echo "   Reason: ${note}"
 }
@@ -568,8 +568,8 @@ _ingress_verify() {
   [[ -z "${queue_id}" ]] && { echo "Usage: garc ingress verify --queue-id <id>"; return 1; }
 
   local queue_file
-  queue_file=$(_find_queue_file "${queue_id}")
-  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}" >&2; return 1; }
+  queue_file=$(_find_queue_file "${queue_id}") || true
+  [[ -z "${queue_file}" ]] && { echo "Queue item not found: ${queue_id}"; return 1; }
 
   python3 - <<PY
 import json
@@ -634,7 +634,7 @@ _ingress_update_status() {
   local note="${3:-}"
 
   local queue_file
-  queue_file=$(_find_queue_file "${queue_id}")
+  queue_file=$(_find_queue_file "${queue_id}") || true
   [[ -z "${queue_file}" ]] && return 1
 
   # Pass note via argv to avoid shell→Python string injection
diff --git a/scripts/garc-core.py b/scripts/garc-core.py
index 8f2a804..6b481b5 100644
--- a/scripts/garc-core.py
+++ b/scripts/garc-core.py
@@ -1,207 +1,3 @@
-#!/usr/bin/env python3
-"""
-GARC Core — Shared utilities: auth, service builders, retry, output formatting
-"""
-
-import json
-import os
-import sys
-import time
-import functools
-from datetime import datetime, timezone
-from pathlib import Path
-from typing import Optional, Any
-
-GARC_CONFIG_DIR = Path(os.environ.get("GARC_CONFIG_DIR", Path.home() / ".garc"))
-TOKEN_FILE = Path(os.environ.get("GARC_TOKEN_FILE", GARC_CONFIG_DIR / "token.json"))
-CREDENTIALS_FILE = Path(os.environ.get("GARC_CREDENTIALS_FILE", GARC_CONFIG_DIR / "credentials.json"))
-SERVICE_ACCOUNT_FILE = Path(os.environ.get("GARC_SERVICE_ACCOUNT_FILE", GARC_CONFIG_DIR / "service_account.json"))
-
-# All supported scopes for backoffice_agent profile
-ALL_SCOPES = [
-    "https://www.googleapis.com/auth/drive",
-    "https://www.googleapis.com/auth/drive.file",
-    "https://www.googleapis.com/auth/documents",
-    "https://www.googleapis.com/auth/spreadsheets",
-    "https://www.googleapis.com/auth/gmail.send",
-    "https://www.googleapis.com/auth/gmail.readonly",
-    "https://www.googleapis.com/auth/gmail.modify",
-    "https://www.googleapis.com/auth/calendar",
-    "https://www.googleapis.com/auth/tasks",
-    "https://www.googleapis.com/auth/contacts.readonly",
-    "https://www.googleapis.com/auth/directory.readonly",
-    "https://www.googleapis.com/auth/chat.messages",
-]
-
-PROFILE_SCOPES = {
-    "readonly": [
-        "https://www.googleapis.com/auth/drive.readonly",
-        "https://www.googleapis.com/auth/spreadsheets.readonly",
-        "https://www.googleapis.com/auth/gmail.readonly",
-        "https://www.googleapis.com/auth/calendar.readonly",
-        "https://www.googleapis.com/auth/tasks.readonly",
-        "https://www.googleapis.com/auth/contacts.readonly",
-        "https://www.googleapis.com/auth/documents",
-    ],
-    "writer": [
-        "https://www.googleapis.com/auth/drive.file",
-        "https://www.googleapis.com/auth/documents",
-        "https://www.googleapis.com/auth/spreadsheets",
-        "https://www.googleapis.com/auth/gmail.send",
-        "https://www.googleapis.com/auth/gmail.readonly",
-        "https://www.googleapis.com/auth/calendar",
-        "https://www.googleapis.com/auth/tasks",
-    ],
-    "backoffice_agent": ALL_SCOPES,
-    "admin": ALL_SCOPES + [
-        "https://www.googleapis.com/auth/admin.directory.user.readonly",
-    ],
-}
-
-
-def get_credentials(scopes: Optional[list] = None, use_service_account: bool = False):
-    """
-    Get valid Google credentials.
-    Tries: service account → existing token → OAuth flow
-    """
-    if scopes is None:
-        scopes = ALL_SCOPES
-
-    # Service account path
-    if use_service_account and SERVICE_ACCOUNT_FILE.exists():
-        try:
-            from google.oauth2 import service_account
-            creds = service_account.Credentials.from_service_account_file(
-                str(SERVICE_ACCOUNT_FILE), scopes=scopes
-            )
-            return creds
-        except Exception as e:
-            print(f"⚠️  Service account error: {e}", file=sys.stderr)
-
-    # User OAuth token
-    try:
-        from google.oauth2.credentials import Credentials
-        from google.auth.transport.requests import Request
-
-        creds = None
-        if TOKEN_FILE.exists():
-            creds = Credentials.from_authorized_user_file(str(TOKEN_FILE), scopes)
-
-        if creds and creds.valid:
-            return creds
-
-        if creds and creds.expired and creds.refresh_token:
-            try:
-                creds.refresh(Request())
-                _save_token(creds)
-                return creds
-            except Exception as e:
-                print(f"⚠️  Token refresh failed: {e}", file=sys.stderr)
-
-        # Need fresh OAuth flow
-        if not CREDENTIALS_FILE.exists():
-            print(f"❌ credentials.json not found: {CREDENTIALS_FILE}", file=sys.stderr)
-            print("   Download from Google Cloud Console → APIs & Services → Credentials", file=sys.stderr)
-            print("   Run: garc auth login --profile backoffice_agent", file=sys.stderr)
-            sys.exit(1)
-
-        from google_auth_oauthlib.flow import InstalledAppFlow
-        flow = InstalledAppFlow.from_client_secrets_file(str(CREDENTIALS_FILE), scopes)
-        creds = flow.run_local_server(port=0, open_browser=True)
-        _save_token(creds)
-        return creds
-
-    except ImportError as e:
-        print(f"❌ Missing dependency: {e}", file=sys.stderr)
-        print("   Run: pip install -r requirements.txt", file=sys.stderr)
-        sys.exit(1)
-
-
-def _save_token(creds):
-    """Save credentials to token file."""
-    GARC_CONFIG_DIR.mkdir(parents=True, exist_ok=True)
-    with open(TOKEN_FILE, "w") as f:
-        f.write(creds.to_json())
-    TOKEN_FILE.chmod(0o600)
-
-
-def build_service(service_name: str, version: str, scopes: Optional[list] = None):
-    """Build a Google API service with proper credentials."""
-    try:
-        from googleapiclient.discovery import build
-        creds = get_credentials(scopes)
-        return build(service_name, version, credentials=creds, cache_discovery=False)
-    except ImportError:
-        print("❌ google-api-python-client not installed", file=sys.stderr)
-        print("   Run: pip install -r requirements.txt", file=sys.stderr)
-        sys.exit(1)
-
-
-def with_retry(max_retries: int = 3, backoff: float = 1.5):
-    """Decorator: retry on transient Google API errors with exponential backoff."""
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            last_error = None
-            for attempt in range(max_retries):
-                try:
-                    return func(*args, **kwargs)
-                except Exception as e:
-                    error_str = str(e).lower()
-                    # Retry on rate limit, server error
-                    if any(code in error_str for code in ["429", "500", "503", "quota", "rate"]):
-                        wait = backoff ** attempt
-                        if attempt < max_retries - 1:
-                            print(f"  ⏳ Rate limit hit, waiting {wait:.1f}s...", file=sys.stderr)
-                            time.sleep(wait)
-                            last_error = e
-                            continue
-                    raise
-            raise last_error
-        return wrapper
-    return decorator
-
-
-def utc_now() -> str:
-    """Return current UTC time as ISO 8601 string."""
-    return datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
-
-
-def format_table(rows: list[dict], columns: list[str], max_width: int = 120) -> str:
-    """Format a list of dicts as a simple table."""
-    if not rows:
-        return "(no results)"
-
-    # Calculate column widths
-    widths = {col: len(col) for col in columns}
-    for row in rows:
-        for col in columns:
-            val = str(row.get(col, ""))
-            widths[col] = min(max(widths[col], len(val)), 40)
-
-    header = "  ".join(col.ljust(widths[col]) for col in columns)
-    sep = "  ".join("─" * widths[col] for col in columns)
-    lines = [header, sep]
-    for row in rows:
-        line = "  ".join(str(row.get(col, "")).ljust(widths[col])[:widths[col]] for col in columns)
-        lines.append(line)
-    return "\n".join(lines)
-
-
-def load_config() -> dict:
-    """Load GARC config from environment / config.env file."""
-    config_file = GARC_CONFIG_DIR / "config.env"
-    config = {}
-    if config_file.exists():
-        with open(config_file) as f:
-            for line in f:
-                line = line.strip()
-                if line and not line.startswith("#") and "=" in line:
-                    key, _, val = line.partition("=")
-                    config[key.strip()] = val.strip()
-    # Override with env vars
-    for key in ["GARC_DRIVE_FOLDER_ID", "GARC_SHEETS_ID", "GARC_GMAIL_DEFAULT_TO",
-                "GARC_CALENDAR_ID", "GARC_CHAT_SPACE_ID", "GARC_DEFAULT_AGENT"]:
-        if os.environ.get(key):
-            config[key] = os.environ[key]
-    return config
+# This file exists for backward compatibility (hyphenated filename).
+# The canonical module is garc_core.py (underscore) — edit that file.
+from garc_core import *  # noqa: F401, F403