Skip to content

fix: safe import for create claude session method in startup hook #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2025
Merged

fix: safe import for create claude session method in startup hook #1219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/codegen/cli/commands/claude/config/claude_session_hook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@
import sys
from pathlib import Path

from codegen.cli.commands.claude.claude_session_api import create_claude_session
from codegen.cli.utils.org import resolve_org_id

# Add the codegen CLI to the path so we can import from it
script_dir = Path(__file__).parent
codegen_cli_dir = script_dir.parent.parent.parent
sys.path.insert(0, str(codegen_cli_dir))

try:
from codegen.cli.commands.claude.claude_session_api import create_claude_session
except ImportError:
create_claude_session = None
Copy link
Contributor

@codegen-sh codegen-sh bot Aug 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logic error: Potential NoneType call if import fails

If the import of create_claude_session fails, it’s set to None, but later it’s called unconditionally when org_id is present. That will raise TypeError: 'NoneType' object is not callable, causing the function to fall into the broad exception handler and return an error payload instead of cleanly proceeding.

Suggested change
create_claude_session = None
# Create session via API if available
agent_run_id = None
if org_id and callable(create_claude_session):
agent_run_id = create_claude_session(session_id, org_id)

This preserves the intended "safe import" behavior and avoids unintended exceptions while still recording session data.



def main():
"""Main hook function called by Claude Code."""
Expand Down
Loading