atlassian-cli 0.5.9__tar.gz → 0.7.0__tar.gz

{atlassian_cli-0.5.9/src/atlassian_cli.egg-info → atlassian_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atlassian-cli
-Version: 0.5.9
+Version: 0.7.0
 Summary: Fast CLI tools for Atlassian Cloud (Confluence + Jira) — optimized for AI agents
 Author-email: Alex Fishlock <alex.fishlock@catapult.cx>
 License-Expression: MIT
@@ -61,17 +61,29 @@ pip install git+https://github.com/catapultcx/atlassian-cli.git
 
 ## Setup
 
-Create a `.env` file (or export environment variables):
+Create a config file with your credentials:
 
 ```bash
+mkdir -p ~/.config/atlassian-cli
+cat > ~/.config/atlassian-cli/config <<EOF
 ATLASSIAN_URL=https://your-site.atlassian.net
 ATLASSIAN_EMAIL=you@example.com
 ATLASSIAN_TOKEN=your-api-token
+EOF
+chmod 600 ~/.config/atlassian-cli/config
 ```
 
+The CLI looks for credentials in this order (first match wins):
+
+1. `$ATLASSIAN_CLI_CONFIG` (explicit path override)
+2. `./.env` in the current working directory
+3. `$XDG_CONFIG_HOME/atlassian-cli/config` (defaults to `~/.config/atlassian-cli/config`)
+4. `~/.atlassian-cli/config`
+5. Environment variables (`ATLASSIAN_URL`, `ATLASSIAN_EMAIL`, `ATLASSIAN_TOKEN`)
+
 Get your API token at https://id.atlassian.com/manage-profile/security/api-tokens
 
-> Legacy `CONFLUENCE_URL` / `CONFLUENCE_EMAIL` / `CONFLUENCE_TOKEN` env vars are also supported.
+> Legacy `CONFLUENCE_URL` / `CONFLUENCE_EMAIL` / `CONFLUENCE_TOKEN` are also supported.
 
 ## Confluence CLI
 

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/README.md

@@ -30,17 +30,29 @@ pip install git+https://github.com/catapultcx/atlassian-cli.git
 
 ## Setup
 
-Create a `.env` file (or export environment variables):
+Create a config file with your credentials:
 
 ```bash
+mkdir -p ~/.config/atlassian-cli
+cat > ~/.config/atlassian-cli/config <<EOF
 ATLASSIAN_URL=https://your-site.atlassian.net
 ATLASSIAN_EMAIL=you@example.com
 ATLASSIAN_TOKEN=your-api-token
+EOF
+chmod 600 ~/.config/atlassian-cli/config
 ```
 
+The CLI looks for credentials in this order (first match wins):
+
+1. `$ATLASSIAN_CLI_CONFIG` (explicit path override)
+2. `./.env` in the current working directory
+3. `$XDG_CONFIG_HOME/atlassian-cli/config` (defaults to `~/.config/atlassian-cli/config`)
+4. `~/.atlassian-cli/config`
+5. Environment variables (`ATLASSIAN_URL`, `ATLASSIAN_EMAIL`, `ATLASSIAN_TOKEN`)
+
 Get your API token at https://id.atlassian.com/manage-profile/security/api-tokens
 
-> Legacy `CONFLUENCE_URL` / `CONFLUENCE_EMAIL` / `CONFLUENCE_TOKEN` env vars are also supported.
+> Legacy `CONFLUENCE_URL` / `CONFLUENCE_EMAIL` / `CONFLUENCE_TOKEN` are also supported.
 
 ## Confluence CLI
 

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "atlassian-cli"
-version = "0.5.9"
+version = "0.7.0"
 description = "Fast CLI tools for Atlassian Cloud (Confluence + Jira) — optimized for AI agents"
 readme = "README.md"
 license = "MIT"

atlassian_cli-0.7.0/src/atlassian_cli/__init__.py

@@ -0,0 +1,7 @@
+"""Atlassian Cloud CLI tools for Confluence and Jira."""
+
+try:
+    from importlib.metadata import version
+    __version__ = version('atlassian-cli')
+except Exception:
+    __version__ = '0.0.0-dev'

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/config.py

@@ -7,17 +7,39 @@ import requests
 from requests.auth import HTTPBasicAuth
 
 
-def load_env(path=None):
-    """Manually parse a .env file into a dict, skipping comments and blank lines."""
-    if path is None:
-        paths = [os.path.join(os.getcwd(), '.env'), os.path.join(os.path.dirname(__file__), '.env')]
-    else:
-        paths = [path]
+def _config_search_paths():
+    """Return ordered list of paths to look for a .env / config file.
+
+    Search order (first match wins):
+      1. ATLASSIAN_CLI_CONFIG env var (explicit override)
+      2. ./.env in the current working directory
+      3. $XDG_CONFIG_HOME/atlassian-cli/config (XDG default ~/.config/...)
+      4. ~/.atlassian-cli/config (legacy/dotfile location)
+      5. <package_dir>/.env (last-ditch fallback for editable installs)
+    """
+    paths = []
+    override = os.environ.get('ATLASSIAN_CLI_CONFIG')
+    if override:
+        paths.append(override)
+    paths.append(os.path.join(os.getcwd(), '.env'))
+    xdg = os.environ.get('XDG_CONFIG_HOME') or os.path.expanduser('~/.config')
+    paths.append(os.path.join(xdg, 'atlassian-cli', 'config'))
+    paths.append(os.path.expanduser('~/.atlassian-cli/config'))
+    paths.append(os.path.join(os.path.dirname(__file__), '.env'))
+    return paths
 
+
+def load_env(path=None):
+    """Parse a .env-style file into a dict, skipping comments and blank lines."""
+    paths = [path] if path else _config_search_paths()
     for env_path in paths:
-        if os.path.exists(env_path):
+        if env_path and os.path.exists(env_path):
             with open(env_path, 'r') as file:
-                return dict(line.strip().split('=', 1) for line in file if not line.startswith('#') and '=' in line)
+                return dict(
+                    line.strip().split('=', 1)
+                    for line in file
+                    if not line.startswith('#') and '=' in line
+                )
     return {}
 
 

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/confluence.py

@@ -23,8 +23,9 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 
 from atlassian_cli.config import setup
 from atlassian_cli.http import APIError, _retry, api_delete, api_get, api_post, api_put
-from atlassian_cli.output import emit, emit_error, set_json_mode
+from atlassian_cli.output import emit, emit_error, emit_json, is_json_mode, set_json_mode
 
+V1 = '/wiki/rest/api'
 V2 = '/wiki/api/v2'
 
 
@@ -677,11 +678,206 @@ def cmd_hints(args):
         print(format_hints(args.topic))
 
 
+# ---------------------------------------------------------------------------
+# Page version changes
+# ---------------------------------------------------------------------------
+
+def cmd_changes(args):
+    """Show what changed in the latest version of a page."""
+    session, base = setup()
+    page_id = args.page_id
+
+    current = api_get(session, base, f'{V2}/pages/{page_id}?body-format=atlas_doc_format&include-version=true')
+    cur_ver = current['version']['number']
+    title = current['title']
+    author_id = current['version'].get('authorId', '?')
+    created = current['version'].get('createdAt', '?')[:16]
+
+    prev_ver = args.version or cur_ver - 1
+    if prev_ver < 1:
+        emit_error('Only one version exists — nothing to compare')
+        sys.exit(1)
+
+    # v1 API required for historical version bodies
+    prev_resp = session.get(
+        f'{base}{V1}/content/{page_id}',
+        params={'status': 'historical', 'version': prev_ver, 'expand': 'body.atlas_doc_format'},
+    )
+    if not prev_resp.ok:
+        raise APIError(prev_resp.status_code, prev_resp.text)
+
+    from atlassian_cli.adf import adf_to_markdown
+    cur_body = json.loads(current['body']['atlas_doc_format']['value'])
+    prev_body = json.loads(prev_resp.json()['body']['atlas_doc_format']['value'])
+
+    cur_md = adf_to_markdown(cur_body).splitlines()
+    prev_md = adf_to_markdown(prev_body).splitlines()
+
+    diff_lines = list(difflib.unified_diff(
+        prev_md, cur_md, fromfile=f'v{prev_ver}', tofile=f'v{cur_ver}', lineterm='',
+    ))
+
+    if not is_json_mode():
+        print(f'{title} — v{prev_ver} → v{cur_ver} (by {author_id[:20]} at {created})')
+        print()
+        if diff_lines:
+            print('\n'.join(diff_lines))
+        else:
+            print('No content changes between versions')
+    else:
+        emit_json({
+            'page_id': page_id, 'title': title,
+            'from_version': prev_ver, 'to_version': cur_ver,
+            'author': author_id, 'date': created,
+            'diff': '\n'.join(diff_lines) if diff_lines else None,
+        })
+
+
+# ---------------------------------------------------------------------------
+# Approvals
+# ---------------------------------------------------------------------------
+
+def _get_current_user_id(session, base):
+    data = api_get(session, base, f'{V1}/user/current')
+    return data['accountId']
+
+
+def _get_approval_property(session, base, page_id):
+    try:
+        return api_get(session, base, f'{V1}/content/{page_id}/property/approvals')
+    except APIError:
+        return None
+
+
+def cmd_approvals(args):
+    """List pages pending your approval (CQL + expand, client-side filter)."""
+    session, base = setup()
+    my_id = _get_current_user_id(session, base)
+
+    cql = 'type=page AND content.property[approvals].allDone=0'
+    if args.spaces:
+        space_clause = ' OR '.join(f'space.key={s}' for s in args.spaces)
+        cql += f' AND ({space_clause})'
+
+    # Single CQL call with expanded approval properties — client-side filter by user.
+    # CQL can't query into arrays, so we filter the 'pending' list in Python.
+    pending = []
+    seen = set()
+    start = 0
+    while True:
+        resp = session.get(f'{base}{V1}/search', params={
+            'cql': cql, 'limit': 100, 'start': start, 'excerpt': 'none',
+            'expand': 'content.metadata.properties.approvals,content.space',
+        })
+        if not resp.ok:
+            raise APIError(resp.status_code, resp.text)
+        data = resp.json()
+        results = data.get('results', [])
+        if not results:
+            break
+
+        for r in results:
+            c = r.get('content', {})
+            page_id = c.get('id')
+            if not page_id or page_id in seen:
+                continue
+            seen.add(page_id)
+            value = c.get('metadata', {}).get('properties', {}).get('approvals', {}).get('value', {})
+            if my_id in value.get('pending', []):
+                pending.append({
+                    'page_id': page_id,
+                    'title': c.get('title', '?'),
+                    'space': c.get('space', {}).get('key', '?'),
+                    'status': value.get('name', {}).get('value', '?'),
+                })
+
+        total = data.get('totalSize', 0)
+        start += len(results)
+        if start >= total:
+            break
+
+    if is_json_mode():
+        emit_json(pending)
+    elif not pending:
+        emit('OK', 'No pending approvals')
+    else:
+        for p in pending:
+            print(f'{p["page_id"]} [{p["space"]}] {p["title"]}  ({p["status"]})')
+        emit('DONE', f'{len(pending)} pending approval(s)')
+
+
+def cmd_approve(args):
+    """Approve or reject a page."""
+    import time
+    session, base = setup()
+    my_id = _get_current_user_id(session, base)
+    page_id = args.page_id
+    reject = getattr(args, 'reject', False)
+
+    prop = _get_approval_property(session, base, page_id)
+    if not prop:
+        emit_error(f'No approval property on page {page_id}')
+        sys.exit(1)
+
+    value = prop['value']
+    version = prop['version']['number']
+
+    if my_id not in value.get('pending', []):
+        emit_error(f'You are not a pending approver on page {page_id}')
+        sys.exit(1)
+
+    now = int(time.time() * 1000)
+    status_code = 2 if reject else 1  # 0=pending, 1=approved, 2=rejected
+    target_list = 'rejected' if reject else 'completed'
+
+    for a in value['approvers']:
+        if a['approverid'] == my_id:
+            a['status'] = status_code
+            a['date'] = now
+
+    value['pending'] = [p for p in value['pending'] if p != my_id]
+    value[target_list].append(my_id)
+
+    total = len(value['approvers'])
+    done = len(value['completed'])
+    rejected = len(value['rejected'])
+
+    if value['pending']:
+        label = f'Pending ({done}/{total})'
+        tooltip = 'There are pending approvals.'
+        icon = '0'
+    elif rejected:
+        label = f'Rejected ({rejected}/{total})'
+        tooltip = 'Approval was rejected.'
+        icon = '2'
+    else:
+        label = f'Approved ({done}/{total})'
+        tooltip = 'All approvals are complete.'
+        icon = '1'
+
+    value['allDone'] = '0' if value['pending'] else '1'
+    value['name']['value'] = label
+    value['tooltip']['value'] = tooltip
+    value['icon']['url'] = f'/approvalmacro/images/{icon}.svg'
+
+    api_put(session, base, f'{V1}/content/{page_id}/property/approvals', {
+        'key': 'approvals',
+        'value': value,
+        'version': {'number': version + 1},
+    })
+
+    action = 'Rejected' if reject else 'Approved'
+    emit('OK', f'{action} page {page_id} ({label})')
+
+
 # ---------------------------------------------------------------------------
 # CLI
 # ---------------------------------------------------------------------------
 
 def main():
+    from atlassian_cli.update_check import check_for_update
+    check_for_update()
+
     parser = argparse.ArgumentParser(
         prog='confluence',
         description='Confluence Cloud CLI — fast ADF page management',
@@ -757,6 +953,23 @@ def main():
     p.add_argument('topic', nargs='?', help='Topic: macros, sections, editing, adf_basics (default: all)')
     p.set_defaults(func=cmd_hints)
 
+    p = sub.add_parser('changes', help='Show what changed in the latest version of a page')
+    p.add_argument('page_id', help='Confluence page ID')
+    p.add_argument('--version', type=int, help='Compare against this version (default: previous)')
+    p.set_defaults(func=cmd_changes)
+
+    p = sub.add_parser('approvals', help='List pages pending your approval')
+    p.add_argument('--spaces', nargs='*', help='Space keys to search (default: COMPLY POL ICOMB)')
+    p.set_defaults(func=cmd_approvals)
+
+    p = sub.add_parser('approve', help='Approve a page')
+    p.add_argument('page_id', help='Confluence page ID')
+    p.set_defaults(func=cmd_approve, reject=False)
+
+    p = sub.add_parser('reject', help='Reject a page approval')
+    p.add_argument('page_id', help='Confluence page ID')
+    p.set_defaults(func=cmd_approve, reject=True)
+
     args = parser.parse_args()
     if args.json_output:
         set_json_mode(True)

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/http.py

@@ -51,7 +51,9 @@ def api_get(session, base, path, **params):
 
 def api_post(session, base, path, data):
     response = _retry(session.post, f'{base}{path}', json=data)
-    if response.ok:
+    if response.status_code == 204:
+        return None
+    elif response.ok:
         return response.json()
     raise APIError(response.status_code, response.text)
 

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/jira.py

@@ -15,12 +15,18 @@ from atlassian_cli.output import emit_error, set_json_mode
 
 
 def main():
+    from atlassian_cli.update_check import check_for_update
+    check_for_update()
+
+    # Pull --json out early so it works at any position in the command line.
+    if '--json' in sys.argv:
+        sys.argv.remove('--json')
+        set_json_mode(True)
+
     parser = argparse.ArgumentParser(
         prog='jira',
         description='Jira CLI — issue and assets management',
     )
-    parser.add_argument('--json', action='store_true', dest='json_output',
-                        help='Output as JSON for programmatic parsing')
 
     sub = parser.add_subparsers(dest='domain', required=True)
 
@@ -42,6 +48,8 @@ def main():
     p.add_argument('--labels', nargs='*', help='Labels')
     p.add_argument('--assignee', help='Assignee account ID')
     p.add_argument('--parent', help='Parent issue key (for sub-tasks)')
+    p.add_argument('--fields', help='JSON string of additional fields '
+                                    '(e.g. components, custom fields, ADF description)')
     p.set_defaults(func=jira_issues.cmd_create)
 
     p = issue_sub.add_parser('update', help='Update issue fields')
@@ -135,15 +143,22 @@ def main():
     p.add_argument('name', help='Type name')
     p.add_argument('--description', help='Type description')
     p.add_argument('--parent-type-id', help='Parent object type ID')
+    p.add_argument('--icon-id', default='115', help='Icon ID (default: 115 Software Box)')
     p.set_defaults(func=jira_assets.cmd_type_create)
 
     p = assets_sub.add_parser('attrs', help='List attributes for a type')
     p.add_argument('type_id', help='Object type ID')
     p.set_defaults(func=jira_assets.cmd_attrs)
 
+    p = assets_sub.add_parser('attr-create', help='Create attribute on object type')
+    p.add_argument('type_id', help='Object type ID')
+    p.add_argument('name', help='Attribute name')
+    p.add_argument('--type', default='text', help='Attribute type (text, boolean, integer, url, select)')
+    p.add_argument('--description', help='Attribute description')
+    p.add_argument('--default-value', help='Default value')
+    p.set_defaults(func=jira_assets.cmd_attr_create)
+
     args = parser.parse_args()
-    if args.json_output:
-        set_json_mode(True)
     try:
         args.func(args)
     except APIError as e:

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/jira_assets.py

@@ -160,7 +160,7 @@ def cmd_type(args):
 def cmd_type_create(args):
     session, _, ab = assets_setup()
     schema_id = resolve_schema(session, ab, args.schema_id)
-    body = {'name': args.name, 'objectSchemaId': schema_id}
+    body = {'name': args.name, 'objectSchemaId': schema_id, 'iconId': args.icon_id}
     if hasattr(args, 'description') and args.description:
         body['description'] = args.description
     if hasattr(args, 'parent_type_id') and args.parent_type_id:
@@ -180,3 +180,21 @@ def cmd_attrs(args):
             type_name = type_name.get('name', '?')
         print(f'{a["id"]} {a["name"]} ({type_name}) {req}'.rstrip())
     emit('DONE', f'{len(attrs)} attributes')
+
+
+def cmd_attr_create(args):
+    session, _, ab = assets_setup()
+    # Default type mapping: 0=Text, 1=Boolean, 6=URL
+    type_map = {'text': 0, 'boolean': 1, 'integer': 2, 'float': 3, 'date': 4, 'url': 6, 'select': 7}
+    type_value = type_map.get(args.type.lower(), args.type) if not args.type.isdigit() else int(args.type)
+    body = {
+        'name': args.name,
+        'objectTypeId': args.type_id,
+        'type': type_value,
+    }
+    if args.description:
+        body['description'] = args.description
+    if args.default_value:
+        body['defaultTypeValue'] = args.default_value
+    data = api_post(session, ab, f'/objecttype/{args.type_id}/attributes', body)
+    emit('OK', f'Created attribute {data.get("id", "")} ({args.name})')

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/jira_issues.py

@@ -3,9 +3,10 @@
 import json
 import sys
 
+from atlassian_cli.adf import adf_to_markdown
 from atlassian_cli.config import setup
 from atlassian_cli.http import api_delete, api_get, api_post, api_put
-from atlassian_cli.output import emit, emit_error
+from atlassian_cli.output import emit, emit_error, emit_json, is_json_mode
 
 V3 = '/rest/api/3'
 
@@ -33,10 +34,33 @@ def _text_adf(text):
 def cmd_get(args):
     session, base = setup()
     data = api_get(session, base, f'{V3}/issue/{args.key}')
+    if is_json_mode():
+        # preserve the full API response so callers can read components,
+        # custom fields, finding type, etc.
+        emit_json(data)
+        return
+
     fields = data.get('fields', {})
+    key = data['key']
     status = fields.get('status', {}).get('name', '?')
     summary = fields.get('summary', '')
-    emit('OK', f'{data["key"]} [{status}] {summary}', data={'key': data['key'], 'id': data['id']})
+    issue_type = fields.get('issuetype', {}).get('name', '?')
+    assignee = fields.get('assignee', {})
+    assignee_name = assignee.get('displayName', 'Unassigned') if assignee else 'Unassigned'
+    labels = fields.get('labels', [])
+    priority = fields.get('priority', {}).get('name', '') if fields.get('priority') else ''
+    created = fields.get('created', '')[:10]
+    updated = fields.get('updated', '')[:10]
+    description = fields.get('description')
+
+    print(f'{key} [{status}] {summary}')
+    print(f'  Type: {issue_type}  Priority: {priority}  Assignee: {assignee_name}')
+    if labels:
+        print(f'  Labels: {", ".join(labels)}')
+    print(f'  Created: {created}  Updated: {updated}')
+    if description:
+        print()
+        print(adf_to_markdown(description))
 
 
 def cmd_create(args):
@@ -54,6 +78,10 @@ def cmd_create(args):
         fields['assignee'] = {'accountId': args.assignee}
     if args.parent:
         fields['parent'] = {'key': args.parent}
+    if getattr(args, 'fields', None):
+        # extra fields override the convenience flags above; useful for
+        # components, finding-type custom fields, full-ADF descriptions, etc.
+        fields.update(json.loads(args.fields))
 
     result = api_post(session, base, f'{V3}/issue', {'fields': fields})
     emit('OK', f'Created {result["key"]}', data=result)
@@ -118,7 +146,13 @@ def _search_page(session, base, jql, max_results, fields, next_page_token=None):
 
 def cmd_search(args):
     session, base = setup()
-    fields = args.fields.split(',')
+    # In JSON mode, default to '*all' so callers see components and custom
+    # fields. The user can still narrow via an explicit --fields.
+    user_explicit_fields = args.fields != 'summary,status,assignee,issuetype'
+    if is_json_mode() and not user_explicit_fields:
+        fields = ['*all']
+    else:
+        fields = args.fields.split(',')
     all_issues = []
     token = None
 
@@ -134,19 +168,21 @@ def cmd_search(args):
         if not args.all and len(all_issues) >= args.max:
             break
 
-    for issue in all_issues:
-        f = issue.get('fields', {})
-        status = f.get('status', {}).get('name', '?')
-        summary = f.get('summary', '')
-        assignee = f.get('assignee', {})
-        assignee_name = assignee.get('displayName', '') if assignee else ''
-        extra = f'  ({assignee_name})' if assignee_name else ''
-        print(f'{issue["key"]} [{status}] {summary}{extra}')
+    if not is_json_mode():
+        for issue in all_issues:
+            f = issue.get('fields', {})
+            status = f.get('status', {}).get('name', '?')
+            summary = f.get('summary', '')
+            assignee = f.get('assignee', {})
+            assignee_name = assignee.get('displayName', '') if assignee else ''
+            extra = f'  ({assignee_name})' if assignee_name else ''
+            print(f'{issue["key"]} [{status}] {summary}{extra}')
 
     if args.dump:
         with open(args.dump, 'w') as fh:
             json.dump({'total': len(all_issues), 'issues': all_issues}, fh, indent=2)
-        print(f'Saved {len(all_issues)} issues to {args.dump}')
+        if not is_json_mode():
+            print(f'Saved {len(all_issues)} issues to {args.dump}')
 
     emit('DONE', f'{len(all_issues)} issues found',
          data={'total': len(all_issues), 'issues': all_issues})

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli/output.py

@@ -9,6 +9,9 @@ def set_json_mode(enabled: bool):
     global _json_mode
     _json_mode = enabled
 
+def is_json_mode():
+    return _json_mode
+
 def emit(prefix, message, data=None):
     if _json_mode:
         output_data = {'status': prefix.lower(), 'message': message}

atlassian_cli-0.7.0/src/atlassian_cli/update_check.py

@@ -0,0 +1,77 @@
+"""Check PyPI for newer versions of atlassian-cli (once per day)."""
+
+import json
+import os
+import sys
+import time
+import urllib.request
+
+from atlassian_cli import __version__
+
+CACHE_DIR = os.path.join(os.path.expanduser('~'), '.cache', 'atlassian-cli')
+CACHE_FILE = os.path.join(CACHE_DIR, 'update-check.json')
+CHECK_INTERVAL = 86400  # 24 hours
+PYPI_URL = 'https://pypi.org/pypi/atlassian-cli/json'
+
+
+def _version_tuple(v):
+    """Parse version string to tuple for comparison."""
+    try:
+        return tuple(int(x) for x in v.split('.'))
+    except (ValueError, AttributeError):
+        return (0,)
+
+
+def _is_editable_install():
+    """Check if the package is installed in editable/dev mode."""
+    try:
+        from importlib.metadata import distribution
+        dist = distribution('atlassian-cli')
+        # Editable installs have a direct_url.json with dir_info
+        direct_url = dist.read_text('direct_url.json')
+        if direct_url:
+            return json.loads(direct_url).get('dir_info', {}).get('editable', False)
+    except Exception:
+        pass
+    return False
+
+
+def check_for_update():
+    """Print a notice if a newer version is available. Runs silently on error."""
+    try:
+        if __version__ == '0.0.0-dev':
+            return
+
+        # Check cache
+        if os.path.exists(CACHE_FILE):
+            with open(CACHE_FILE) as f:
+                cache = json.load(f)
+            if time.time() - cache.get('checked_at', 0) < CHECK_INTERVAL:
+                latest = cache.get('latest', '')
+                if _version_tuple(latest) > _version_tuple(__version__):
+                    _print_notice(latest)
+                return
+
+        # Fetch from PyPI (short timeout to avoid slowing CLI)
+        req = urllib.request.Request(PYPI_URL, headers={'Accept': 'application/json'})
+        with urllib.request.urlopen(req, timeout=3) as resp:
+            data = json.loads(resp.read())
+        latest = data.get('info', {}).get('version', '')
+
+        # Cache result
+        os.makedirs(CACHE_DIR, exist_ok=True)
+        with open(CACHE_FILE, 'w') as f:
+            json.dump({'checked_at': time.time(), 'latest': latest}, f)
+
+        if _version_tuple(latest) > _version_tuple(__version__):
+            _print_notice(latest)
+    except Exception:
+        pass  # never break the CLI for an update check
+
+
+def _print_notice(latest):
+    if _is_editable_install():
+        hint = 'Run: git pull && pip install -e .'
+    else:
+        hint = 'Run: pip install --upgrade atlassian-cli'
+    print(f'\033[33mUpdate available: {__version__} → {latest}. {hint}\033[0m', file=sys.stderr)

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0/src/atlassian_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atlassian-cli
-Version: 0.5.9
+Version: 0.7.0
 Summary: Fast CLI tools for Atlassian Cloud (Confluence + Jira) — optimized for AI agents
 Author-email: Alex Fishlock <alex.fishlock@catapult.cx>
 License-Expression: MIT
@@ -61,17 +61,29 @@ pip install git+https://github.com/catapultcx/atlassian-cli.git
 
 ## Setup
 
-Create a `.env` file (or export environment variables):
+Create a config file with your credentials:
 
 ```bash
+mkdir -p ~/.config/atlassian-cli
+cat > ~/.config/atlassian-cli/config <<EOF
 ATLASSIAN_URL=https://your-site.atlassian.net
 ATLASSIAN_EMAIL=you@example.com
 ATLASSIAN_TOKEN=your-api-token
+EOF
+chmod 600 ~/.config/atlassian-cli/config
 ```
 
+The CLI looks for credentials in this order (first match wins):
+
+1. `$ATLASSIAN_CLI_CONFIG` (explicit path override)
+2. `./.env` in the current working directory
+3. `$XDG_CONFIG_HOME/atlassian-cli/config` (defaults to `~/.config/atlassian-cli/config`)
+4. `~/.atlassian-cli/config`
+5. Environment variables (`ATLASSIAN_URL`, `ATLASSIAN_EMAIL`, `ATLASSIAN_TOKEN`)
+
 Get your API token at https://id.atlassian.com/manage-profile/security/api-tokens
 
-> Legacy `CONFLUENCE_URL` / `CONFLUENCE_EMAIL` / `CONFLUENCE_TOKEN` env vars are also supported.
+> Legacy `CONFLUENCE_URL` / `CONFLUENCE_EMAIL` / `CONFLUENCE_TOKEN` are also supported.
 
 ## Confluence CLI
 

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/src/atlassian_cli.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/atlassian_cli/jira.py
 src/atlassian_cli/jira_assets.py
 src/atlassian_cli/jira_issues.py
 src/atlassian_cli/output.py
+src/atlassian_cli/update_check.py
 src/atlassian_cli.egg-info/PKG-INFO
 src/atlassian_cli.egg-info/SOURCES.txt
 src/atlassian_cli.egg-info/dependency_links.txt

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/tests/test_config.py

@@ -60,8 +60,47 @@ class TestGetConfig:
         url, _, _ = get_config()
         assert url == "https://test.atlassian.net"
 
+    def test_loads_from_xdg_config(self, monkeypatch, tmp_path):
+        xdg = tmp_path / "xdg"
+        cfg = xdg / "atlassian-cli" / "config"
+        cfg.parent.mkdir(parents=True)
+        cfg.write_text(
+            "ATLASSIAN_URL=https://xdg.atlassian.net\n"
+            "ATLASSIAN_EMAIL=xdg@test.com\n"
+            "ATLASSIAN_TOKEN=xdgtok\n"
+        )
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setenv("HOME", str(tmp_path))
+        monkeypatch.setenv("XDG_CONFIG_HOME", str(xdg))
+        monkeypatch.delenv("ATLASSIAN_CLI_CONFIG", raising=False)
+        url, email, token = get_config()
+        assert url == "https://xdg.atlassian.net"
+        assert email == "xdg@test.com"
+        assert token == "xdgtok"
+
+    def test_explicit_override_wins(self, monkeypatch, tmp_path):
+        override = tmp_path / "override.env"
+        override.write_text(
+            "ATLASSIAN_URL=https://override.atlassian.net\n"
+            "ATLASSIAN_EMAIL=o@t.com\n"
+            "ATLASSIAN_TOKEN=otok\n"
+        )
+        # cwd has a .env that should be ignored when override is set
+        (tmp_path / ".env").write_text(
+            "ATLASSIAN_URL=https://cwd.atlassian.net\n"
+            "ATLASSIAN_EMAIL=c@t.com\n"
+            "ATLASSIAN_TOKEN=ctok\n"
+        )
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setenv("ATLASSIAN_CLI_CONFIG", str(override))
+        url, _, _ = get_config()
+        assert url == "https://override.atlassian.net"
+
     def test_exits_when_missing(self, monkeypatch, tmp_path):
         monkeypatch.chdir(tmp_path)
+        monkeypatch.setenv("HOME", str(tmp_path))
+        monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "xdg"))
+        monkeypatch.delenv("ATLASSIAN_CLI_CONFIG", raising=False)
         monkeypatch.delenv("ATLASSIAN_URL", raising=False)
         monkeypatch.delenv("ATLASSIAN_EMAIL", raising=False)
         monkeypatch.delenv("ATLASSIAN_TOKEN", raising=False)

{atlassian_cli-0.5.9 → atlassian_cli-0.7.0}/tests/test_jira_assets.py

@@ -252,7 +252,7 @@ class TestCmdTypeCreate:
             responses.POST, f"{ASSETS_BASE}/objecttype/create",
             json={"id": "10", "name": "Laptop"},
         )
-        cmd_type_create(Namespace(schema_id="1", name="Laptop", description=None, parent_type_id=None))
+        cmd_type_create(Namespace(schema_id="1", name="Laptop", description=None, parent_type_id=None, icon_id='115'))
         assert "Laptop" in capsys.readouterr().out
 
     @responses.activate
@@ -265,7 +265,9 @@ class TestCmdTypeCreate:
             responses.POST, f"{ASSETS_BASE}/objecttype/create",
             json={"id": "10", "name": "Laptop"},
         )
-        cmd_type_create(Namespace(schema_id="IT Assets", name="Laptop", description=None, parent_type_id=None))
+        cmd_type_create(Namespace(
+            schema_id="IT Assets", name="Laptop", description=None, parent_type_id=None, icon_id='115',
+        ))
         body = json.loads(responses.calls[1].request.body)
         assert body["objectSchemaId"] == "1"
 
@@ -278,6 +280,7 @@ class TestCmdTypeCreate:
         cmd_type_create(Namespace(
             schema_id="1", name="Desktop",
             description="Desktop computers", parent_type_id="5",
+            icon_id='115',
         ))
         body = json.loads(responses.calls[0].request.body)
         assert body["description"] == "Desktop computers"

atlassian_cli-0.5.9/src/atlassian_cli/__init__.py

@@ -1,3 +0,0 @@
-"""Atlassian Cloud CLI tools for Confluence and Jira."""
-
-__version__ = '0.3.0'